24 lines
679 B
Text
24 lines
679 B
Text
$NetBSD: patch-ad,v 1.1 2010/06/19 21:09:11 asau Exp $
|
|
|
|
Avoid clash: getline exists in NetBSD already.
|
|
|
|
--- htpasswd.c.orig 2001-12-19 03:08:10.000000000 +0300
|
|
+++ htpasswd.c 2010-06-20 01:02:53.000000000 +0400
|
|
@@ -49,7 +49,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;
|
|
|
|
while(1) {
|
|
@@ -189,7 +189,7 @@
|
|
strcpy(user,argv[2]);
|
|
|
|
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;
|