2004-02-27 Marcus Brinkmann <[email protected]>

	* src/Makefile.am (noinst_PROGRAMS): New variable.
	(gpg_error_LDADD): New variable.
	(gpg_error_SOURCES): New variable.
	(EXTRA_DIST): Add mkheader.awk and gpg-error.h.in.
	(BUILT_SOURCES): Add err-sources-sym.h, err-codes-sym.h and
	errnos-sym.h.
	(CLEANFILES): Add err-sources-sym.h, err-codes-sym.h,
	errnos-sym.h and gpg-error.h.
	(err-codes.h, err-sources.h): Add -v textidx=3 to mkstrtable.awk
	invocation.
	(err-codes-sym.h): New target.
	(err-sources-sym.h): New target.
	(gpg-error.h): New rule.
	* src/mkstrtable.awk: Skip the second field (which contains the
	error code symbol).
	(FS): Allow more than one tab as field separator.
	Allow to specify the field to be used as text with the variable
	textidx.
	Allow to suppress gettext markers in the output.
	Allow to specify a prefix to the messages.
	Allow to specify a namespace for the variable and macro names.
	* src/mkerrnos.awk (FS): Initialize.  Understand variable
	errnoidx, which defaults to 2, to cope with the error names being
	in a different column than the first.
	* src/mkerrcodes1.awk: Likewise.  Use \t as separator.
	* src/mkheader.awk: New file.
	* src/errnos.in: Add error code numbers (relativ to
	GPG_ERR_SYSTEM_ERROR).
	* src/strerror-sym.c: New file.
	* src/strsources-sym.c: New file.
	* src/err-codes.h.in: Add the error code symbol for every error
	code.
	(GPG_ERR_BUFFER_TOO_SHORT): Fix error code (it is 200, not 199).
	* src/err-sources.h.in: Likewise.
	* src/gpg-error.h.in: New file.
	* src/gpg-error.h: File removed.
	* src/gpg-error.c: New file.

1 files changed, 260 insertions, 0 deletions

diff --git a/src/gpg-error.c b/src/gpg-error.c
new file mode 100644
index 0000000..519c523
--- /dev/null
+++ b/src/gpg-error.c
@@ -0,0 +1,260 @@
+/* gpg-error.c - Determining gpg-error error codes.
+   Copyright (C) 2003 g10 Code GmbH
+
+   This file is part of libgpg-error.
+
+   libgpg-error is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public License
+   as published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+ 
+   libgpg-error 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
+   Lesser General Public License for more details.
+ 
+   You should have received a copy of the GNU Lesser General Public
+   License along with libgpg-error; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+
+#include <gpg-error.h>
+
+
+const char *gpg_strerror_sym (gpg_error_t err);
+const char *gpg_strsource_sym (gpg_error_t err);
+
+
+static int
+get_err_from_number (char *str, gpg_error_t *err)
+{
+  unsigned long nr;
+  char *tail;
+
+  errno = 0;
+  nr = strtoul (str, &tail, 0);
+  if (errno || *tail)
+    return 0;
+
+  if (nr > UINT_MAX)
+    return 0;
+
+  *err = (unsigned int) nr;
+  return 1;
+}
+
+
+static int
+get_err_from_symbol_one (char *str, gpg_error_t *err,
+			 int *have_source, int *have_code)
+{
+  static const char src_prefix[] = "GPG_ERR_SOURCE_";
+  static const char code_prefix[] = "GPG_ERR_";
+
+  if (!strncasecmp (src_prefix, str, sizeof (src_prefix) - 1))
+    {
+      gpg_err_source_t src;
+
+      if (*have_source)
+	return 0;
+      *have_source = 1;
+      str += sizeof (src_prefix) - 1;
+
+      for (src = 0; src < GPG_ERR_SOURCE_DIM; src++)
+	{
+	  const char *src_sym = gpg_strsource_sym (src << GPG_ERR_SOURCE_SHIFT);
+	  if (src_sym && !strcasecmp (str, src_sym + sizeof (src_prefix) - 1))
+	    {
+	      *err |= src << GPG_ERR_SOURCE_SHIFT;
+	      return 1;
+	    }
+	}
+    }
+  else if (!strncasecmp (code_prefix, str, sizeof (code_prefix) - 1))
+    {
+      gpg_err_code_t code;
+
+      if (*have_code)
+	return 0;
+      *have_code = 1;
+      str += sizeof (code_prefix) - 1;
+
+      for (code = 0; code < GPG_ERR_CODE_DIM; code++)
+	{
+	  const char *code_sym = gpg_strerror_sym (code);
+	  if (code_sym
+	      && !strcasecmp (str, code_sym + sizeof (code_prefix) - 1))
+	    {
+	      *err |= code;
+	      return 1;
+	    }
+	}
+    }
+  return 0;
+}
+
+
+static int
+get_err_from_symbol (char *str, gpg_error_t *err)
+{
+  char *str2 = str;
+  int have_source = 0;
+  int have_code = 0;
+  int ret;
+  char *saved_pos = NULL;
+  char saved_char;
+
+  *err = 0;
+  while (*str2 && ((*str2 >= 'A' && *str2 <= 'Z')
+		   || (*str2 >= '0' && *str2 <= '9')
+		   || *str2 == '_'))
+    str2++;
+  if (*str2)
+    {
+      saved_pos = str2;
+      saved_char = *str2;
+      *str2 = '\0';
+      str2++;
+    }
+  else
+    str2 = NULL;
+
+  ret = get_err_from_symbol_one (str, err, &have_source, &have_code);
+  if (ret && str2)
+    ret = get_err_from_symbol_one (str2, err, &have_source, &have_code);
+
+  if (saved_pos)
+    *saved_pos = saved_char;
+  return ret;
+}
+
+
+static int
+get_err_from_str_one (char *str, gpg_error_t *err,
+		      int *have_source, int *have_code)
+{
+  gpg_err_source_t src;
+  gpg_err_code_t code;
+
+  for (src = 0; src < GPG_ERR_SOURCE_DIM; src++)
+    {
+      const char *src_str = gpg_strsource (src << GPG_ERR_SOURCE_SHIFT);
+      if (src_str && !strcasecmp (str, src_str))
+	{
+	  if (*have_source)
+	    return 0;
+
+	  *have_source = 1;
+	  *err |= src << GPG_ERR_SOURCE_SHIFT;
+	  return 1;
+	}
+    }
+
+  for (code = 0; code < GPG_ERR_CODE_DIM; code++)
+    {
+      const char *code_str = gpg_strerror (code);
+      if (code_str && !strcasecmp (str, code_str))
+	{
+	  if (*have_code)
+	    return 0;
+	  
+	  *have_code = 1;
+	  *err |= code;
+	  return 1;
+	}
+    }
+
+  return 0;
+}
+
+
+static int
+get_err_from_str (char *str, gpg_error_t *err)
+{
+  char *str2 = str;
+  int have_source = 0;
+  int have_code = 0;
+  int ret;
+  char *saved_pos = NULL;
+  char saved_char;
+
+  *err = 0;
+  ret = get_err_from_str_one (str, err, &have_source, &have_code);
+  if (ret)
+    return ret;
+
+  while (*str2 && ((*str2 >= 'A' && *str2 <= 'Z')
+		   || (*str2 >= 'a' && *str2 <= 'z')
+		   || (*str2 >= '0' && *str2 <= '9')
+		   || *str2 == '_'))
+    str2++;
+  if (*str2)
+    {
+      saved_pos = str2;
+      saved_char = *str2;
+      *((char *) str2) = '\0';
+      str2++;
+      while (*str2 && !((*str2 >= 'A' && *str2 <= 'Z')
+			|| (*str2 >= 'a' && *str2 <= 'z')
+			|| (*str2 >= '0' && *str2 <= '9')
+			|| *str2 == '_'))
+	str2++;
+    }
+  else
+    str2 = NULL;
+
+  ret = get_err_from_str_one (str, err, &have_source, &have_code);
+  if (ret && str2)
+    ret = get_err_from_str_one (str2, err, &have_source, &have_code);
+
+  if (saved_pos)
+    *saved_pos = saved_char;
+  return ret;
+}
+
+
+
+int
+main (int argc, char *argv[])
+{
+  int i = 1;
+
+  if (argc == 1)
+    {
+      fprintf (stderr, "Usage: %s GPG-ERROR [...]\n", argv[0]);
+      exit (1);
+    }
+
+  while (i < argc)
+    {
+      gpg_error_t err;
+
+      if (get_err_from_number (argv[i], &err)
+	  || get_err_from_symbol (argv[i], &err)
+	  || get_err_from_str (argv[i], &err))
+	{
+	  const char *source_sym = gpg_strsource_sym (err);
+	  const char *error_sym = gpg_strerror_sym (err);
+	  
+	  printf ("%u = (%u, %u) = (%s, %s) = (%s, %s)\n",
+		  err, gpg_err_source (err), gpg_err_code (err),
+		  source_sym ? source_sym : "-", error_sym ? error_sym : "-",
+		  gpg_strsource (err), gpg_strerror (err));
+	}
+      else
+	fprintf (stderr, "%s: warning: could not recognize %s\n",
+		 argv[0], argv[i]);
+      i++;
+    }
+}