summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/gen/popen.c4
-rw-r--r--lib/libc_r/TEST/test_fcntl.c4
-rw-r--r--lib/libc_r/TEST/test_sock_2.c4
-rw-r--r--lib/libutil/passwd.c8
4 files changed, 10 insertions, 10 deletions
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
index 561a45e9bba..7f47a5bb967 100644
--- a/lib/libc/gen/popen.c
+++ b/lib/libc/gen/popen.c
@@ -35,7 +35,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: popen.c,v 1.9 1997/09/11 18:51:04 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: popen.c,v 1.10 2001/07/09 07:04:39 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -118,7 +118,7 @@ popen(program, type)
(void)close(pdes[0]);
}
}
- execl(_PATH_BSHELL, "sh", "-c", program, NULL);
+ execl(_PATH_BSHELL, "sh", "-c", program, (char *)NULL);
_exit(127);
/* NOTREACHED */
}
diff --git a/lib/libc_r/TEST/test_fcntl.c b/lib/libc_r/TEST/test_fcntl.c
index c501eb8b59c..816cebd6f35 100644
--- a/lib/libc_r/TEST/test_fcntl.c
+++ b/lib/libc_r/TEST/test_fcntl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: test_fcntl.c,v 1.3 2000/01/06 06:53:52 d Exp $ */
+/* $OpenBSD: test_fcntl.c,v 1.4 2001/07/09 07:04:40 deraadt Exp $ */
/*
* Test fcntl() flag inheritance across a fork()
*/
@@ -17,7 +17,7 @@ main()
CHECKe(child = fork());
switch(child) {
case 0: /* child */
- CHECKe(execlp("test_create", "test_create", NULL));
+ CHECKe(execlp("test_create", "test_create", (char *)NULL));
/* NOTREACHED */
default: /* parent */
CHECKe(wait(NULL));
diff --git a/lib/libc_r/TEST/test_sock_2.c b/lib/libc_r/TEST/test_sock_2.c
index 88b3636236b..9b234702b5e 100644
--- a/lib/libc_r/TEST/test_sock_2.c
+++ b/lib/libc_r/TEST/test_sock_2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: test_sock_2.c,v 1.5 2000/01/06 06:58:34 d Exp $ */
+/* $OpenBSD: test_sock_2.c,v 1.6 2001/07/09 07:04:40 deraadt Exp $ */
/* ==== test_sock_1.c =========================================================
* Copyright (c) 1993 by Chris Provenzano, proven@athena.mit.edu
*
@@ -96,7 +96,7 @@ sock_accept(arg)
CHECKe(pid = fork());
switch(pid) {
case 0:
- execl("test_sock_2a", "test_sock_2a", "fork okay", NULL);
+ execl("test_sock_2a", "test_sock_2a", "fork okay", (char *)NULL);
DIE(errno, "execl");
default:
break;
diff --git a/lib/libutil/passwd.c b/lib/libutil/passwd.c
index 8b98890a77e..a3a2f534875 100644
--- a/lib/libutil/passwd.c
+++ b/lib/libutil/passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: passwd.c,v 1.24 2001/01/02 18:22:32 millert Exp $ */
+/* $OpenBSD: passwd.c,v 1.25 2001/07/09 07:04:40 deraadt Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -34,7 +34,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: passwd.c,v 1.24 2001/01/02 18:22:32 millert Exp $";
+static char rcsid[] = "$OpenBSD: passwd.c,v 1.25 2001/07/09 07:04:40 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -295,10 +295,10 @@ pw_mkdb(username)
if (pw_lck) {
if (username)
execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", "-d",
- pw_dir, "-u", username, pw_lck, NULL);
+ pw_dir, "-u", username, pw_lck, (char *)NULL);
else
execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", "-d",
- pw_dir, pw_lck, NULL);
+ pw_dir, pw_lck, (char *)NULL);
}
_exit(1);
}