add -V, --version option

falconindy · Oct 27, 2012 · 7597dd6 · 7597dd6
1 parent 9e5ddcb
commit 7597dd6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/extra/bash-completion b/extra/bash-completion
@@ -6,8 +6,8 @@ _pkgfile() {
   _get_comp_words_by_ref cur prev
 
   opts="-l --list -s --search -u --update -b --binaries -g --glob -i
-        --ignorecase -q --quiet -R --repo -r --regex -h --help -v --verbose
+        --ignorecase -q --quiet -R --repo -r --regex -h --help -V --version
-        -w --raw -z --compress"
+        -v --verbose -w --raw -z --compress"
 
   if [[ $prev = -*R || $prev = '--repo' ]]; then
     repos=$(sed '/^\[\(.*\)\]$/!d;s//\1/g;/options/d' /etc/pacman.conf)

diff --git a/extra/zsh-completion b/extra/zsh-completion
@@ -33,6 +33,7 @@ _longopts=(
     '--quiet[output less when listing]'
     '--repo[search a specific repo]: :_repos'
     '--regex[enable matching with regular expressions]'
+    '--version[display program version]'
     '--verbose[output more]'
     '--raw[disable output justification]'
     '--null[null terminate output]'
@@ -51,6 +52,7 @@ _shortopts=(
     '*-q[output less when listing]'
     '*-R[search a specific repo]: :_repos'
     '*-r[enable matching with regular expressions]'
+    '*-V[display program version]'
     '*-v[output more]'
     '*-w[disable output justification]'
     '*-0[null terminate output]'

diff --git a/src/pkgfile.c b/src/pkgfile.c
@@ -426,14 +426,20 @@ static void usage(void)
 			stdout);
 	fputs(
 			" General:\n"
-			"  -h, --help              display this help and exit\n\n",
+			"  -h, --help              display this help and exit\n"
+			"  -V, --version           display the version and exit\n\n",
 			stdout);
 }
 
+static void print_version(void)
+{
+	fputs(PACKAGE_NAME " v" PACKAGE_VERSION "\n", stdout);
+}
+
 static int parse_opts(int argc, char **argv)
 {
 	int opt;
-	static const char *shortopts = "0bdghilqR:rsuvwz::";
+	static const char *shortopts = "0bdghilqR:rsuVvwz::";
 	static const struct option longopts[] = {
 		{"binaries",    no_argument,        0, 'b'},
 		{"compress",    optional_argument,  0, 'z'},
@@ -447,6 +453,7 @@ static int parse_opts(int argc, char **argv)
 		{"regex",       no_argument,        0, 'r'},
 		{"search",      no_argument,        0, 's'},
 		{"update",      no_argument,        0, 'u'},
+		{"version",     no_argument,        0, 'V'},
 		{"verbose",     no_argument,        0, 'v'},
 		{"raw",         no_argument,        0, 'w'},
 		{"null",        no_argument,        0, '0'},
@@ -509,6 +516,9 @@ static int parse_opts(int argc, char **argv)
 		case 'u':
 			config.doupdate++;
 			break;
+		case 'V':
+			print_version();
+			exit(EXIT_SUCCESS);
 		case 'v':
 			config.verbose = true;
 			break;