pacman: use exit status 0 for --help and --version

The user requesting usage or version information is not an error.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>

2 files changed, 10 insertions, 3 deletions

diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 71443394..8c76987e 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -889,11 +889,11 @@ static int parseargs(int argc, char *argv[])
 	}
 	if(config->help) {
 		usage(config->op, mbasename(argv[0]));
-		return 2;
+		cleanup(0);
 	}
 	if(config->version) {
 		version();
-		return 2;
+		cleanup(0);
 	}
 
 	/* parse all other options */
diff --git a/src/util/pacsort.c b/src/util/pacsort.c
index 948b03d3..2d53a1cc 100644
--- a/src/util/pacsort.c
+++ b/src/util/pacsort.c
@@ -45,6 +45,7 @@ static struct options_t {
 	int sortkey;
 	int null;
 	int filemode;
+	int help;
 	char delim;
 } opts;
 
@@ -374,7 +375,8 @@ static int parse_options(int argc, char **argv)
 				opts.filemode = 1;
 				break;
 			case 'h':
-				return 1;
+				opts.help = 1;
+				return 0;
 			case 'k':
 				opts.sortkey = (int)strtol(optarg, NULL, 10);
 				if(opts.sortkey <= 0) {
@@ -420,6 +422,11 @@ int main(int argc, char *argv[])
 		return 2;
 	}
 
+	if(opts.help) {
+		usage();
+		return 0;
+	}
+
 	list = list_new(100);
 	buffer = buffer_new(BUFSIZ * 3);