On Sun, Jun 16, 2013 at 07:53:55PM +0100, Sami Kerola wrote:
> Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
> ---
> text-utils/display.c | 6 +++---
> text-utils/hexdump.c | 4 ++--
> text-utils/hexdump.h | 2 --
> 3 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/text-utils/display.c b/text-utils/display.c
> index 1f9a11b..41ddd8d 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;
> + int statok, exitval = 0;
>
> if (argv) {
> _argv = argv;
> @@ -305,14 +305,14 @@ int next(char **argv)
> if (*_argv) {
> if (!(freopen(*_argv, "r", stdin))) {
> warn("%s", *_argv);
> - exitval = EXIT_FAILURE;
> + exitval = 1;
> ++_argv;
> continue;
> }
> statok = done = 1;
> } else {
> if (done++)
> - return(0);
> + return(exitval);
> statok = 0;
> }
> if (skip)
> diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
> index e966cc3..411d809 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);
>
> - (void)next(argv);
> + exitval = next(argv);
A little late to the game, but this commit breaks the return value of
hexdump and causes it to always return 1, even on successful invocation.
next(char**) will always return 1 for the usual (non-NULL) values of argv.
d
> display();
> return exitval;
> }
> diff --git a/text-utils/hexdump.h b/text-utils/hexdump.h
> index b9e67a1..b2ea1f1 100644
> --- a/text-utils/hexdump.h
> +++ b/text-utils/hexdump.h
> @@ -73,8 +73,6 @@ 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 deprecated; /* od compatibility */
> -extern int exitval; /* final exit value */
> extern ssize_t length; /* max bytes to read */
> extern off_t skip; /* bytes to skip */
>
> --
> 1.8.3.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe util-linux" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
