24 lines
710 B
Text
24 lines
710 B
Text
$NetBSD: patch-as,v 1.9 2009/07/25 19:55:11 roy Exp $
|
|
|
|
Avoid collision with system getline(3).
|
|
|
|
--- src/support/htpasswd.c.orig 2009-07-25 20:50:15.000000000 +0100
|
|
+++ src/support/htpasswd.c 2009-07-25 20:50:27.000000000 +0100
|
|
@@ -98,7 +98,7 @@
|
|
* Get a line of input from the user, not including any terminating
|
|
* newline.
|
|
*/
|
|
-static int getline(char *s, int n, FILE *f)
|
|
+static int get_line(char *s, int n, FILE *f)
|
|
{
|
|
register int i = 0;
|
|
|
|
@@ -547,7 +547,7 @@
|
|
char scratch[MAX_STRING_LEN];
|
|
|
|
fpw = fopen(pwfilename, "r");
|
|
- while (! (getline(line, sizeof(line), fpw))) {
|
|
+ while (! (get_line(line, sizeof(line), fpw))) {
|
|
char *colon;
|
|
|
|
if ((line[0] == '#') || (line[0] == '\0')) {
|