33 lines
905 B
Text
33 lines
905 B
Text
$NetBSD: patch-ar,v 1.9 2009/07/25 19:55:11 roy Exp $
|
|
|
|
Avoid collision with system getline(3).
|
|
|
|
--- src/support/htdigest.c.orig 2009-07-25 20:49:46.000000000 +0100
|
|
+++ src/support/htdigest.c 2009-07-25 20:50:01.000000000 +0100
|
|
@@ -71,7 +71,7 @@
|
|
while ((line[y++] = line[x++]));
|
|
}
|
|
|
|
-static int getline(char *s, int n, FILE *f)
|
|
+static int get_line(char *s, int n, FILE *f)
|
|
{
|
|
register int i = 0;
|
|
|
|
@@ -158,7 +158,7 @@
|
|
{
|
|
static char line[MAX_STRING_LEN];
|
|
|
|
- while (!(getline(line, MAX_STRING_LEN, source))) {
|
|
+ while (!(get_line(line, MAX_STRING_LEN, source))) {
|
|
putline(target, line);
|
|
}
|
|
}
|
|
@@ -216,7 +216,7 @@
|
|
ap_cpystrn(realm, argv[2], sizeof(realm));
|
|
|
|
found = 0;
|
|
- while (!(getline(line, MAX_STRING_LEN, f))) {
|
|
+ while (!(get_line(line, MAX_STRING_LEN, f))) {
|
|
if (found || (line[0] == '#') || (!line[0])) {
|
|
putline(tfp, line);
|
|
continue;
|