--- extras/htpasswd.c 2001-12-19 01:08:08.000000000 +0100 +++ extras/htpasswd.c.oden 2009-10-05 16:34:51.000000000 +0200 @@ -49,7 +49,7 @@ static void getword(char *word, char *li while((line[y++] = line[x++])); } -static int getline(char *s, int n, FILE *f) { +static int thttpd_getline(char *s, int n, FILE *f) { register int i=0; while(1) { @@ -189,7 +189,7 @@ int main(int argc, char *argv[]) { strcpy(user,argv[2]); found = 0; - while(!(getline(line,MAX_STRING_LEN,f))) { + while(!(thttpd_getline(line,MAX_STRING_LEN,f))) { if(found || (line[0] == '#') || (!line[0])) { putline(tfp,line); continue;