diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-07-16 10:37:05 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-07-16 10:37:05 +0000 |
| commit | d8d685e828868b425f334b52101927369e4e6e0b (patch) | |
| tree | f964908de7850423d55e4db1fea9ce0124783121 /usr.bin/timeout | |
| parent | 8b705cd9a29745095afb59804dbe6f0be2502be0 (diff) | |
| download | src-d8d685e828868b425f334b52101927369e4e6e0b.tar.gz src-d8d685e828868b425f334b52101927369e4e6e0b.zip | |
Fix build with gcc
Notes
Notes:
svn path=/head/; revision=268747
Diffstat (limited to 'usr.bin/timeout')
| -rw-r--r-- | usr.bin/timeout/timeout.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/timeout/timeout.c b/usr.bin/timeout/timeout.c index 212341770675..4cfe600206bd 100644 --- a/usr.bin/timeout/timeout.c +++ b/usr.bin/timeout/timeout.c @@ -102,11 +102,11 @@ static int parse_signal(const char *str) { int sig, i; - const char *err; + const char *errstr; - sig = strtonum(str, 0, sys_nsig, &err); + sig = strtonum(str, 0, sys_nsig, &errstr); - if (err == NULL) + if (errstr == NULL) return (sig); if (strncasecmp(str, "SIG", 3) == 0) str += 3; @@ -166,7 +166,6 @@ main(int argc, char **argv) int foreground, preserve; int error, pstat, status; int killsig = SIGTERM; - int killedwith; pid_t pgid, pid, cpid; double first_kill; double second_kill; @@ -186,6 +185,7 @@ main(int argc, char **argv) foreground = preserve = 0; second_kill = 0; cpid = -1; + pgid = -1; struct option longopts[] = { { "preserve-status", no_argument, &preserve, 1 }, @@ -273,7 +273,6 @@ main(int argc, char **argv) sigemptyset(&signals.sa_mask); for (;;) { - killedwith = killsig; sigemptyset(&signals.sa_mask); sigsuspend(&signals.sa_mask); |