diff --git a/src/lib/libc/stdlib/system.c b/src/lib/libc/stdlib/system.c
index dadf3fe8..636a9ebd 100644
--- a/src/lib/libc/stdlib/system.c
+++ b/src/lib/libc/stdlib/system.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: system.c,v 1.4 2001/09/04 23:35:58 millert Exp $";
+static char *rcsid = "$OpenBSD: system.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -62,7 +62,7 @@ system(command)
 	sigemptyset(&mask);
 	sigaddset(&mask, SIGCHLD);
 	sigprocmask(SIG_BLOCK, &mask, &omask);
-	switch(pid = vfork()) {
+	switch (pid = vfork()) {
 	case -1:			/* error */
 		sigprocmask(SIG_SETMASK, &omask, NULL);
 		return(-1);
@@ -78,5 +78,5 @@ system(command)
 	sigprocmask(SIG_SETMASK, &omask, NULL);
 	(void)signal(SIGINT, intsave);
 	(void)signal(SIGQUIT, quitsave);
-	return(pid == -1 ? -1 : pstat);
+	return (pid == -1 ? -1 : pstat);
 }
diff --git a/src/lib/libutil/pidfile.c b/src/lib/libutil/pidfile.c
index ae6e9342..7c5a1e74 100644
--- a/src/lib/libutil/pidfile.c
+++ b/src/lib/libutil/pidfile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pidfile.c,v 1.4 2002/05/22 01:21:40 itojun Exp $	*/
+/*	$OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $	*/
 /*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: pidfile.c,v 1.4 2002/05/22 01:21:40 itojun Exp $";
+static const char rcsid[] = "$OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -85,7 +85,7 @@ pidfile(const char *basename)
 	}
 
 	pid = getpid();
-	if (fprintf(f, "%d\n", pid) <= 0 || fclose(f) != 0) {
+	if (fprintf(f, "%ld\n", (long)pid) <= 0 || fclose(f) != 0) {
 		save_errno = errno;
 		(void) unlink(pidfile_path);
 		free(pidfile_path);
diff --git a/src/lib/libutil/uucplock.c b/src/lib/libutil/uucplock.c
index 0d4c0bba..ff12b636 100644
--- a/src/lib/libutil/uucplock.c
+++ b/src/lib/libutil/uucplock.c
@@ -1,4 +1,4 @@
-/* * $OpenBSD: uucplock.c,v 1.8 2002/02/16 21:27:29 millert Exp $*/
+/* * $OpenBSD: uucplock.c,v 1.9 2002/05/26 09:29:02 deraadt Exp $*/
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -52,7 +52,7 @@ static const char sccsid[] = "@(#)uucplock.c	8.1 (Berkeley) 6/6/93";
 
 #define MAXTRIES 5
 
-#define LOCKTMP "LCKTMP..%d"
+#define LOCKTMP "LCKTMP..%ld"
 #define LOCKFMT "LCK..%s"
 
 #define GORET(level, val) { err = errno; uuerr = (val); \
@@ -78,7 +78,7 @@ uu_lock(ttyname)
 
 	pid = getpid();
 	(void)snprintf(lcktmpname, sizeof(lcktmpname), _PATH_UUCPLOCK LOCKTMP,
-			pid);
+			(long)pid);
 	(void)snprintf(lckname, sizeof(lckname), _PATH_UUCPLOCK LOCKFMT,
 			ttyname);
 	if ((tmpfd = creat(lcktmpname, 0664)) < 0)
@@ -211,7 +211,7 @@ put_pid(fd, pid)
 	char buf[32];
 	int len;
 
-	len = sprintf (buf, "%10d\n", (int)pid);
+	len = snprintf(buf, sizeof buf, "%10ld\n", (long)pid);
 
 	if (write (fd, buf, len) == len) {
 		/* We don't mind too much if ftruncate() fails - see get_pid */