--- extras/htpasswd.c +++ extras/htpasswd.c @@ -49,7 +49,7 @@ while((line[y++] = line[x++])); } -static int getline(char *s, int n, FILE *f) { +static int my_getline(char *s, int n, FILE *f) { register int i=0; while(1) { @@ -189,7 +189,7 @@ strncpy(user,argv[2],MAX_STRING_LEN); user[MAX_STRING_LEN-1]='\0'; found = 0; - while(!(getline(line,MAX_STRING_LEN,f))) { + while(!(my_getline(line,MAX_STRING_LEN,f))) { if(found || (line[0] == '#') || (!line[0])) { putline(tfp,line); continue;