6 files changed, 30 insertions, 24 deletions
diff --git a/usr.bin/sup/src/Makefile.sunos5.gcc b/usr.bin/sup/src/Makefile.sunos5.gcc
index 65d92ec4673..9dba17abe27 100644
--- a/usr.bin/sup/src/Makefile.sunos5.gcc
+++ b/usr.bin/sup/src/Makefile.sunos5.gcc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sunos5.gcc,v 1.2 2001/05/05 15:32:11 millert Exp $
+#	$OpenBSD: Makefile.sunos5.gcc,v 1.3 2001/05/05 15:56:04 millert Exp $
 
 # Copyright (c) 1992,1991 Carnegie Mellon University
 # All Rights Reserved.
@@ -45,7 +45,7 @@
 SITE			= NETBSD
 #SITE			= CMUCS
 NETBSD_DEFINES		= -UMACH -DVAR_TMP -DHAS_DAEMON -DHAS_POSIX_DIR
-SOLARIS_DEFINES		= -UMACH -DNO_SETLOGIN -DVAR_TMP -DHAS_POSIX_DIR -DNEED_VSNPRINTF -DHAS_VFPRINTF -DNEED_SNPRINTF -DNEED_VIS -DUSE_LOCKF -DHAS_STRERROR
+SOLARIS_DEFINES		= -UMACH -DNO_SETLOGIN -DVAR_TMP -DHAS_POSIX_DIR -DNEED_VIS -DUSE_LOCKF -DHAS_STRERROR -D__EXTENSIONS__
 AFS_DEFINES		= -DAFS -I/usr/afsws/include
 OSF_DEFINES		= -UMACH -DOSF -D_BSD -noshrlib -g -DNEED_VSNPRINTF -DVAR_TMP
 CMUCS_DEFINES		= -DMACH -DDOPRINT_VA -DNEED_VPRINTF
@@ -63,9 +63,9 @@ CFLAGS			= ${DEFS} -O -g -I.
 
 SUPCL			= supcmain.o supcvers.o supcparse.o supcname.o \
 			  supcmisc.o supcmeat.o
-SUPS			= scm.o scmio.o stree.o log.o supmsg.o netcrypt.o
+SUPS			= scm.o scmio.o stree.o log.o supmsg.o netcryptvoid.o
 EXTRA			= atoo.o errmsg.o expand.o ffilecopy.o filecopy.o nxtarg.o  \
-			  path.o quit.o run.o salloc.o skipto.o  vprintf.o snprintf.o vis.o unvis.o
+			  path.o quit.o run.o skipto.o  vprintf.o snprintf.o vis.o unvis.o
 
 
 PROGRAMS		= sup supscan supfilesrv
diff --git a/usr.bin/sup/src/expand.c b/usr.bin/sup/src/expand.c
index aef02a5a2b2..798052f96b9 100644
--- a/usr.bin/sup/src/expand.c
+++ b/usr.bin/sup/src/expand.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: expand.c,v 1.10 2001/05/04 22:16:15 millert Exp $	*/
+/*	$OpenBSD: expand.c,v 1.11 2001/05/05 15:56:04 millert Exp $	*/
 
 /*
  * Copyright (c) 1991 Carnegie Mellon University
@@ -141,7 +141,7 @@ glob(as)
 	if (*cs == '~' && home && pathp == path) {
 		if (addpath('~'))
 			goto endit;
-		for (cs++; isalnum(*cs) || *cs == '_' || *cs == '-';)
+		for (cs++; isalnum((unsigned char) *cs) || *cs == '_' || *cs == '-';)
 			if (addpath(*cs++))
 				goto endit;
 		if (!*cs || *cs == '/') {
diff --git a/usr.bin/sup/src/scm.c b/usr.bin/sup/src/scm.c
index a2e6cdfc52d..6e5d108074f 100644
--- a/usr.bin/sup/src/scm.c
+++ b/usr.bin/sup/src/scm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scm.c,v 1.12 2001/05/04 22:16:16 millert Exp $	*/
+/*	$OpenBSD: scm.c,v 1.13 2001/05/05 15:56:04 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -296,7 +296,7 @@ lock_host_file(lockdir)
 		close(fd);
 		return(-1);
 	}
-	(void)fprintf(f, "%d\n", getpid());
+	(void)fprintf(f, "%d\n", (int) getpid());
 	fflush(f);
 	free(lpath);
 	return(fd);
diff --git a/usr.bin/sup/src/supcmisc.c b/usr.bin/sup/src/supcmisc.c
index 83b8596ad81..0c3b0c6d930 100644
--- a/usr.bin/sup/src/supcmisc.c
+++ b/usr.bin/sup/src/supcmisc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: supcmisc.c,v 1.9 2001/05/04 22:16:16 millert Exp $	*/
+/*	$OpenBSD: supcmisc.c,v 1.10 2001/05/05 15:56:04 millert Exp $	*/
 
 /*
  * Copyright (c) 1992 Carnegie Mellon University
@@ -215,7 +215,9 @@ Llookup(table, name)
 void
 ugconvert(uname, gname, uid, gid, mode)
 	char *uname, *gname;
-	int *uid, *gid, *mode;
+	uid_t *uid;
+	gid_t *gid;
+	int *mode;
 {
 	LIST *u, *g;
 	struct passwd *pw;
@@ -232,14 +234,14 @@ ugconvert(uname, gname, uid, gid, mode)
 	}
 	pw = NULL;
 	if ((u = Llookup(uidL, uname)) != NULL)
-		*uid = u->Lnumber;
+		*uid = (uid_t) u->Lnumber;
 	else if ((pw = getpwnam(uname)) != NULL) {
 		Linsert(uidL, strdup(uname), pw->pw_uid);
 		*uid = pw->pw_uid;
 	}
 	if (u || pw) {
 		if ((g = Llookup(gidL, gname)) != NULL) {
-			*gid = g->Lnumber;
+			*gid = (gid_t) g->Lnumber;
 			return;
 		}
 		if ((gr = getgrnam(gname)) != NULL) {
diff --git a/usr.bin/sup/src/supextern.h b/usr.bin/sup/src/supextern.h
index 65a7cc31584..662deeb7960 100644
--- a/usr.bin/sup/src/supextern.h
+++ b/usr.bin/sup/src/supextern.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: supextern.h,v 1.4 2001/05/04 22:16:16 millert Exp $  */
+/*     $OpenBSD: supextern.h,v 1.5 2001/05/05 15:56:04 millert Exp $  */
 
 #ifndef __P
 #ifdef __STDC__
@@ -145,7 +145,7 @@ void prtime __P((void));
 int establishdir __P((char *));
 int makedir __P((char *, int, struct stat *));
 int estabd __P((char *, char *));
-void ugconvert __P((char *, char *, int *, int *, int *));
+void ugconvert __P((char *, char *, uid_t *, gid_t *, int *));
 void notify __P((char *, ...));
 void lockout __P((int));
 char *fmttime __P((time_t));
diff --git a/usr.bin/sup/src/vis.h b/usr.bin/sup/src/vis.h
index aeff6b7c89c..89ef59651b6 100644
--- a/usr.bin/sup/src/vis.h
+++ b/usr.bin/sup/src/vis.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vis.h,v 1.1 1997/10/11 23:34:22 beck Exp $	*/
+/*	$OpenBSD: vis.h,v 1.2 2001/05/05 15:56:04 millert Exp $	*/
 /*	$NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $	*/
 
 /*-
@@ -74,14 +74,18 @@
  */
 #define	UNVIS_END	1	/* no more characters */
 
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-char	*vis __P((char *, int, int, int));
-int	strvis __P((char *, const char *, int));
-int	strvisx __P((char *, const char *, size_t, int));
-int	strunvis __P((char *, const char *));
-int	unvis __P((char *, char, int *, int));
-__END_DECLS
+#ifdef __STDC__
+char	*vis(char *, int, int, int);
+int	strvis(char *, const char *, int);
+int	strvisx(char *, const char *, size_t, int);
+int	strunvis(char *, const char *);
+int	unvis(char *, char, int *, int);
+#else
+char	*vis();
+int	strvis();
+int	strvisx();
+int	strunvis();
+int	unvis();
+#endif
 
 #endif /* !_VIS_H_ */