Compiler warning cleanup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6171 dc483132-0cff-0310-8789-dd5450dbe970

7 files changed, 87 insertions, 69 deletions

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 6b2e2a24b..822ec3c42 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,20 @@
+
+Tue Jun 27 16:18:49 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* configure.in - When checking number/type of arguments to {get,set}pgrp
+		attempt to set __STDC__ in a vain attempt to ensure that we
+		get function prototype checking turned on.  OSF/1's native
+		compiler didn't really care what's passed as arguments unless
+		__STDC__'s set.
+	* krcp.c - Change usage of BUFSIZ to RCP_BUFSIZ.  Remove & from in
+		front of array.  It's redundant.
+	* krlogin.c - Change usage of BUFSIZ to RLOGIN_BUFSIZ.  Add signal
+		name parameter to signal handlers to conform to prototype.
+	* krlogind.c - Change usage of BUFSIZ to RLOGIND_BUFSIZ.  Cast 4th
+		argument to setsockopt(2) to be const char *.
+	* krsh.c - Change usage of BUFSIZ to RSH_BUFSIZ.  Cast 4th argument
+		to setsockopt(2) to be const char *.
+	* krshd.c - Change usage of BUFSIZ to RSHD_BUFSIZ.
+
 Thu Jun 22 14:36:46 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* configure.in: Change AC_HAVE_HEADERS with AC_CHECK_HEADERS, and
diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index 616f7fe3a..c12df133d 100644
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -112,7 +112,10 @@ dnl
 AC_MSG_CHECKING([arguments to getpgrp])
 AC_CACHE_VAL(krb5_cv_getpgrp_args,
 [AC_TRY_COMPILE(
-[#include <unistd.h>
+[#ifndef __STDC__
+#define __STDC__ 1
+#endif
+#include <unistd.h>
 #include <sys/types.h>], [pid_t pid = getpgrp(getpid())],
 krb5_cv_getpgrp_args=pid, krb5_cv_getpgrp_args=void)])
 AC_MSG_RESULT($krb5_cv_getpgrp_args)
@@ -124,7 +127,10 @@ dnl
 AC_MSG_CHECKING([number of arguments to setpgrp])
 AC_CACHE_VAL(krb5_cv_setpgrp_args,
 [AC_TRY_COMPILE(
-[#include <unistd.h>],[setpgrp(0,0)],
+[#ifndef __STDC__
+#define __STDC__ 1
+#endif
+#include <unistd.h>],[setpgrp(0,0)],
 krb5_cv_setpgrp_args=two, krb5_cv_setpgrp_args=void)])
 AC_MSG_RESULT($krb5_cv_setpgrp_args)
 if test $krb5_cv_setpgrp_args = two; then
diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c
index 0e30ebe14..9ca89c18e 100644
--- a/src/appl/bsd/krcp.c
+++ b/src/appl/bsd/krcp.c
@@ -72,18 +72,15 @@ char copyright[] =
 #include "krb5.h"
 #include "com_err.h"
      
-#ifdef BUFSIZ
-#undef BUFSIZ
-#endif
-#define BUFSIZ 4096
+#define RCP_BUFSIZ 4096
      
 int sock;
 struct sockaddr_in foreign;	   /* set up by kcmd used by send_auth */
 char *krb_realm = NULL;
 char *krb_cache = NULL;
 char *krb_config = NULL;
-char des_inbuf[2*BUFSIZ];          /* needs to be > largest read size */
-char des_outbuf[2*BUFSIZ];         /* needs to be > largest write size */
+char des_inbuf[2*RCP_BUFSIZ];          /* needs to be > largest read size */
+char des_outbuf[2*RCP_BUFSIZ];         /* needs to be > largest write size */
 krb5_data desinbuf,desoutbuf;
 krb5_encrypt_block eblock;         /* eblock for encrypt/decrypt */
 krb5_keyblock *session_key;	   /* static key for session */
@@ -144,7 +141,7 @@ main(argc, argv)
     char *suser, *tuser, *thost;
     int i;
     int cmdsiz = 30;
-    char buf[BUFSIZ], cmdbuf[30];
+    char buf[RCP_BUFSIZ], cmdbuf[30];
     char *cmd = cmdbuf;
     struct servent *sp;
     static char curhost[256];
@@ -672,7 +669,7 @@ source(argc, argv)
     struct buffer *bp;
     int x, readerr, f, amt;
     off_t i;
-    char buf[BUFSIZ];
+    char buf[RCP_BUFSIZ];
     
     for (x = 0; x < argc; x++) {
 	name = argv[x];
@@ -725,7 +722,7 @@ source(argc, argv)
 	    (void) close(f);
 	    continue;
 	}
-	if ((bp = allocbuf(&buffer, f, BUFSIZ)) == NULLBUF) {
+	if ((bp = allocbuf(&buffer, f, RCP_BUFSIZ)) == NULLBUF) {
 	    (void) close(f);
 	    continue;
 	}
@@ -766,7 +763,7 @@ rsource(name, statp)
 #else
     struct direct *dp;
 #endif
-    char buf[BUFSIZ];
+    char buf[RCP_BUFSIZ];
     char *bufv[1];
     
     if (d == 0) {
@@ -798,7 +795,7 @@ rsource(name, statp)
 	  continue;
 	if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
 	  continue;
-	if (strlen(name) + 1 + strlen(dp->d_name) >= BUFSIZ - 1) {
+	if (strlen(name) + 1 + strlen(dp->d_name) >= RCP_BUFSIZ - 1) {
 	    error("%s/%s: Name too long.\n", name, dp->d_name);
 	    continue;
 	}
@@ -815,7 +812,7 @@ rsource(name, statp)
 
 response()
 {
-    char resp, c, rbuf[BUFSIZ], *cp = rbuf;
+    char resp, c, rbuf[RCP_BUFSIZ], *cp = rbuf;
     if (des_read(rem, &resp, 1) != 1)
       lostconn();
     switch (resp) {
@@ -832,7 +829,7 @@ response()
 	    if (des_read(rem, &c, 1) != 1)
 	      lostconn();
 	    *cp++ = c;
-	} while (cp < &rbuf[BUFSIZ] && c != '\n');
+	} while (cp < &rbuf[RCP_BUFSIZ] && c != '\n');
 	if (iamremote == 0)
 	  (void) write(2, rbuf, cp - rbuf);
 	errs++;
@@ -891,7 +888,7 @@ sink(argc, argv)
     struct stat stb;
     int targisdir = 0;
     char *myargv[1];
-    char cmdbuf[BUFSIZ], nambuf[BUFSIZ];
+    char cmdbuf[RCP_BUFSIZ], nambuf[RCP_BUFSIZ];
     int setimes = 0;
     struct timeval tv[2];
 #define atime	tv[0]
@@ -1022,15 +1019,15 @@ sink(argc, argv)
 #endif
 	}
 	ga();
-	if ((bp = allocbuf(&buffer, of, BUFSIZ)) == NULLBUF) {
+	if ((bp = allocbuf(&buffer, of, RCP_BUFSIZ)) == NULLBUF) {
 	    (void) close(of);
 	    continue;
 	}
 	cp = bp->buf;
 	count = 0;
 	wrerr = 0;
-	for (i = 0; i < size; i += BUFSIZ) {
-	    amt = BUFSIZ;
+	for (i = 0; i < size; i += RCP_BUFSIZ) {
+	    amt = RCP_BUFSIZ;
 	    if (i + amt > size)
 	      amt = size - i;
 	    count += amt;
@@ -1119,7 +1116,7 @@ error(fmt, a1, a2, a3, a4, a5)
      char *fmt;
      int a1, a2, a3, a4, a5;
 {
-    char buf[BUFSIZ], *cp = buf;
+    char buf[RCP_BUFSIZ], *cp = buf;
     
     errs++;
     *cp++ = 1;
@@ -1414,7 +1411,7 @@ void
 
 
 
-char storage[2*BUFSIZ];			/* storage for the decryption */
+char storage[2*RCP_BUFSIZ];		/* storage for the decryption */
 int nstored = 0;
 char *store_ptr = storage;
 
@@ -1445,7 +1442,7 @@ int des_read(fd, buf, len)
 	nstored = 0;
     }
     
-    if ((cc = krb5_net_read(bsd_context, fd, (char *)&len_buf, 4)) != 4) {
+    if ((cc = krb5_net_read(bsd_context, fd, (char *)len_buf, 4)) != 4) {
 	/* XXX can't read enough, pipe must have closed */
 	return(0);
     }
diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c
index 658730b5b..afde2e604 100644
--- a/src/appl/bsd/krlogin.c
+++ b/src/appl/bsd/krlogin.c
@@ -131,13 +131,10 @@ char copyright[] =
 #include "com_err.h"
 #include "defines.h"
      
-#ifdef BUFSIZ
-#undef BUFSIZ
-#endif
-#define BUFSIZ 4096
+#define RLOGIN_BUFSIZ 4096
      
-char des_inbuf[2*BUFSIZ];       /* needs to be > largest read size */
-char des_outbuf[2*BUFSIZ];      /* needs to be > largest write size */
+char des_inbuf[2*RLOGIN_BUFSIZ];       /* needs to be > largest read size */
+char des_outbuf[2*RLOGIN_BUFSIZ];      /* needs to be > largest write size */
 krb5_data desinbuf,desoutbuf;
 krb5_encrypt_block eblock;      /* eblock for encrypt/decrypt */
 
@@ -219,8 +216,8 @@ struct	winsize winsize;
 char	*host=0;			/* external, so it can be
 					   reached from confirm_death() */
 
-krb5_sigtype	sigwinch(), oob();
-krb5_sigtype	lostpeer();
+krb5_sigtype	sigwinch KRB5_PROTOTYPE((int)), oob KRB5_PROTOTYPE((int));
+krb5_sigtype	lostpeer KRB5_PROTOTYPE((int));
 #if __STDC__
 int setsignal(int sig, krb5_sigtype (*act)());
 #endif
@@ -677,8 +674,9 @@ int confirm_death ()
 #define CRLF "\r\n"
 
 int	child;
-krb5_sigtype	catchild();
-krb5_sigtype	copytochild(), writeroob();
+krb5_sigtype	catchild KRB5_PROTOTYPE((int));
+krb5_sigtype	copytochild KRB5_PROTOTYPE((int)),
+		writeroob KRB5_PROTOTYPE((int));
 
 int	defflags, tabflag;
 int	deflflags;
@@ -918,7 +916,8 @@ done(status)
  * Copy SIGURGs to the child process.
  */
 krb5_sigtype
-  copytochild()
+  copytochild(signo)
+int signo;
 {
     (void) kill(child, SIGURG);
 }
@@ -930,7 +929,8 @@ krb5_sigtype
  * request to turn on the window-changing protocol.
  */
 krb5_sigtype
-  writeroob()
+  writeroob(signo)
+int signo;
 {
 #ifdef POSIX_SIGNALS
     struct sigaction sa;
@@ -953,7 +953,8 @@ krb5_sigtype
 
 
 krb5_sigtype
-  catchild()
+  catchild(signo)
+int signo;
 {
 #ifdef WAIT_USES_INT
     int status;
@@ -1166,13 +1167,14 @@ stop(cmdc)
 #endif
     
     mode(1);
-    sigwinch();			/* check for size changes */
+    sigwinch(SIGWINCH);		/* check for size changes */
 }
 
 
 
 krb5_sigtype
-  sigwinch()
+  sigwinch(signo)
+int signo;
 {
     struct winsize ws;
     
@@ -1224,14 +1226,15 @@ jmp_buf rcvtop;
 #endif
 
 krb5_sigtype
-  oob()
+  oob(signo)
+int signo;
 {
 #ifndef POSIX_TERMIOS
     int out = FWRITE;
 #endif
     int atmark, n;
     int rcvd = 0;
-    char waste[BUFSIZ], mark;
+    char waste[RLOGIN_BUFSIZ], mark;
 #ifdef POSIX_TERMIOS
     struct termios tty;
 #else
@@ -1658,7 +1661,7 @@ void try_normal(argv)
 
 
 
-char storage[2*BUFSIZ];			/* storage for the decryption */
+char storage[2*RLOGIN_BUFSIZ];		/* storage for the decryption */
 int nstored = 0;
 char *store_ptr = storage;
 
@@ -1958,7 +1961,8 @@ int des_write(fd, buf, len)
 
 
 
-krb5_sigtype lostpeer()
+krb5_sigtype lostpeer(signo)
+    int signo;
 {
 #ifdef POSIX_SIGNALS
     struct sigaction sa;
diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index 7170e9dfe..0ae1100d3 100644
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -211,10 +211,6 @@ struct winsize {
 #include "krb5.h"
 #include <kerberosIV/krb.h>
 
-#ifdef BUFSIZ
-#undef BUFSIZ
-#endif
-
 int auth_sys = 0;	/* Which version of Kerberos used to authenticate */
 
 #define KRB5_RECVAUTH_V4	4
@@ -227,7 +223,7 @@ AUTH_DAT	*v4_kdata;
 Key_schedule v4_schedule;
 int v4_des_read(), v4_des_write();
 
-#define BUFSIZ 5120
+#define RLOGIND_BUFSIZ 5120
 
 int v5_des_read(), v5_des_write();
 
@@ -236,8 +232,8 @@ int v5_des_read(), v5_des_write();
 #define SECURE_MESSAGE  "This rlogin session is using DES encryption for all data transmissions.\r\n"
 
 int (*des_read)(), (*des_write)();
-char des_inbuf[2*BUFSIZ];         /* needs to be > largest read size */
-char des_outbuf[2*BUFSIZ];        /* needs to be > largest write size */
+char des_inbuf[2*RLOGIND_BUFSIZ]; /* needs to be > largest read size */
+char des_outbuf[2*RLOGIND_BUFSIZ];/* needs to be > largest write size */
 krb5_data desinbuf,desoutbuf;
 krb5_encrypt_block eblock;        /* eblock for encrypt/decrypt */
 
@@ -477,7 +473,8 @@ main(argc, argv)
 	 fd = 0;
      }
 
-    if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0)
+    if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE,
+		   (const char *) &on, sizeof (on)) < 0)
       syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
     
     doit(fd, &from);
@@ -1243,7 +1240,7 @@ getstr(fd, buf, cnt, err)
 
 
 
-char storage[2*BUFSIZ];                    /* storage for the decryption */
+char storage[2*RLOGIND_BUFSIZ];             /* storage for the decryption */
 int nstored = 0;
 char *store_ptr = storage;
 
diff --git a/src/appl/bsd/krsh.c b/src/appl/bsd/krsh.c
index 04eb36988..c60ddba9f 100644
--- a/src/appl/bsd/krsh.c
+++ b/src/appl/bsd/krsh.c
@@ -83,13 +83,11 @@ krb5_sigtype  sendsig();
 #ifndef UCB_RSH
 #define UCB_RSH "/usr/ucb/rsh"
 #endif
-#ifdef BUFSIZ
-#undef BUFSIZ
-#endif
-#define BUFSIZ 4096
 
-char des_inbuf[2*BUFSIZ];       /* needs to be > largest read size */
-char des_outbuf[2*BUFSIZ];      /* needs to be > largest write size */
+#define RSH_BUFSIZ 4096
+
+char des_inbuf[2*RSH_BUFSIZ];       /* needs to be > largest read size */
+char des_outbuf[2*RSH_BUFSIZ];      /* needs to be > largest write size */
 krb5_data desinbuf,desoutbuf;
 krb5_encrypt_block eblock;      /* eblock for encrypt/decrypt */
 krb5_context bsd_context;
@@ -126,7 +124,7 @@ main(argc, argv0)
      char **argv0;
 {
     int rem, pid;
-    char *host=0, *cp, **ap, buf[BUFSIZ], *args, **argv = argv0, *user = 0;
+    char *host=0, *cp, **ap, buf[RSH_BUFSIZ], *args, **argv = argv0, *user = 0;
     register int cc;
     struct passwd *pwd;
     fd_set readfrom, ready;
@@ -380,9 +378,11 @@ main(argc, argv0)
 	exit(2);
     }
     if (options & SO_DEBUG) {
-	if (setsockopt(rem, SOL_SOCKET, SO_DEBUG, &one, sizeof (one)) < 0)
+	if (setsockopt(rem, SOL_SOCKET, SO_DEBUG,
+		       (const char *) &one, sizeof (one)) < 0)
 	  perror("setsockopt (stdin)");
-	if (setsockopt(rfd2, SOL_SOCKET, SO_DEBUG, &one, sizeof (one)) < 0)
+	if (setsockopt(rfd2, SOL_SOCKET, SO_DEBUG,
+		       (const char *) &one, sizeof (one)) < 0)
 	  perror("setsockopt (stderr)");
     }
     (void) setuid(getuid());
@@ -562,7 +562,7 @@ void try_normal(argv)
 }
 
 
-char storage[2*BUFSIZ];
+char storage[2*RSH_BUFSIZ];
 int nstored = 0;
 char *store_ptr = storage;
 
diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index 3b07b6b0e..c6bdd9dbc 100644
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -163,16 +163,13 @@ char copyright[] =
 
 #define SECURE_MESSAGE "This rsh session is using DES encryption for all data transmissions.\r\n"
 
-#ifdef BUFSIZ
-#undef BUFSIZ
-#endif
-#define BUFSIZ 5120
+#define RSHD_BUFSIZ 5120
 
 #define MAXRETRIES 4
 
-char des_inbuf[2*BUFSIZ];         /* needs to be > largest read size */
+char des_inbuf[2*RSHD_BUFSIZ];    /* needs to be > largest read size */
 krb5_encrypt_block eblock;        /* eblock for encrypt/decrypt */
-char des_outbuf[2*BUFSIZ];        /* needs to be > largest write size */
+char des_outbuf[2*RSHD_BUFSIZ];   /* needs to be > largest write size */
 krb5_data desinbuf,desoutbuf;
 krb5_context bsd_context;
 char *srvtab = NULL;
@@ -532,7 +529,7 @@ doit(f, fromp)
     short port;
     int pv[2], pw[2], px[2], cc;
     fd_set ready, readfrom;
-    char buf[BUFSIZ], sig;
+    char buf[RSHD_BUFSIZ], sig;
     int one = 1;
     krb5_sigtype     cleanup();
     int fd;
@@ -1298,7 +1295,7 @@ error(fmt, a1, a2, a3)
      char *fmt;
      char *a1, *a2, *a3;
 {
-    char buf[BUFSIZ];
+    char buf[RSHD_BUFSIZ];
     
     buf[0] = 1;
     (void) sprintf(buf+1, "%s: ", progname);
@@ -1715,7 +1712,7 @@ recvauth(netf, peersin)
 }
 
 
-char storage[2*BUFSIZ];                    /* storage for the decryption */
+char storage[2*RSHD_BUFSIZ];               /* storage for the decryption */
 int nstored = 0;
 char *store_ptr = storage;