thttpd: fix build breakage with eglibc/glibc
authorGustavo Zacarias <gustavo@zacarias.com.ar>
Fri, 25 Nov 2011 14:48:30 +0000 (11:48 -0300)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sat, 26 Nov 2011 12:07:14 +0000 (13:07 +0100)
Fix getline() function conflict with glibc/eglibc by renaming it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/thttpd/thttpd-2.25b-getline.patch [new file with mode: 0644]

diff --git a/package/thttpd/thttpd-2.25b-getline.patch b/package/thttpd/thttpd-2.25b-getline.patch
new file mode 100644 (file)
index 0000000..35c366a
--- /dev/null
@@ -0,0 +1,26 @@
+Fix glibc/eglibc getline() conflicting functions.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+
+diff -Nura thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c
+--- thttpd-2.25b.orig/extras/htpasswd.c        2001-12-18 21:08:08.000000000 -0300
++++ thttpd-2.25b/extras/htpasswd.c     2011-11-25 11:42:47.198582812 -0300
+@@ -49,7 +49,7 @@
+     while((line[y++] = line[x++]));
+ }
+-static int getline(char *s, int n, FILE *f) {
++static int get_line(char *s, int n, FILE *f) {
+     register int i=0;
+     while(1) {
+@@ -189,7 +189,7 @@
+     strcpy(user,argv[2]);
+     found = 0;
+-    while(!(getline(line,MAX_STRING_LEN,f))) {
++    while(!(get_line(line,MAX_STRING_LEN,f))) {
+         if(found || (line[0] == '#') || (!line[0])) {
+             putline(tfp,line);
+             continue;