--- bkf.c 2007-07-21 09:48:33.000000000 +0200 +++ bkf.c.oden 2010-01-17 18:01:05.028201124 +0100 @@ -31,7 +31,7 @@ typedef struct { int changes(int ac, char **av); int chomp(char *s); int clone(int ac, char **av); -void getline(int sock, char *buf, unsigned int len); +void bkf_getline(int sock, char *buf, unsigned int len); int scanurl(url *u, char *p); int tcp_connect(char *host, int port); int parent(int ac, char **av); @@ -148,7 +148,7 @@ usage: fprintf(stderr, } sprintf(buf, "bkf_tarball %s\n", rev); unless (write(sock, buf, strlen(buf)) == strlen(buf)) exit(1); -line: getline(sock, buf, sizeof(buf)); +line: bkf_getline(sock, buf, sizeof(buf)); switch (buf[0]) { case 'I': unless (quiet) fprintf(stderr, "%s", buf); @@ -182,7 +182,7 @@ line: getline(sock, buf, sizeof(buf)); break; } } while (bytes > 0); - getline(sock, buf, sizeof(buf)); + bkf_getline(sock, buf, sizeof(buf)); } pclose(f); exit(1); @@ -449,7 +449,7 @@ scanurl(url *u, char *p) } void -getline(int sock, char *buf, unsigned int len) +bkf_getline(int sock, char *buf, unsigned int len) { unsigned int i;