1 --- apache_1.3.41/src/support/logresolve.c~ 2009-10-30 17:25:18.000000000 +0200
2 +++ apache_1.3.41/src/support/logresolve.c 2009-10-30 17:26:43.170695467 +0200
6 static void cgethost(struct sockaddr *sa, char *string, int check);
7 -static int getline(char *s, int n);
8 +static int ap_getline(char *s, int n);
9 static void stats(FILE *output);
13 * gets a line from stdin
16 -static int getline (char *s, int n)
17 +static int ap_getline (char *s, int n)
22 for (i = 0; i < MAX_ERR + 2; i++)
25 - while (getline(line, MAXLINE)) {
26 + while (ap_getline(line, MAXLINE)) {
30 --- apache_1.3.41/src/support/htdigest.c~ 2009-10-30 17:25:18.000000000 +0200
31 +++ apache_1.3.41/src/support/htdigest.c 2009-10-30 17:26:59.554860724 +0200
33 while ((line[y++] = line[x++]));
36 -static int getline(char *s, int n, FILE *f)
37 +static int ap_getline(char *s, int n, FILE *f)
43 static char line[MAX_STRING_LEN];
45 - while (!(getline(line, MAX_STRING_LEN, source))) {
46 + while (!(ap_getline(line, MAX_STRING_LEN, source))) {
47 putline(target, line);
51 ap_cpystrn(realm, argv[2], sizeof(realm));
54 - while (!(getline(line, MAX_STRING_LEN, f))) {
55 + while (!(ap_getline(line, MAX_STRING_LEN, f))) {
56 if (found || (line[0] == '#') || (!line[0])) {
59 --- apache_1.3.41/src/support/htpasswd.c~ 2009-10-30 17:25:18.000000000 +0200
60 +++ apache_1.3.41/src/support/htpasswd.c 2009-10-30 17:27:11.887151384 +0200
62 * Get a line of input from the user, not including any terminating
65 -static int getline(char *s, int n, FILE *f)
66 +static int ap_getline(char *s, int n, FILE *f)
71 char scratch[MAX_STRING_LEN];
73 fpw = fopen(pwfilename, "r");
74 - while (! (getline(line, sizeof(line), fpw))) {
75 + while (! (ap_getline(line, sizeof(line), fpw))) {
78 if ((line[0] == '#') || (line[0] == '\0')) {