70 lines
1.7 KiB
Plaintext
70 lines
1.7 KiB
Plaintext
$NetBSD: patch-bs,v 1.3 2011/12/17 12:50:57 marino Exp $
|
|
|
|
* Fix confilct with getline(3).
|
|
|
|
--- uip/pshsbr.c.orig 2001-04-02 10:50:24.000000000 +0000
|
|
+++ uip/pshsbr.c
|
|
@@ -27,17 +27,11 @@ static char ident[] = "@(#)$Id: popsbr.c
|
|
#define TRM "."
|
|
#define TRMLEN (sizeof TRM - 1)
|
|
|
|
-#ifdef __CYGWIN32__
|
|
#include <errno.h>
|
|
-#endif
|
|
-extern int errno;
|
|
#if !defined(BSD44) && !defined(__GNU_LIBRARY__)
|
|
extern int sys_nerr;
|
|
extern char *sys_errlist[];
|
|
#endif
|
|
-#ifdef __NetBSD__ /* XXX */
|
|
-#include <errno.h>
|
|
-#endif
|
|
|
|
static int poprint = 0;
|
|
static int pophack = 0;
|
|
@@ -63,7 +57,7 @@ int command(), multiline();
|
|
static int command(), multiline();
|
|
#endif
|
|
|
|
-static int getline();
|
|
+static int _getline();
|
|
static putline();
|
|
|
|
#ifdef NNTP
|
|
@@ -176,7 +170,7 @@ int snoop;
|
|
|
|
(void) signal (SIGPIPE, SIG_IGN);
|
|
|
|
- switch (getline (response, sizeof response, input)) {
|
|
+ switch (_getline (response, sizeof response, input)) {
|
|
case OK:
|
|
if (poprint)
|
|
fprintf (stderr, "<--- %s\n", response);
|
|
@@ -619,7 +613,7 @@ char *fmt,
|
|
if (putline (buffer, output) == NOTOK)
|
|
return NOTOK;
|
|
|
|
- switch (getline (response, sizeof response, input)) {
|
|
+ switch (_getline (response, sizeof response, input)) {
|
|
case OK:
|
|
if (poprint)
|
|
fprintf (stderr, "<--- %s\n", response);
|
|
@@ -645,7 +639,7 @@ static int multiline () {
|
|
#endif
|
|
char buffer[BUFSIZ + TRMLEN];
|
|
|
|
- if (getline (buffer, sizeof buffer, input) != OK)
|
|
+ if (_getline (buffer, sizeof buffer, input) != OK)
|
|
return NOTOK;
|
|
#ifdef DEBUG
|
|
if (poprint)
|
|
@@ -665,7 +659,7 @@ static int multiline () {
|
|
|
|
/* */
|
|
|
|
-static int getline (s, n, iop)
|
|
+static int _getline (s, n, iop)
|
|
char *s;
|
|
int n;
|
|
FILE * iop;
|