tools/gpgtar: Rework argument parsing.

[gnupg.git] / tools / gpgconf.c

diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index cff6e4b..180c88a 100644 (file)
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -51,6 +51,7 @@ enum cmd_and_opt_values
     aListConfig,
     aCheckConfig,
     aListDirs,
     aListConfig,
     aCheckConfig,
     aListDirs,

+    aLaunch,

     aKill,
     aReload
   };
     aKill,
     aReload
   };


@@ -69,12 +70,13 @@ static ARGPARSE_OPTS opts[] =
     { aApplyDefaults, "apply-defaults", 256,
       N_("apply global default values") },
     { aListDirs, "list-dirs", 256,
     { aApplyDefaults, "apply-defaults", 256,
       N_("apply global default values") },
     { aListDirs, "list-dirs", 256,

-      N_("get the configuration directories for gpgconf") },
+      N_("get the configuration directories for @GPGCONF@") },

     { aListConfig,   "list-config", 256,
       N_("list global configuration file") },
     { aCheckConfig,   "check-config", 256,
       N_("check global configuration file") },
     { aReload,        "reload", 256, N_("reload all or a given component")},
     { aListConfig,   "list-config", 256,
       N_("list global configuration file") },
     { aCheckConfig,   "check-config", 256,
       N_("check global configuration file") },
     { aReload,        "reload", 256, N_("reload all or a given component")},

+    { aLaunch,        "launch", 256, N_("launch a given component")},

     { aKill,          "kill", 256,   N_("kill a given component")},
 
     { 301, NULL, 0, N_("@\nOptions:\n ") },
     { aKill,          "kill", 256,   N_("kill a given component")},
 
     { 301, NULL, 0, N_("@\nOptions:\n ") },


@@ -98,18 +100,18 @@ my_strusage( int level )
 
   switch (level)
     {
 
   switch (level)
     {

-    case 11: p = "gpgconf (GnuPG)";
+    case 11: p = "@GPGCONF@ (@GNUPG@)";

       break;
     case 13: p = VERSION; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
     case 1:
       break;
     case 13: p = VERSION; break;
     case 17: p = PRINTABLE_OS_NAME; break;
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
 
     case 1:

-    case 40: p = _("Usage: gpgconf [options] (-h for help)");
+    case 40: p = _("Usage: @GPGCONF@ [options] (-h for help)");

       break;
     case 41:
       break;
     case 41:

-      p = _("Syntax: gpgconf [options]\n"
-            "Manage configuration options for tools of the GnuPG system\n");
+      p = _("Syntax: @GPGCONF@ [options]\n"
+            "Manage configuration options for tools of the @GNUPG@ system\n");

       break;
 
     default: p = NULL; break;
       break;
 
     default: p = NULL; break;


@@ -130,7 +132,7 @@ get_outfp (estream_t *fp)
         {
           *fp = es_fopen (opt.outfile, "w");
           if (!*fp)
         {
           *fp = es_fopen (opt.outfile, "w");
           if (!*fp)

-            gc_error (1, errno, "can not open `%s'", opt.outfile);
+            gc_error (1, errno, "can not open '%s'", opt.outfile);

         }
       else
         *fp = es_stdout;
         }
       else
         *fp = es_stdout;


@@ -149,9 +151,10 @@ main (int argc, char **argv)
   enum cmd_and_opt_values cmd = 0;
   estream_t outfp = NULL;
 
   enum cmd_and_opt_values cmd = 0;
   estream_t outfp = NULL;
 

-  gnupg_reopen_std ("gpgconf");
+  early_system_init ();
+  gnupg_reopen_std (GPGCONF_NAME);

   set_strusage (my_strusage);
   set_strusage (my_strusage);

-  log_set_prefix ("gpgconf", 1);
+  log_set_prefix (GPGCONF_NAME, 1);

 
   /* Make sure that our subsystems are ready.  */
   i18n_init();
 
   /* Make sure that our subsystems are ready.  */
   i18n_init();


@@ -184,6 +187,7 @@ main (int argc, char **argv)
         case aListConfig:
         case aCheckConfig:
         case aReload:
         case aListConfig:
         case aCheckConfig:
         case aReload:

+        case aLaunch:

         case aKill:
          cmd = pargs.r_opt;
          break;
         case aKill:
          cmd = pargs.r_opt;
          break;


@@ -195,6 +199,16 @@ main (int argc, char **argv)
   if (log_get_errorcount (0))
     exit (2);
 
   if (log_get_errorcount (0))
     exit (2);
 

+  /* Print a warning if an argument looks like an option.  */
+  if (!opt.quiet && !(pargs.flags & ARGPARSE_FLAG_STOP_SEEN))
+    {
+      int i;
+
+      for (i=0; i < argc; i++)
+        if (argv[i][0] == '-' && argv[i][1] == '-')
+          log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
+    }
+

   fname = argc ? *argv : NULL;
 
   switch (cmd)
   fname = argc ? *argv : NULL;
 
   switch (cmd)


@@ -215,7 +229,7 @@ main (int argc, char **argv)
     case aCheckOptions:
       if (!fname)
        {
     case aCheckOptions:
       if (!fname)
        {

-         es_fputs (_("usage: gpgconf [options] "), es_stderr);
+         es_fprintf (es_stderr, _("usage: %s [options] "), GPGCONF_NAME);

          es_putc ('\n', es_stderr);
          es_fputs (_("Need one component argument"), es_stderr);
          es_putc ('\n', es_stderr);
          es_putc ('\n', es_stderr);
          es_fputs (_("Need one component argument"), es_stderr);
          es_putc ('\n', es_stderr);


@@ -245,10 +259,11 @@ main (int argc, char **argv)
        }
       break;
 
        }
       break;
 

+    case aLaunch:

     case aKill:
       if (!fname)
        {
     case aKill:
       if (!fname)
        {

-         es_fputs (_("usage: gpgconf [options] "), es_stderr);
+         es_fprintf (es_stderr, _("usage: %s [options] "), GPGCONF_NAME);

          es_putc ('\n', es_stderr);
          es_fputs (_("Need one component argument"), es_stderr);
          es_putc ('\n', es_stderr);
          es_putc ('\n', es_stderr);
          es_fputs (_("Need one component argument"), es_stderr);
          es_putc ('\n', es_stderr);


@@ -256,7 +271,7 @@ main (int argc, char **argv)
        }
       else
         {
        }
       else
         {

-          /* Kill a given component.  */
+          /* Launch/Kill a given component.  */

           int idx;
 
           idx = gc_component_find (fname);
           int idx;
 
           idx = gc_component_find (fname);


@@ -266,8 +281,16 @@ main (int argc, char **argv)
               es_putc ('\n', es_stderr);
               exit (1);
             }
               es_putc ('\n', es_stderr);
               exit (1);
             }

+          else if (cmd == aLaunch)
+            {
+              if (gc_component_launch (idx))
+                exit (1);
+            }

           else
             {
           else
             {

+              /* We don't error out if the kill failed because this
+                 command should do nothing if the component is not
+                 running.  */

               gc_component_kill (idx);
             }
         }
               gc_component_kill (idx);
             }
         }


@@ -311,7 +334,7 @@ main (int argc, char **argv)
     case aApplyDefaults:
       if (fname)
        {
     case aApplyDefaults:
       if (fname)
        {

-         es_fputs (_("usage: gpgconf [options] "), es_stderr);
+         es_fprintf (es_stderr, _("usage: %s [options] "), GPGCONF_NAME);

          es_putc ('\n', es_stderr);
          es_fputs (_("No argument allowed"), es_stderr);
          es_putc ('\n', es_stderr);
          es_putc ('\n', es_stderr);
          es_fputs (_("No argument allowed"), es_stderr);
          es_putc ('\n', es_stderr);


@@ -337,30 +360,25 @@ main (int argc, char **argv)
                   gc_percent_escape (gnupg_datadir ()));
       es_fprintf (outfp, "localedir:%s\n",
                   gc_percent_escape (gnupg_localedir ()));
                   gc_percent_escape (gnupg_datadir ()));
       es_fprintf (outfp, "localedir:%s\n",
                   gc_percent_escape (gnupg_localedir ()));

-      es_fprintf (outfp, "dirmngr-socket:%s\n",
-                  gc_percent_escape (dirmngr_socket_name ()));
+
+      if (dirmngr_user_socket_name ())
+        {
+          es_fprintf (outfp, "dirmngr-socket:%s\n",
+                      gc_percent_escape (dirmngr_user_socket_name ()));
+          es_fprintf (outfp, "dirmngr-sys-socket:%s\n",
+                      gc_percent_escape (dirmngr_sys_socket_name ()));
+        }
+      else
+        {
+          es_fprintf (outfp, "dirmngr-socket:%s\n",
+                      gc_percent_escape (dirmngr_sys_socket_name ()));
+        }
+

       {
       {

-        char *infostr = getenv ("GPG_AGENT_INFO");
-
-        if (!infostr || !*infostr)
-          infostr = make_filename (default_homedir (), "S.gpg-agent", NULL);
-        else
-          {
-            char *tmp;
-
-            infostr = xstrdup (infostr);
-            tmp = strchr (infostr, PATHSEP_C);
-            if (!tmp || tmp == infostr)
-              {
-                xfree (infostr);
-                infostr = NULL;
-              }
-            else
-              *tmp = 0;
-          }
-        es_fprintf (outfp, "agent-socket:%s\n",
-                    infostr? gc_percent_escape (infostr) : "");
-        xfree (infostr);
+        char *tmp = make_filename (default_homedir (),
+                                   GPG_AGENT_SOCK_NAME, NULL);
+        es_fprintf (outfp, "agent-socket:%s\n", gc_percent_escape (tmp));
+        xfree (tmp);

       }
       {
         /* We need to use make_filename to expand a possible "~/".  */
       }
       {
         /* We need to use make_filename to expand a possible "~/".  */


@@ -373,7 +391,7 @@ main (int argc, char **argv)
 
   if (outfp != es_stdout)
     if (es_fclose (outfp))
 
   if (outfp != es_stdout)
     if (es_fclose (outfp))

-      gc_error (1, errno, "error closing `%s'", opt.outfile);
+      gc_error (1, errno, "error closing '%s'", opt.outfile);

 
   return 0;
 }
 
   return 0;
 }