summaryrefslogtreecommitdiff
path: root/usr.sbin/cron/popen.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2015-01-14 17:27:31 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2015-01-14 17:27:31 +0000
commit0d4746936ec06236485d8677a1f7aeeb6e323542 (patch)
treeeab780d614584f41fb86163a8112e1466bd8169a /usr.sbin/cron/popen.c
parentefd9b848ca6aecfd28fead1ac2633e5b2ad07852 (diff)
Use standard types for wait, readdir, signals and pids.
Diffstat (limited to 'usr.sbin/cron/popen.c')
-rw-r--r--usr.sbin/cron/popen.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/cron/popen.c b/usr.sbin/cron/popen.c
index 613d1e8a094..1598f0d969d 100644
--- a/usr.sbin/cron/popen.c
+++ b/usr.sbin/cron/popen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: popen.c,v 1.22 2011/08/22 19:32:42 millert Exp $ */
+/* $OpenBSD: popen.c,v 1.23 2015/01/14 17:27:30 millert Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -47,7 +47,7 @@
* may create a pipe to a hidden program as a side effect of a list or dir
* command.
*/
-static PID_T *pids;
+static pid_t *pids;
static int fds;
FILE *
@@ -55,7 +55,7 @@ cron_popen(char *program, char *type, struct passwd *pw) {
char *cp;
FILE *iop;
int argc, pdes[2];
- PID_T pid;
+ pid_t pid;
char *argv[MAX_ARGV];
if ((*type != 'r' && *type != 'w') || type[1] != '\0')
@@ -64,7 +64,7 @@ cron_popen(char *program, char *type, struct passwd *pw) {
if (!pids) {
if ((fds = sysconf(_SC_OPEN_MAX)) <= 0)
return (NULL);
- if (!(pids = calloc(fds, sizeof(PID_T))))
+ if (!(pids = calloc(fds, sizeof(pid_t))))
return (NULL);
}
if (pipe(pdes) < 0)
@@ -144,8 +144,8 @@ cron_popen(char *program, char *type, struct passwd *pw) {
int
cron_pclose(FILE *iop) {
int fdes;
- PID_T pid;
- WAIT_T status;
+ pid_t pid;
+ int status;
sigset_t sigset, osigset;
/*