recipes/thttpd/files/htpasswd_getline.diff

   1 --- thttpd-2.25b/extras/htpasswd.c.old  2010-04-28 17:23:40.000000000 +0100
   2 +++ thttpd-2.25b/extras/htpasswd.c      2010-04-28 17:24:00.000000000 +0100
   3 @@ -49,7 +49,7 @@
   4      while((line[y++] = line[x++]));
   5  }
   6
   7 -static int getline(char *s, int n, FILE *f) {
   8 +static int ht_getline(char *s, int n, FILE *f) {
   9      register int i=0;
  10
  11      while(1) {
  12 @@ -189,7 +189,7 @@
  13      strcpy(user,argv[2]);
  14
  15      found = 0;
  16 -    while(!(getline(line,MAX_STRING_LEN,f))) {
  17 +    while(!(ht_getline(line,MAX_STRING_LEN,f))) {
  18          if(found || (line[0] == '#') || (!line[0])) {
  19              putline(tfp,line);
  20              continue;