Fix return type confusion.

3 files changed, 78 insertions, 17 deletions

diff --git a/news/nntpclnt/distinfo b/news/nntpclnt/distinfo
index a4509a242f3..69b1a5d0b69 100644
--- a/news/nntpclnt/distinfo
+++ b/news/nntpclnt/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2010/12/15 03:14:51 chuck Exp $
+$NetBSD: distinfo,v 1.9 2012/11/19 03:00:14 joerg Exp $
 
 SHA1 (nntpclnt-1.6.1.tar.gz) = df24e9083185680d85bdc016e9e4ba54f4071f80
 RMD160 (nntpclnt-1.6.1.tar.gz) = b3d8ec94d74cc1a0f88264756b89c91fabde0750
 Size (nntpclnt-1.6.1.tar.gz) = 34369 bytes
 SHA1 (patch-aa) = e4c947e9acdd6f814437409e475b819588c444fa
-SHA1 (patch-ab) = 8d00f429d249319d0cfba7c22d2e292acbef3089
+SHA1 (patch-ab) = 1727359c86283d24c34e6d161e4b3ee8fd873499
 SHA1 (patch-ac) = ed067e2f2c6c22e32ca388dc6f990aa720d762aa
-SHA1 (patch-ad) = 1b648dcaba5625326e17ecdce90622a02e207f17
+SHA1 (patch-ad) = bc44ff1539a4ab1129a2ea86ec08f5b61d6e41dd
diff --git a/news/nntpclnt/patches/patch-ab b/news/nntpclnt/patches/patch-ab
index fda81659458..bc66225d8b9 100644
--- a/news/nntpclnt/patches/patch-ab
+++ b/news/nntpclnt/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2010/12/15 03:14:51 chuck Exp $
+$NetBSD: patch-ab,v 1.5 2012/11/19 03:00:14 joerg Exp $
 
---- nntpclnt.c.orig	1994-08-11 17:37:51.000000000 -0400
-+++ nntpclnt.c	2010-12-14 22:08:04.000000000 -0500
-@@ -24,6 +24,11 @@
+--- nntpclnt.c.orig	1994-08-11 21:37:51.000000000 +0000
++++ nntpclnt.c
+@@ -24,6 +24,11 @@ static char     *rcsid = "@(#)$Id: nntpc
   * Include configuration parameters only if we're made in the nntp tree.
   */
  
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.4 2010/12/15 03:14:51 chuck Exp $
  #ifdef NNTPSRC
  #include "config.h"
  #endif /* NNTPSRC */
-@@ -64,11 +69,6 @@
+@@ -64,11 +69,6 @@ static char     *rcsid = "@(#)$Id: nntpc
  #define net_read(a,b,c,d,e)        soread(a,b,c)
  #define net_write(a,b,c,d)	   sowrite(a,b,c)
  #endif
@@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.4 2010/12/15 03:14:51 chuck Exp $
  #include "nntpclnt.h"
  #ifdef NONETDB
  # define        IPPORT_NNTP     ((unsigned short) 119)
-@@ -154,7 +154,9 @@
+@@ -154,7 +154,9 @@ char    *file;
  	static char     buf[256];
  	char            *index();
  	char            *getenv();
@@ -36,7 +36,7 @@ $NetBSD: patch-ab,v 1.4 2010/12/15 03:14:51 chuck Exp $
  
  	if (cp = getenv("NNTPSERVER")) {
  		(void) strcpy(buf, cp);
-@@ -199,7 +201,7 @@
+@@ -199,7 +201,7 @@ char    *file;
  server_init(machine)
  char    *machine;
  {
@@ -45,7 +45,7 @@ $NetBSD: patch-ab,v 1.4 2010/12/15 03:14:51 chuck Exp $
  	char    line[256];
  	char    *index();
  #if defined(DECNET) || defined(SGI4DDN)
-@@ -248,7 +250,13 @@
+@@ -248,7 +250,13 @@ char    *machine;
  	/* Now get the server's signon message */
  
  	(void) get_server(line, sizeof(line));
@@ -60,7 +60,7 @@ $NetBSD: patch-ab,v 1.4 2010/12/15 03:14:51 chuck Exp $
  }
  
  #ifdef DATAKIT
-@@ -296,6 +304,14 @@
+@@ -296,6 +304,14 @@ char *machine;
   *
   *      Errors:         Printed via perror.
   */
diff --git a/news/nntpclnt/patches/patch-ad b/news/nntpclnt/patches/patch-ad
index 67072be4600..6f4275825c9 100644
--- a/news/nntpclnt/patches/patch-ad
+++ b/news/nntpclnt/patches/patch-ad
@@ -1,11 +1,14 @@
-$NetBSD: patch-ad,v 1.1 2005/04/01 03:28:36 kim Exp $
+$NetBSD: patch-ad,v 1.2 2012/11/19 03:00:14 joerg Exp $
 
---- inews.c.orig	1994-08-11 17:37:50.000000000 -0400
-+++ inews.c	2005-03-31 22:22:59.000000000 -0500
-@@ -17,6 +17,11 @@
+--- inews.c.orig	1994-08-11 21:37:50.000000000 +0000
++++ inews.c
+@@ -16,7 +16,14 @@ static char *sccsid = "@(#)$Id: inews.c,
+  */
  
  #include <stdio.h>
++#include <stdlib.h>
  #include <ctype.h>
++#include <unistd.h>
 +#ifdef USG
 +#include <string.h>
 +#else /* not USG */
@@ -14,7 +17,7 @@ $NetBSD: patch-ad,v 1.1 2005/04/01 03:28:36 kim Exp $
  #include "config.h"
  #include "nntp.h"
  #include "nntpclnt.h"
-@@ -27,11 +32,6 @@
+@@ -27,11 +34,6 @@ extern struct passwd *getpwuid();
  extern struct passwd *getpwnam();
  #endif
  #endif
@@ -26,3 +29,61 @@ $NetBSD: patch-ad,v 1.1 2005/04/01 03:28:36 kim Exp $
  /* for gen_frompath() */
  #define FROM 1
  #define PATH 2
+@@ -55,9 +57,14 @@ char *homedir;
+ char *fullname;
+ #endif
+ 
+-main(argc, argv)
+-int	argc;
+-char	*argv[];
++void append_signature(void);
++int valid_header(char *);
++int postauth(char *, char *);
++void gen_frompath(int);
++int uname(char *uptr);
++
++int
++main(int argc, char *argv[])
+ {
+ 	char	line[NNTP_STRLEN], s[NNTP_STRLEN];
+ 	int	seen_fromline, in_header, seen_header, seen_pathline;
+@@ -307,7 +314,8 @@ again:
+  * The rn-style DOTDIR environmental variable is used if present.
+  */
+ 
+-append_signature()
++void
++append_signature(void)
+ {
+ 	char	line[256], sigfile[256];
+ 	char	*cp;
+@@ -390,8 +398,8 @@ append_signature()
+  * a From: line in it.
+  */
+ 
+-gen_frompath(which)
+-int which;
++void
++gen_frompath(int which)
+ {
+ 	char	*s;
+ 	char	*cp;
+@@ -460,7 +468,7 @@ int which;
+ 				putc(*cp, ser_wr_fp);
+ 			else {		/* Stupid & hack.  God damn it. */
+ 				putc(toupper(username[0]), ser_wr_fp);
+-				fprintf(ser_wr_fp, username+1);
++				fprintf(ser_wr_fp, "%s", username+1);
+ 			}
+ 		fprintf(ser_wr_fp, ")\r\n");
+ 	}
+@@ -484,8 +492,7 @@ int which;
+  *
+  */
+ 
+-int valid_header(h)
+-register char *h;
++int valid_header(char *h)
+ {
+   char *index();
+   char *colon, *space;