apache13/httpd-1.3-getline.patch

   1 diff -wbBur apache_1.3.41/src/support/htdigest.c apache_1.3.41.qwe/src/support/htdigest.c
   2 --- apache_1.3.41/src/support/htdigest.c        2006-07-12 08:16:05.000000000 +0000
   3 +++ apache_1.3.41.qwe/src/support/htdigest.c    2009-09-28 08:35:02.000000000 +0000
   4 @@ -71,7 +71,7 @@
   5      while ((line[y++] = line[x++]));
   6  }
   7
   8 -static int getline(char *s, int n, FILE *f)
   9 +static int xgetline(char *s, int n, FILE *f)
  10  {
  11      register int i = 0;
  12
  13 @@ -158,7 +158,7 @@
  14  {
  15      static char line[MAX_STRING_LEN];
  16
  17 -    while (!(getline(line, MAX_STRING_LEN, source))) {
  18 +    while (!(xgetline(line, MAX_STRING_LEN, source))) {
  19         putline(target, line);
  20      }
  21  }
  22 @@ -216,7 +216,7 @@
  23      ap_cpystrn(realm, argv[2], sizeof(realm));
  24
  25      found = 0;
  26 -    while (!(getline(line, MAX_STRING_LEN, f))) {
  27 +    while (!(xgetline(line, MAX_STRING_LEN, f))) {
  28         if (found || (line[0] == '#') || (!line[0])) {
  29             putline(tfp, line);
  30             continue;
  31 diff -wbBur apache_1.3.41/src/support/htpasswd.c apache_1.3.41.qwe/src/support/htpasswd.c
  32 --- apache_1.3.41/src/support/htpasswd.c        2006-07-12 08:16:05.000000000 +0000
  33 +++ apache_1.3.41.qwe/src/support/htpasswd.c    2009-09-28 08:32:31.000000000 +0000
  34 @@ -98,7 +98,7 @@
  35   * Get a line of input from the user, not including any terminating
  36   * newline.
  37   */
  38 -static int getline(char *s, int n, FILE *f)
  39 +static int xgetline(char *s, int n, FILE *f)
  40  {
  41      register int i = 0;
  42
  43 @@ -547,7 +547,7 @@
  44         char scratch[MAX_STRING_LEN];
  45
  46         fpw = fopen(pwfilename, "r");
  47 -       while (! (getline(line, sizeof(line), fpw))) {
  48 +       while (! (xgetline(line, sizeof(line), fpw))) {
  49             char *colon;
  50
  51             if ((line[0] == '#') || (line[0] == '\0')) {
  52 diff -wbBur apache_1.3.41/src/support/logresolve.c apache_1.3.41.qwe/src/support/logresolve.c
  53 --- apache_1.3.41/src/support/logresolve.c      2006-07-12 08:16:05.000000000 +0000
  54 +++ apache_1.3.41.qwe/src/support/logresolve.c  2009-09-28 08:32:58.000000000 +0000
  55 @@ -71,7 +71,7 @@
  56  #endif /* !MPE && !WIN32*/
  57
  58  static void cgethost(struct in_addr ipnum, char *string, int check);
  59 -static int getline(char *s, int n);
  60 +static int xgetline(char *s, int n);
  61  static void stats(FILE *output);
  62
  63
  64 @@ -278,7 +278,7 @@
  65   * gets a line from stdin
  66   */
  67
  68 -static int getline (char *s, int n)
  69 +static int xgetline (char *s, int n)
  70  {
  71      char *cp;
  72
  73 @@ -326,7 +326,7 @@
  74      for (i = 0; i < MAX_ERR + 2; i++)
  75         errors[i] = 0;
  76
  77 -    while (getline(line, MAXLINE)) {
  78 +    while (xgetline(line, MAXLINE)) {
  79         if (line[0] == '\0')
  80             continue;
  81         entries++;