diff options
| -rw-r--r-- | text-utils/display.c | 6 | ||||
| -rw-r--r-- | text-utils/hexdump.c | 4 | ||||
| -rw-r--r-- | text-utils/hexdump.h | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/text-utils/display.c b/text-utils/display.c index 41ddd8db5..1f9a11b4c 100644 --- a/text-utils/display.c +++ b/text-utils/display.c @@ -295,7 +295,7 @@ get(void) int next(char **argv) { static int done; - int statok, exitval = 0; + int statok; if (argv) { _argv = argv; @@ -305,14 +305,14 @@ int next(char **argv) if (*_argv) { if (!(freopen(*_argv, "r", stdin))) { warn("%s", *_argv); - exitval = 1; + exitval = EXIT_FAILURE; ++_argv; continue; } statok = done = 1; } else { if (done++) - return(exitval); + return(0); statok = 0; } if (skip) diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c index 411d80986..e966cc313 100644 --- a/text-utils/hexdump.c +++ b/text-utils/hexdump.c @@ -47,11 +47,11 @@ FS *fshead; /* head of format strings */ ssize_t blocksize; /* data block size */ +int exitval; /* final exit value */ ssize_t length = -1; /* max bytes to read */ int main(int argc, char **argv) { - int exitval; /* final exit value */ FS *tfs; char *p; @@ -76,7 +76,7 @@ int main(int argc, char **argv) for (tfs = fshead; tfs; tfs = tfs->nextfs) rewrite(tfs); - exitval = next(argv); + (void)next(argv); display(); return exitval; } diff --git a/text-utils/hexdump.h b/text-utils/hexdump.h index b2ea1f152..fa8f632c1 100644 --- a/text-utils/hexdump.h +++ b/text-utils/hexdump.h @@ -73,6 +73,7 @@ typedef struct _fs { /* format strings */ extern FU *endfu; extern FS *fshead; /* head of format strings list */ extern ssize_t blocksize; /* data block size */ +extern int exitval; /* final exit value */ extern ssize_t length; /* max bytes to read */ extern off_t skip; /* bytes to skip */ |