From 4a689e9b49a0a40c062c5e4b1d46a100ec7f6d85 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 18 Jun 2008 16:38:22 +0000 Subject: [PATCH] fix trivial error with inverted exit code in ls --- coreutils/ls.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/coreutils/ls.c b/coreutils/ls.c index 7d33eae8d..56be12a64 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -139,7 +139,7 @@ struct globals { #if ENABLE_FEATURE_LS_COLOR smallint show_color; #endif - smallint exit_failure; + smallint exit_code; unsigned all_fmt; #if ENABLE_FEATURE_AUTOWIDTH unsigned tabstops; // = COLUMN_GAP; @@ -156,7 +156,7 @@ struct globals { #else enum { show_color = 0 }; #endif -#define exit_failure (G.exit_failure ) +#define exit_code (G.exit_code ) #define all_fmt (G.all_fmt ) #if ENABLE_FEATURE_AUTOWIDTH #define tabstops (G.tabstops ) @@ -206,7 +206,7 @@ static struct dnode *my_stat(const char *fullname, const char *name, int force_f #endif if (stat(fullname, &dstat)) { bb_simple_perror_msg(fullname); - exit_failure = 1; + exit_code = EXIT_FAILURE; return 0; } } else { @@ -217,7 +217,7 @@ static struct dnode *my_stat(const char *fullname, const char *name, int force_f #endif if (lstat(fullname, &dstat)) { bb_simple_perror_msg(fullname); - exit_failure = 1; + exit_code = EXIT_FAILURE; return 0; } } @@ -529,7 +529,7 @@ static struct dnode **list_dir(const char *path) nfiles = 0; dir = warn_opendir(path); if (dir == NULL) { - exit_failure = 1; + exit_code = EXIT_FAILURE; return NULL; /* could not open the dir */ } while ((entry = readdir(dir)) != NULL) { @@ -975,5 +975,5 @@ int ls_main(int argc ATTRIBUTE_UNUSED, char **argv) } if (ENABLE_FEATURE_CLEAN_UP) dfree(dnp, nfiles); - return (exit_failure == 0); + return exit_code; } -- 2.25.1