commit - f7cbd2e1573c52727e07572eb8725623f4ce0a3f2776c82191ac0d1413b4a20f
commit + e3e3c46ba063d58085bb603ab3e755ce1ff44d9b8789afe72e0ac5aa48f5c8f5
blob - 0c957324c309f7a424ea525416b17fe049b0a9ece196d3740119c266080a8dbb
blob + 935953858b90e966d5f18dfb186ea4512dab96efef20d0082ffa31adb402f54d
--- gotwebd/gotwebd.8
+++ gotwebd/gotwebd.8
.It Fl v
Verbose mode.
Verbosity increases if this option is used multiple times.
+.It Fl V , -version
+Display program version and exit immediately.
.El
.Pp
Enabling
blob - 59f4c3df566af7bdd02c6c809892bef0157b60633aa395251ad9fef92c3ccb0f
blob + c4475a9a81bab3c7576988b69102eb17c1977bfa5b0a6b0740f5e3568edfb481
--- gotwebd/gotwebd.c
+++ gotwebd/gotwebd.c
#include <unistd.h>
#include <ctype.h>
#include <util.h>
+#include <getopt.h>
+#include "got_version.h"
#include "got_opentemp.h"
#include "got_reference.h"
#include "got_object.h"
struct gotwebd *env;
struct passwd *pw;
int ch, i, gotwebd_ngroups = NGROUPS_MAX;
- int no_action = 0;
+ int no_action = 0, version_flag = 0;
int proc_type = GOTWEBD_PROC_PARENT;
const char *conffile = GOTWEBD_CONF;
const char *gotwebd_username = GOTWEBD_DEFAULT_USER;
gid_t gotwebd_groups[NGROUPS_MAX];
gid_t www_gid;
const char *argv0, *errstr;
+ static const struct option longopts[] = {
+ { "version", no_argument, NULL, 'V' },
+ { NULL, 0, NULL, 0 }
+ };
if ((argv0 = argv[0]) == NULL)
argv0 = "gotwebd";
fatal("%s: calloc", __func__);
config_init(env);
- while ((ch = getopt(argc, argv, "A:C:D:dG:f:F:L:nS:vW:")) != -1) {
+ while ((ch = getopt_long(argc, argv, "A:C:D:dG:f:F:L:nS:vVW:", longopts, NULL)) != -1) {
switch (ch) {
case 'A':
proc_type = GOTWEBD_PROC_AUTH;
if (env->gotwebd_verbose < 3)
env->gotwebd_verbose++;
break;
+ case 'V':
+ version_flag = 1;
+ break;
default:
usage();
}
if (argc > 0)
usage();
+ if (version_flag) {
+ got_version_print_str();
+ return 0;
+ }
gotwebd_env = env;
env->gotwebd_conffile = conffile;