make option handling more regular across all tools

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

1 files changed, 19 insertions, 17 deletions

diff --git a/src/daemon/abrt-server.c b/src/daemon/abrt-server.c
index 47457aaf..3415e95c 100644
--- a/src/daemon/abrt-server.c
+++ b/src/daemon/abrt-server.c
@@ -21,6 +21,7 @@
 #include "hooklib.h"
 #include "parse_options.h"
 
+#define PROGNAME "abrt-server"
 
 /* Maximal length of backtrace. */
 #define MAX_BACKTRACE_SIZE (1024*1024)
@@ -275,31 +276,32 @@ static void process_message(const char *message)
 
 static void dummy_handler(int sig_unused) {}
 
-static const char abrt_server_usage[] = "abrt-server [options]";
-enum {
-    OPT_v = 1 << 0,
-    OPT_u = 1 << 1,
-    OPT_s = 1 << 2,
-};
-/* Keep enum above and order of options below in sync! */
-static struct options abrt_server_options[] = {
-    OPT__VERBOSE(&g_verbose),
-    OPT_INTEGER( 'u' , 0, &client_uid, "Use UID as client uid"),
-    OPT_BOOL( 's' , 0, NULL, "Log to syslog"),
-    OPT_END()
-};
-
 int main(int argc, char **argv)
 {
     char *env_verbose = getenv("ABRT_VERBOSE");
     if (env_verbose)
         g_verbose = atoi(env_verbose);
 
-    unsigned opts = parse_opts(argc, argv, abrt_server_options,
-                           abrt_server_usage);
+    /* Can't keep these strings/structs static: _() doesn't support that */
+    const char *program_usage_string = _(
+        PROGNAME" [options]"
+    );
+    enum {
+        OPT_v = 1 << 0,
+        OPT_u = 1 << 1,
+        OPT_s = 1 << 2,
+    };
+    /* Keep enum above and order of options below in sync! */
+    struct options program_options[] = {
+        OPT__VERBOSE(&g_verbose),
+        OPT_INTEGER('u', NULL, &client_uid, _("Use UID as client uid")),
+        OPT_BOOL(   's', NULL, NULL       , _("Log to syslog")),
+        OPT_END()
+    };
+    unsigned opts = parse_opts(argc, argv, program_options, program_usage_string);
 
     putenv(xasprintf("ABRT_VERBOSE=%u", g_verbose));
-    msg_prefix = xasprintf("abrt-server[%u]", getpid());
+    msg_prefix = xasprintf(PROGNAME"[%u]", getpid());
     if (opts & OPT_s)
     {
         openlog(msg_prefix, 0, LOG_DAEMON);