* Manifest: New.

* gpgconf.c, gpgconf.h, gpgconf-list.c: New. A skeleton for now.
* no-libgcrypt.c: New.
* Makefile.am: Add above.

tools/ChangeLog

@@ -1,3 +1,10 @@
+2004-01-05  Werner Koch  <wk@gnupg.org>
+
+	* Manifest: New.
+	* gpgconf.c, gpgconf.h, gpgconf-list.c: New. A skeleton for now.
+	* no-libgcrypt.c: New.
+	* Makefile.am: Add above.
+
 2003-12-23  Werner Koch  <wk@gnupg.org>
 
 	* Makefile.am: New.

tools/Makefile.am

@@ -17,4 +17,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-EXTRA_DIST = watchgnupg.c
+EXTRA_DIST = Manifest watchgnupg.c
+
+localedir = $(datadir)/locale
+INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
+AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/intl 
+
+bin_PROGRAMS = gpgconf
+
+gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-list.c no-libgcrypt.c
+
+gpgconf_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a @INTLLIBS@
+

tools/Manifest

@@ -0,0 +1,6 @@
+Makefile.am
+watchgnupg.c
+gpgconf.c
+gpgconf.h
+gpgconf-list.c
+$names$

tools/gpgconf-list.c

@@ -0,0 +1,60 @@
+/* gpgconf-list.c - Print list of options.
+ *	Copyright (C) 2003 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "gpgconf.h"
+#include "i18n.h"
+
+/* Format of the colon delimited listing is:
+
+   Area: gpg, gpgsm, gpg-agent, scdaemon, dirmngr, "G" or empty for unspecified.
+   Option name: Name of the option
+   Expert level: Expertnesslevel of option: 0 - basic
+   Immediately Change: "1" is the option is immediatley changeable
+                       (e.g. through SIGHUP)
+   Option index: Instance number of the option value to build lists. 
+   Option value: Current value of the option
+   
+*/
+
+
+/* List global options, i.er. those which are commonly required and
+   may affect more than one program. */
+static void
+list_global_options (void)
+{
+
+
+}
+
+
+
+void
+gpgconf_list_standard_options (void)
+{
+
+  list_global_options ();
+
+
+}

tools/gpgconf.c

@@ -0,0 +1,175 @@
+/* gpgconf.c - Configuration utility for GnuPG
+ *	Copyright (C) 2003 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <config.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "gpgconf.h"
+#include "i18n.h"
+
+/* Constants to identify the commands and options. */
+enum cmd_and_opt_values
+  {
+    aNull = 0,
+    oDryRun	= 'n',
+    oOutput	= 'o',
+    oQuiet	= 'q',
+    oVerbose	= 'v',
+    oNoVerbose	= 500,
+    oHomedir,
+    
+    aDummy
+  };
+
+
+/* The list of commands and options. */
+static ARGPARSE_OPTS opts[] =
+  {
+    { 300, NULL, 0, N_("@Commands:\n ") },
+    
+    { 301, NULL, 0, N_("@\nOptions:\n ") },
+    
+    { oOutput, "output",    2, N_("use as output file")},
+    { oVerbose, "verbose",  0, N_("verbose") },
+    { oQuiet,	"quiet",    0, N_("be somewhat more quiet") },
+    { oDryRun, "dry-run",   0, N_("do not make any changes") },
+    
+    /* hidden options */
+    { oNoVerbose, "no-verbose",  0, "@"},
+    { oHomedir,   "homedir",     2, "@" },   /* defaults to "~/.gnupg" */
+    {0}
+  };
+
+
+/* Print usage information and and provide strings for help. */
+static const char *
+my_strusage( int level )
+{
+  const char *p;
+
+  switch (level)
+    {
+    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 <" PACKAGE_BUGREPORT ">.\n");
+      break;
+    case 1:
+    case 40: p = _("Usage: gpgconf [options] (-h for help)");
+      break;
+    case 41:
+      p = _("Syntax: gpgconf [options]\n"
+            "Manage configuration options for tools of the GnuPG system\n");
+      break;
+
+    default: p = NULL; break;
+    }
+  return p;
+}
+
+
+/* Initialize the gettext system. */
+static void
+i18n_init(void)
+{
+#ifdef USE_SIMPLE_GETTEXT
+  set_gettext_file (PACKAGE);
+#else
+# ifdef ENABLE_NLS
+#  ifdef HAVE_LC_MESSAGES
+  setlocale (LC_TIME, "");
+  setlocale (LC_MESSAGES, "");
+#  else
+  setlocale (LC_ALL, "" );
+#  endif
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+# endif
+#endif
+}
+
+
+/* gpgconf main. */
+int
+main (int argc, char **argv)
+{
+  ARGPARSE_ARGS pargs;
+  const char *fname;
+  int no_more_options = 0;
+  enum cmd_and_opt_values cmd = 0;
+
+  set_strusage (my_strusage);
+  log_set_prefix ("gpgconf", 1);
+
+  i18n_init();
+
+  /* Setup the default homedir. */
+#ifdef __MINGW32__
+  opt.homedir = read_w32_registry_string ( NULL,
+                                           "Software\\GNU\\GnuPG", "HomeDir" );
+#else
+  opt.homedir = getenv ("GNUPGHOME");
+#endif
+  if (!opt.homedir || !*opt.homedir ) 
+    opt.homedir = GNUPG_DEFAULT_HOMEDIR;
+
+  /* Patrse the command line. */
+  pargs.argc  = &argc;
+  pargs.argv  = &argv;
+  pargs.flags =  1;  /* do not remove the args */
+  while (!no_more_options && optfile_parse (NULL, NULL, NULL, &pargs, opts))
+    {
+      switch (pargs.r_opt)
+        {
+        case oOutput:    opt.outfile = pargs.r.ret_str; break;
+          
+        case oQuiet:     opt.quiet = 1; break;
+        case oDryRun:    opt.dry_run = 1; break;
+        case oVerbose:   opt.verbose++; break;
+        case oNoVerbose: opt.verbose = 0; break;
+        case oHomedir:   opt.homedir = pargs.r.ret_str; break;
+
+        case aDummy: break;
+        default: pargs.err = 2; break;
+	}
+    }
+  
+  if (log_get_errorcount (0))
+    exit (2);
+  
+  fname = argc? *argv : NULL;
+  
+  switch (cmd)
+    {
+    default:
+      /* List all standard options. */
+      gpgconf_list_standard_options ();
+      break;
+    }
+  
+  return 0; 
+}
+
+
+

tools/gpgconf.h

@@ -0,0 +1,41 @@
+/* gpgconf.h - Global definitions for gpgconf
+ *	Copyright (C) 2003 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifndef GPGCONF_H
+#define GPGCONF_H
+
+#include "../common/util.h"
+
+/* We keep all global options in the structure OPT. */
+struct {
+  int verbose;         /* Verbosity level. */
+  int quiet;           /* Be as quiet as possible. */
+  int dry_run;         /* Don't change any persistent data. */
+  const char *homedir; /* Configuration directory name. */
+  char *outfile;       /* Name of output file. */
+} opt;
+
+
+
+/*-- gpgconf-list.c --*/
+void gpgconf_list_standard_options (void);
+
+
+#endif /*GPGCONF_H*/

tools/no-libgcrypt.c

@@ -0,0 +1,83 @@
+/* no-libgcrypt.c - Replacement functions for libgcrypt.
+ *	Copyright (C) 2003 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "../common/util.h"
+#include "i18n.h"
+
+
+/* Replace libgcrypt's malloc functions which are used by
+   ../jnlib/libjnlib.a .  ../common/util.h defines macros to map them
+   to xmalloc etc. */
+static void
+out_of_core (void)
+{
+  log_fatal (_("error allocating enough memory: %s\n"), strerror (errno));
+}
+
+
+void *
+gcry_xmalloc (size_t n)
+{
+  void *p = malloc (n);
+  if (!p)
+    out_of_core ();
+  return p;
+}
+
+void *
+gcry_xrealloc (void *a, size_t n)
+{
+  void *p = realloc (a, n);
+  if (!p)
+    out_of_core ();
+  return p;
+}
+
+void *
+gcry_xcalloc (size_t n, size_t m)
+{
+  void *p = calloc (n, m);
+  if (!p)
+    out_of_core ();
+  return p;
+}
+
+char *
+gcry_xstrdup (const char *string)
+{
+  void *p = malloc (strlen (string)+1);
+  if (!p)
+    out_of_core ();
+  strcpy( p, string );
+  return p;
+}
+
+void
+gcry_free (void *a)
+{
+  if (a)
+    free (a);
+}