From aea92d2f4a6759950baae79a99c19d0feba08b09 Mon Sep 17 00:00:00 2001 From: delphij Date: Thu, 27 Aug 2015 21:52:09 +0000 Subject: MFC r281800 (pfg): patch(1): small include changes. Mostly to match OpenBSD, no functional change. MFC r286601 + 286617: use posix_spawn(3) instead of fork() and exec() manually as suggested by jmg@. --- usr.bin/patch/inp.c | 78 ++++++++++++++++++++++++---------------------------- usr.bin/patch/pch.c | 1 + usr.bin/patch/util.c | 6 ++-- 3 files changed, 40 insertions(+), 45 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c index bcc8416..006d440 100644 --- a/usr.bin/patch/inp.c +++ b/usr.bin/patch/inp.c @@ -36,8 +36,10 @@ #include #include #include -#include +#include +#include #include +#include #include #include #include @@ -134,14 +136,13 @@ reallocate_lines(size_t *lines_allocated) static bool plan_a(const char *filename) { - int ifd, statfailed, devnull, pstat; + int ifd, statfailed, pstat; char *p, *s, lbuf[INITLINELEN]; struct stat filestat; ptrdiff_t sz; size_t i; size_t iline, lines_allocated; pid_t pid; - char *argp[4] = {NULL}; #ifdef DEBUGGING if (debug & 8) @@ -178,7 +179,9 @@ plan_a(const char *filename) ((filestat.st_mode & 0022) == 0 && filestat.st_uid != getuid())) { char *filebase, *filedir; struct stat cstat; - char *tmp_filename1, *tmp_filename2; + char *tmp_filename1, *tmp_filename2; + char *argp[4] = { NULL }; + posix_spawn_file_actions_t file_actions; tmp_filename1 = strdup(filename); tmp_filename2 = strdup(filename); @@ -188,6 +191,8 @@ plan_a(const char *filename) filebase = basename(tmp_filename1); filedir = dirname(tmp_filename2); + memset(argp, 0, sizeof(argp)); + #define try(f, a1, a2, a3) \ (snprintf(lbuf, sizeof(lbuf), f, a1, a2, a3), stat(lbuf, &cstat) == 0) @@ -213,50 +218,39 @@ plan_a(const char *filename) say("Comparing file %s to default " "RCS version...\n", filename); - switch (pid = fork()) { - case -1: - fatal("can't fork: %s\n", - strerror(errno)); - case 0: - devnull = open("/dev/null", O_RDONLY); - if (devnull == -1) { - fatal("can't open /dev/null: %s", - strerror(errno)); - } - (void)dup2(devnull, STDOUT_FILENO); - argp[0] = strdup(RCSDIFF); - argp[1] = strdup(filename); - execv(RCSDIFF, argp); - exit(127); - } - pid = waitpid(pid, &pstat, 0); - if (pid == -1 || WEXITSTATUS(pstat) != 0) { - fatal("can't check out file %s: " - "differs from default RCS version\n", - filename); - } + argp[0] = __DECONST(char *, RCSDIFF); + argp[1] = __DECONST(char *, filename); + posix_spawn_file_actions_init(&file_actions); + posix_spawn_file_actions_addopen(&file_actions, + STDOUT_FILENO, _PATH_DEVNULL, O_WRONLY, 0); + if (posix_spawn(&pid, RCSDIFF, &file_actions, + NULL, argp, NULL) == 0) { + pid = waitpid(pid, &pstat, 0); + if (pid == -1 || WEXITSTATUS(pstat) != 0) + fatal("can't check out file %s: " + "differs from default RCS version\n", + filename); + } else + fatal("posix_spawn: %s\n", strerror(errno)); + posix_spawn_file_actions_destroy(&file_actions); } if (verbose) say("Checking out file %s from RCS...\n", filename); - switch (pid = fork()) { - case -1: - fatal("can't fork: %s\n", strerror(errno)); - case 0: - argp[0] = strdup(CHECKOUT); - argp[1] = strdup("-l"); - argp[2] = strdup(filename); - execv(CHECKOUT, argp); - exit(127); - } - pid = waitpid(pid, &pstat, 0); - if (pid == -1 || WEXITSTATUS(pstat) != 0 || - stat(filename, &filestat)) { - fatal("can't check out file %s from RCS\n", - filename); - } + argp[0] = __DECONST(char *, CHECKOUT); + argp[1] = __DECONST(char *, "-l"); + argp[2] = __DECONST(char *, filename); + if (posix_spawn(&pid, CHECKOUT, NULL, NULL, argp, + NULL) == 0) { + pid = waitpid(pid, &pstat, 0); + if (pid == -1 || WEXITSTATUS(pstat) != 0 || + stat(filename, &filestat)) + fatal("can't check out file %s from RCS\n", + filename); + } else + fatal("posix_spawn: %s\n", strerror(errno)); } else if (statfailed) { fatal("can't find %s\n", filename); } diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c index 08a7447..5fadf62 100644 --- a/usr.bin/patch/pch.c +++ b/usr.bin/patch/pch.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include diff --git a/usr.bin/patch/util.c b/usr.bin/patch/util.c index 27ee1ae..1859e17 100644 --- a/usr.bin/patch/util.c +++ b/usr.bin/patch/util.c @@ -27,13 +27,13 @@ * $FreeBSD$ */ -#include #include #include #include #include #include +#include #include #include #include @@ -96,7 +96,7 @@ int backup_file(const char *orig) { struct stat filestat; - char bakname[MAXPATHLEN], *s, *simplename; + char bakname[PATH_MAX], *s, *simplename; dev_t orig_device; ino_t orig_inode; @@ -406,7 +406,7 @@ fetchname(const char *at, bool *exists, int strip_leading) char * checked_in(char *file) { - char *filebase, *filedir, tmpbuf[MAXPATHLEN]; + char *filebase, *filedir, tmpbuf[PATH_MAX]; struct stat filestat; filebase = basename(file); -- cgit v1.1