indentation

1 files changed, 494 insertions, 496 deletions

diff --git a/src/util/getopt.c b/src/util/getopt.c
index b8a295fae..2a35ab278 100644
--- a/src/util/getopt.c
+++ b/src/util/getopt.c
@@ -43,27 +43,27 @@ Copyright (C) 2006 Christian Grothoff
 #include "gnunet_getopt_lib.h"
 
 #ifdef VMS
-# include <unixlib.h>
-# if HAVE_STRING_H - 0
-#  include <string.h>
-# endif
+#include <unixlib.h>
+#if HAVE_STRING_H - 0
+#include <string.h>
+#endif
 #endif
 
 #if defined (WIN32) && !defined (__CYGWIN32__)
 /* It's not Unix, really.  See?  Capital letters.  */
-# include <windows.h>
-# define getpid() GetCurrentProcessId()
+#include <windows.h>
+#define getpid() GetCurrentProcessId()
 #endif
 
 #ifndef _
 /* This is for other GNU distributions with internationalized messages.
    When compiling libc, the _ macro is predefined.  */
-# ifdef HAVE_LIBINTL_H
-#  include <libintl.h>
-#  define _(msgid)  gettext (msgid)
-# else
-#  define _(msgid)  (msgid)
-# endif
+#ifdef HAVE_LIBINTL_H
+#include <libintl.h>
+#define _(msgid)  gettext (msgid)
+#else
+#define _(msgid)  (msgid)
+#endif
 #endif
 
 /* Describe the long-named options requested by the application.
@@ -91,7 +91,7 @@ struct GNoption
 {
   const char *name;
   /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
+   * type mismatches in all the code that assumes it is an int.  */
   int has_arg;
   int *flag;
   int val;
@@ -198,15 +198,15 @@ char *getenv ();
 
 static char *
 my_index (str, chr)
-     const char *str;
-     int chr;
+  const char *str;
+  int chr;
 {
   while (*str)
-    {
-      if (*str == chr)
-        return (char *) str;
-      str++;
-    }
+  {
+    if (*str == chr)
+      return (char *) str;
+    str++;
+  }
   return 0;
 }
 
@@ -252,17 +252,17 @@ extern pid_t __libc_pid;
    is valid for the getopt call we must make sure that the ARGV passed
    to getopt is that one passed to the process.  */
 static void
-  __attribute__ ((unused)) store_args_and_env (int argc, char *const *argv)
+    __attribute__ ((unused)) store_args_and_env (int argc, char *const *argv)
 {
   /* XXX This is no good solution.  We should rather copy the args so
-     that we can compare them later.  But we must not use malloc(3).  */
+   * that we can compare them later.  But we must not use malloc(3).  */
   original_argc = argc;
   original_argv = argv;
 }
 
 text_set_element (__libc_subinit, store_args_and_env);
 
-# define SWAP_FLAGS(ch1, ch2) \
+#define SWAP_FLAGS(ch1, ch2) \
   if (nonoption_flags_len > 0)                                                \
     {                                                                 \
       char __tmp = __getopt_nonoption_flags[ch1];                     \
@@ -270,7 +270,7 @@ text_set_element (__libc_subinit, store_args_and_env);
       __getopt_nonoption_flags[ch2] = __tmp;                          \
     }
 #else /* !_LIBC */
-# define SWAP_FLAGS(ch1, ch2)
+#define SWAP_FLAGS(ch1, ch2)
 #endif /* _LIBC */
 
 /* Exchange two adjacent subsequences of ARGV.
@@ -288,7 +288,7 @@ static void exchange (char **);
 
 static void
 exchange (argv)
-     char **argv;
+  char **argv;
 {
   int bottom = first_nonopt;
   int middle = last_nonopt;
@@ -296,69 +296,70 @@ exchange (argv)
   char *tem;
 
   /* Exchange the shorter segment with the far end of the longer segment.
-     That puts the shorter segment into the right place.
-     It leaves the longer segment in the right place overall,
-     but it consists of two parts that need to be swapped next.  */
+   * That puts the shorter segment into the right place.
+   * It leaves the longer segment in the right place overall,
+   * but it consists of two parts that need to be swapped next.  */
 
 #ifdef _LIBC
   /* First make sure the handling of the `__getopt_nonoption_flags'
-     string can work normally.  Our top argument must be in the range
-     of the string.  */
+   * string can work normally.  Our top argument must be in the range
+   * of the string.  */
   if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
+  {
+    /* We must extend the array.  The user plays games with us and
+     * presents new arguments.  */
+    char *new_str = malloc (top + 1);
+
+    if (new_str == NULL)
+      nonoption_flags_len = nonoption_flags_max_len = 0;
+    else
     {
-      /* We must extend the array.  The user plays games with us and
-         presents new arguments.  */
-      char *new_str = malloc (top + 1);
-      if (new_str == NULL)
-        nonoption_flags_len = nonoption_flags_max_len = 0;
-      else
-        {
-          memcpy (new_str, __getopt_nonoption_flags, nonoption_flags_max_len);
-          memset (&new_str[nonoption_flags_max_len], '\0',
-                  top + 1 - nonoption_flags_max_len);
-          nonoption_flags_max_len = top + 1;
-          __getopt_nonoption_flags = new_str;
-        }
+      memcpy (new_str, __getopt_nonoption_flags, nonoption_flags_max_len);
+      memset (&new_str[nonoption_flags_max_len], '\0',
+              top + 1 - nonoption_flags_max_len);
+      nonoption_flags_max_len = top + 1;
+      __getopt_nonoption_flags = new_str;
     }
+  }
 #endif
 
   while (top > middle && middle > bottom)
+  {
+    if (top - middle > middle - bottom)
     {
-      if (top - middle > middle - bottom)
-        {
-          /* Bottom segment is the short one.  */
-          int len = middle - bottom;
-          register int i;
+      /* Bottom segment is the short one.  */
+      int len = middle - bottom;
+      register int i;
 
-          /* Swap it with the top part of the top segment.  */
-          for (i = 0; i < len; i++)
-            {
-              tem = argv[bottom + i];
-              argv[bottom + i] = argv[top - (middle - bottom) + i];
-              argv[top - (middle - bottom) + i] = tem;
-              SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
-            }
-          /* Exclude the moved bottom segment from further swapping.  */
-          top -= len;
-        }
-      else
-        {
-          /* Top segment is the short one.  */
-          int len = top - middle;
-          register int i;
+      /* Swap it with the top part of the top segment.  */
+      for (i = 0; i < len; i++)
+      {
+        tem = argv[bottom + i];
+        argv[bottom + i] = argv[top - (middle - bottom) + i];
+        argv[top - (middle - bottom) + i] = tem;
+        SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
+      }
+      /* Exclude the moved bottom segment from further swapping.  */
+      top -= len;
+    }
+    else
+    {
+      /* Top segment is the short one.  */
+      int len = top - middle;
+      register int i;
 
-          /* Swap it with the bottom part of the bottom segment.  */
-          for (i = 0; i < len; i++)
-            {
-              tem = argv[bottom + i];
-              argv[bottom + i] = argv[middle + i];
-              argv[middle + i] = tem;
-              SWAP_FLAGS (bottom + i, middle + i);
-            }
-          /* Exclude the moved top segment from further swapping.  */
-          bottom += len;
-        }
+      /* Swap it with the bottom part of the bottom segment.  */
+      for (i = 0; i < len; i++)
+      {
+        tem = argv[bottom + i];
+        argv[bottom + i] = argv[middle + i];
+        argv[middle + i] = tem;
+        SWAP_FLAGS (bottom + i, middle + i);
+      }
+      /* Exclude the moved top segment from further swapping.  */
+      bottom += len;
     }
+  }
 
   /* Update records for the slots the non-options now occupy.  */
 
@@ -373,13 +374,13 @@ static const char *_getopt_initialize (int, char *const *, const char *);
 #endif
 static const char *
 _getopt_initialize (argc, argv, optstring)
-     int argc;
-     char *const *argv;
-     const char *optstring;
+  int argc;
+  char *const *argv;
+  const char *optstring;
 {
   /* Start processing options with ARGV-element 1 (since ARGV-element 0
-     is the program name); the sequence of previously skipped
-     non-option ARGV-elements is empty.  */
+   * is the program name); the sequence of previously skipped
+   * non-option ARGV-elements is empty.  */
 
   first_nonopt = last_nonopt = GNoptind;
 
@@ -390,49 +391,48 @@ _getopt_initialize (argc, argv, optstring)
   /* Determine how to handle the ordering of options and nonoptions.  */
 
   if (optstring[0] == '-')
-    {
-      ordering = RETURN_IN_ORDER;
-      ++optstring;
-    }
+  {
+    ordering = RETURN_IN_ORDER;
+    ++optstring;
+  }
   else if (optstring[0] == '+')
-    {
-      ordering = REQUIRE_ORDER;
-      ++optstring;
-    }
+  {
+    ordering = REQUIRE_ORDER;
+    ++optstring;
+  }
   else if (posixly_correct != NULL)
     ordering = REQUIRE_ORDER;
   else
     ordering = PERMUTE;
 
 #ifdef _LIBC
-  if (posixly_correct == NULL
-      && argc == original_argc && argv == original_argv)
+  if (posixly_correct == NULL && argc == original_argc && argv == original_argv)
+  {
+    if (nonoption_flags_max_len == 0)
     {
-      if (nonoption_flags_max_len == 0)
+      if (__getopt_nonoption_flags == NULL
+          || __getopt_nonoption_flags[0] == '\0')
+        nonoption_flags_max_len = -1;
+      else
+      {
+        const char *orig_str = __getopt_nonoption_flags;
+        int len = nonoption_flags_max_len = strlen (orig_str);
+
+        if (nonoption_flags_max_len < argc)
+          nonoption_flags_max_len = argc;
+        __getopt_nonoption_flags = (char *) malloc (nonoption_flags_max_len);
+        if (__getopt_nonoption_flags == NULL)
+          nonoption_flags_max_len = -1;
+        else
         {
-          if (__getopt_nonoption_flags == NULL
-              || __getopt_nonoption_flags[0] == '\0')
-            nonoption_flags_max_len = -1;
-          else
-            {
-              const char *orig_str = __getopt_nonoption_flags;
-              int len = nonoption_flags_max_len = strlen (orig_str);
-              if (nonoption_flags_max_len < argc)
-                nonoption_flags_max_len = argc;
-              __getopt_nonoption_flags =
-                (char *) malloc (nonoption_flags_max_len);
-              if (__getopt_nonoption_flags == NULL)
-                nonoption_flags_max_len = -1;
-              else
-                {
-                  memcpy (__getopt_nonoption_flags, orig_str, len);
-                  memset (&__getopt_nonoption_flags[len], '\0',
-                          nonoption_flags_max_len - len);
-                }
-            }
+          memcpy (__getopt_nonoption_flags, orig_str, len);
+          memset (&__getopt_nonoption_flags[len], '\0',
+                  nonoption_flags_max_len - len);
         }
-      nonoption_flags_len = nonoption_flags_max_len;
+      }
     }
+    nonoption_flags_len = nonoption_flags_max_len;
+  }
   else
     nonoption_flags_len = 0;
 #endif
@@ -498,11 +498,10 @@ _getopt_initialize (argc, argv, optstring)
 
 static int
 GN_getopt_internal (int argc,
-                    char *const *argv,
-                    const char *optstring,
-                    const struct GNoption *longopts,
-                    int *longind,
-                    int long_only)
+                    char *const *argv,
+                    const char *optstring,
+                    const struct GNoption *longopts,
+                    int *longind, int long_only)
 {
   static int __getopt_initialized = 0;
   static int GNopterr = 1;
@@ -510,17 +509,17 @@ GN_getopt_internal (int argc,
   GNoptarg = NULL;
 
   if (GNoptind == 0 || !__getopt_initialized)
-    {
-      if (GNoptind == 0)
-        GNoptind = 1;           /* Don't scan ARGV[0], the program name.  */
-      optstring = _getopt_initialize (argc, argv, optstring);
-      __getopt_initialized = 1;
-    }
+  {
+    if (GNoptind == 0)
+      GNoptind = 1;             /* Don't scan ARGV[0], the program name.  */
+    optstring = _getopt_initialize (argc, argv, optstring);
+    __getopt_initialized = 1;
+  }
 
   /* Test whether ARGV[GNoptind] points to a non-option argument.
-     Either it does not have option syntax, or there is an environment flag
-     from the shell indicating it is not an option.  The later information
-     is only used when the used in the GNU libc.  */
+   * Either it does not have option syntax, or there is an environment flag
+   * from the shell indicating it is not an option.  The later information
+   * is only used when the used in the GNU libc.  */
 #ifdef _LIBC
 #define NONOPTION_P (argv[GNoptind][0] != '-' || argv[GNoptind][1] == '\0'        \
              || (GNoptind < nonoption_flags_len                       \
@@ -530,233 +529,232 @@ GN_getopt_internal (int argc,
 #endif
 
   if (nextchar == NULL || *nextchar == '\0')
-    {
-      /* Advance to the next ARGV-element.  */
+  {
+    /* Advance to the next ARGV-element.  */
 
-      /* Give FIRST_NONOPT & LAST_NONOPT rational values if GNoptind has been
-         moved back by the user (who may also have changed the arguments).  */
-      if (last_nonopt > GNoptind)
-        last_nonopt = GNoptind;
-      if (first_nonopt > GNoptind)
-        first_nonopt = GNoptind;
+    /* Give FIRST_NONOPT & LAST_NONOPT rational values if GNoptind has been
+     * moved back by the user (who may also have changed the arguments).  */
+    if (last_nonopt > GNoptind)
+      last_nonopt = GNoptind;
+    if (first_nonopt > GNoptind)
+      first_nonopt = GNoptind;
 
-      if (ordering == PERMUTE)
-        {
-          /* If we have just processed some options following some non-options,
-             exchange them so that the options come first.  */
+    if (ordering == PERMUTE)
+    {
+      /* If we have just processed some options following some non-options,
+       * exchange them so that the options come first.  */
 
-          if (first_nonopt != last_nonopt && last_nonopt != GNoptind)
-            exchange ((char **) argv);
-          else if (last_nonopt != GNoptind)
-            first_nonopt = GNoptind;
+      if (first_nonopt != last_nonopt && last_nonopt != GNoptind)
+        exchange ((char **) argv);
+      else if (last_nonopt != GNoptind)
+        first_nonopt = GNoptind;
 
-          /* Skip any additional non-options
-             and extend the range of non-options previously skipped.  */
+      /* Skip any additional non-options
+       * and extend the range of non-options previously skipped.  */
 
-          while (GNoptind < argc && NONOPTION_P)
-            GNoptind++;
-          last_nonopt = GNoptind;
-        }
+      while (GNoptind < argc && NONOPTION_P)
+        GNoptind++;
+      last_nonopt = GNoptind;
+    }
 
-      /* The special ARGV-element `--' means premature end of options.
-         Skip it like a null option,
-         then exchange with previous non-options as if it were an option,
-         then skip everything else like a non-option.  */
-      if (GNoptind != argc && !strcmp (argv[GNoptind], "--"))
-        {
-          GNoptind++;
+    /* The special ARGV-element `--' means premature end of options.
+     * Skip it like a null option,
+     * then exchange with previous non-options as if it were an option,
+     * then skip everything else like a non-option.  */
+    if (GNoptind != argc && !strcmp (argv[GNoptind], "--"))
+    {
+      GNoptind++;
 
-          if (first_nonopt != last_nonopt && last_nonopt != GNoptind)
-            exchange ((char **) argv);
-          else if (first_nonopt == last_nonopt)
-            first_nonopt = GNoptind;
-          last_nonopt = argc;
+      if (first_nonopt != last_nonopt && last_nonopt != GNoptind)
+        exchange ((char **) argv);
+      else if (first_nonopt == last_nonopt)
+        first_nonopt = GNoptind;
+      last_nonopt = argc;
 
-          GNoptind = argc;
-        }
+      GNoptind = argc;
+    }
 
-      /* If we have done all the ARGV-elements, stop the scan
-         and back over any non-options that we skipped and permuted.  */
+    /* If we have done all the ARGV-elements, stop the scan
+     * and back over any non-options that we skipped and permuted.  */
 
-      if (GNoptind == argc)
-        {
-          /* Set the next-arg-index to point at the non-options
-             that we previously skipped, so the caller will digest them.  */
-          if (first_nonopt != last_nonopt)
-            GNoptind = first_nonopt;
-          return -1;
-        }
+    if (GNoptind == argc)
+    {
+      /* Set the next-arg-index to point at the non-options
+       * that we previously skipped, so the caller will digest them.  */
+      if (first_nonopt != last_nonopt)
+        GNoptind = first_nonopt;
+      return -1;
+    }
 
-      /* If we have come to a non-option and did not permute it,
-         either stop the scan or describe it to the caller and pass it by.  */
+    /* If we have come to a non-option and did not permute it,
+     * either stop the scan or describe it to the caller and pass it by.  */
 
-      if (NONOPTION_P)
-        {
-          if (ordering == REQUIRE_ORDER)
-            return -1;
-          GNoptarg = argv[GNoptind++];
-          return 1;
-        }
+    if (NONOPTION_P)
+    {
+      if (ordering == REQUIRE_ORDER)
+        return -1;
+      GNoptarg = argv[GNoptind++];
+      return 1;
+    }
 
-      /* We have found another option-ARGV-element.
-         Skip the initial punctuation.  */
+    /* We have found another option-ARGV-element.
+     * Skip the initial punctuation.  */
 
-      nextchar = (argv[GNoptind] + 1
-                  + (longopts != NULL && argv[GNoptind][1] == '-'));
-    }
+    nextchar = (argv[GNoptind] + 1
+                + (longopts != NULL && argv[GNoptind][1] == '-'));
+  }
 
   /* Decode the current option-ARGV-element.  */
 
   /* Check whether the ARGV-element is a long option.
-
-     If long_only and the ARGV-element has the form "-f", where f is
-     a valid short option, don't consider it an abbreviated form of
-     a long option that starts with f.  Otherwise there would be no
-     way to give the -f short option.
-
-     On the other hand, if there's a long option "fubar" and
-     the ARGV-element is "-fu", do consider that an abbreviation of
-     the long option, just like "--fu", and not "-f" with arg "u".
-
-     This distinction seems to be the most useful approach.  */
+   * 
+   * If long_only and the ARGV-element has the form "-f", where f is
+   * a valid short option, don't consider it an abbreviated form of
+   * a long option that starts with f.  Otherwise there would be no
+   * way to give the -f short option.
+   * 
+   * On the other hand, if there's a long option "fubar" and
+   * the ARGV-element is "-fu", do consider that an abbreviation of
+   * the long option, just like "--fu", and not "-f" with arg "u".
+   * 
+   * This distinction seems to be the most useful approach.  */
 
   if (longopts != NULL
       && (argv[GNoptind][1] == '-'
           || (long_only
               && (argv[GNoptind][2]
                   || !my_index (optstring, argv[GNoptind][1])))))
-    {
-      char *nameend;
-      const struct GNoption *p;
-      const struct GNoption *pfound = NULL;
-      int exact = 0;
-      int ambig = 0;
-      int indfound = -1;
-      int option_index;
+  {
+    char *nameend;
+    const struct GNoption *p;
+    const struct GNoption *pfound = NULL;
+    int exact = 0;
+    int ambig = 0;
+    int indfound = -1;
+    int option_index;
+
+    for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
+      /* Do nothing.  */ ;
+
+    /* Test all long options for either exact match
+     * or abbreviated matches.  */
+    for (p = longopts, option_index = 0; p->name; p++, option_index++)
+      if (!strncmp (p->name, nextchar, nameend - nextchar))
+      {
+        if ((unsigned int) (nameend - nextchar)
+            == (unsigned int) strlen (p->name))
+        {
+          /* Exact match found.  */
+          pfound = p;
+          indfound = option_index;
+          exact = 1;
+          break;
+        }
+        else if (pfound == NULL)
+        {
+          /* First nonexact match found.  */
+          pfound = p;
+          indfound = option_index;
+        }
+        else
+          /* Second or later nonexact match found.  */
+          ambig = 1;
+      }
 
-      for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
-        /* Do nothing.  */ ;
+    if (ambig && !exact)
+    {
+      if (GNopterr)
+        fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+                 argv[0], argv[GNoptind]);
+      nextchar += strlen (nextchar);
+      GNoptind++;
+      return '?';
+    }
 
-      /* Test all long options for either exact match
-         or abbreviated matches.  */
-      for (p = longopts, option_index = 0; p->name; p++, option_index++)
-        if (!strncmp (p->name, nextchar, nameend - nextchar))
+    if (pfound != NULL)
+    {
+      option_index = indfound;
+      GNoptind++;
+      if (*nameend)
+      {
+        /* Don't test has_arg with >, because some C compilers don't
+         * allow it to be used on enums.  */
+        if (pfound->has_arg)
+          GNoptarg = nameend + 1;
+        else
+        {
+          if (GNopterr)
           {
-            if ((unsigned int) (nameend - nextchar)
-                == (unsigned int) strlen (p->name))
-              {
-                /* Exact match found.  */
-                pfound = p;
-                indfound = option_index;
-                exact = 1;
-                break;
-              }
-            else if (pfound == NULL)
-              {
-                /* First nonexact match found.  */
-                pfound = p;
-                indfound = option_index;
-              }
+            if (argv[GNoptind - 1][1] == '-')
+              /* --option */
+              fprintf (stderr,
+                       _
+                       ("%s: option `--%s' does not allow an argument\n"),
+                       argv[0], pfound->name);
             else
-              /* Second or later nonexact match found.  */
-              ambig = 1;
+              /* +option or -option */
+              fprintf (stderr,
+                       _
+                       ("%s: option `%c%s' does not allow an argument\n"),
+                       argv[0], argv[GNoptind - 1][0], pfound->name);
           }
-
-      if (ambig && !exact)
-        {
-          if (GNopterr)
-            fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
-                     argv[0], argv[GNoptind]);
           nextchar += strlen (nextchar);
-          GNoptind++;
           return '?';
         }
-
-      if (pfound != NULL)
+      }
+      else if (pfound->has_arg == 1)
+      {
+        if (GNoptind < argc)
         {
-          option_index = indfound;
-          GNoptind++;
-          if (*nameend)
-            {
-              /* Don't test has_arg with >, because some C compilers don't
-                 allow it to be used on enums.  */
-              if (pfound->has_arg)
-                GNoptarg = nameend + 1;
-              else
-                {
-                  if (GNopterr)
-                    {
-                      if (argv[GNoptind - 1][1] == '-')
-                        /* --option */
-                        fprintf (stderr,
-                                 _
-                                 ("%s: option `--%s' does not allow an argument\n"),
-                                 argv[0], pfound->name);
-                      else
-                        /* +option or -option */
-                        fprintf (stderr,
-                                 _
-                                 ("%s: option `%c%s' does not allow an argument\n"),
-                                 argv[0], argv[GNoptind - 1][0],
-                                 pfound->name);
-                    }
-                  nextchar += strlen (nextchar);
-                  return '?';
-                }
-            }
-          else if (pfound->has_arg == 1)
-            {
-              if (GNoptind < argc)
-                {
-                  GNoptarg = argv[GNoptind++];
-                }
-              else
-                {
-                  if (GNopterr)
-                    {
-                      fprintf (stderr,
-                               _("%s: option `%s' requires an argument\n"),
-                               argv[0], argv[GNoptind - 1]);
-                    }
-                  nextchar += strlen (nextchar);
-                  return (optstring[0] == ':') ? ':' : '?';
-                }
-            }
-          nextchar += strlen (nextchar);
-          if (longind != NULL)
-            *longind = option_index;
-          if (pfound->flag)
-            {
-              *(pfound->flag) = pfound->val;
-              return 0;
-            }
-          return pfound->val;
+          GNoptarg = argv[GNoptind++];
         }
-
-      /* Can't find it as a long option.  If this is not getopt_long_only,
-         or the option starts with '--' or is not a valid short
-         option, then it's an error.
-         Otherwise interpret it as a short option.  */
-      if (!long_only || argv[GNoptind][1] == '-'
-          || my_index (optstring, *nextchar) == NULL)
+        else
         {
           if (GNopterr)
-            {
-              if (argv[GNoptind][1] == '-')
-                /* --option */
-                fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
-                         argv[0], nextchar);
-              else
-                /* +option or -option */
-                fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
-                         argv[0], argv[GNoptind][0], nextchar);
-            }
-          nextchar = (char *) "";
-          GNoptind++;
-          return '?';
+          {
+            fprintf (stderr,
+                     _("%s: option `%s' requires an argument\n"),
+                     argv[0], argv[GNoptind - 1]);
+          }
+          nextchar += strlen (nextchar);
+          return (optstring[0] == ':') ? ':' : '?';
         }
+      }
+      nextchar += strlen (nextchar);
+      if (longind != NULL)
+        *longind = option_index;
+      if (pfound->flag)
+      {
+        *(pfound->flag) = pfound->val;
+        return 0;
+      }
+      return pfound->val;
     }
 
+    /* Can't find it as a long option.  If this is not getopt_long_only,
+     * or the option starts with '--' or is not a valid short
+     * option, then it's an error.
+     * Otherwise interpret it as a short option.  */
+    if (!long_only || argv[GNoptind][1] == '-'
+        || my_index (optstring, *nextchar) == NULL)
+    {
+      if (GNopterr)
+      {
+        if (argv[GNoptind][1] == '-')
+          /* --option */
+          fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+                   argv[0], nextchar);
+        else
+          /* +option or -option */
+          fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+                   argv[0], argv[GNoptind][0], nextchar);
+      }
+      nextchar = (char *) "";
+      GNoptind++;
+      return '?';
+    }
+  }
+
   /* Look at and handle the next short option-character.  */
 
   {
@@ -768,186 +766,185 @@ GN_getopt_internal (int argc,
       ++GNoptind;
 
     if (temp == NULL || c == ':')
+    {
+      if (GNopterr)
       {
-        if (GNopterr)
-          {
-            if (posixly_correct)
-              /* 1003.2 specifies the format of this message.  */
-              fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c);
-            else
-              fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
-          }
-        return '?';
+        if (posixly_correct)
+          /* 1003.2 specifies the format of this message.  */
+          fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c);
+        else
+          fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
       }
+      return '?';
+    }
     /* Convenience. Treat POSIX -W foo same as long option --foo */
     if (temp[0] == 'W' && temp[1] == ';')
-      {
-        char *nameend;
-        const struct GNoption *p;
-        const struct GNoption *pfound = NULL;
-        int exact = 0;
-        int ambig = 0;
-        int indfound = 0;
-        int option_index;
+    {
+      char *nameend;
+      const struct GNoption *p;
+      const struct GNoption *pfound = NULL;
+      int exact = 0;
+      int ambig = 0;
+      int indfound = 0;
+      int option_index;
 
-        /* This is an option that requires an argument.  */
-        if (*nextchar != '\0')
-          {
-            GNoptarg = nextchar;
-            /* If we end this ARGV-element by taking the rest as an arg,
-               we must advance to the next element now.  */
-            GNoptind++;
-          }
-        else if (GNoptind == argc)
-          {
-            if (GNopterr)
-              {
-                /* 1003.2 specifies the format of this message.  */
-                fprintf (stderr, _("%s: option requires an argument -- %c\n"),
-                         argv[0], c);
-              }
-            if (optstring[0] == ':')
-              c = ':';
-            else
-              c = '?';
-            return c;
-          }
+      /* This is an option that requires an argument.  */
+      if (*nextchar != '\0')
+      {
+        GNoptarg = nextchar;
+        /* If we end this ARGV-element by taking the rest as an arg,
+         * we must advance to the next element now.  */
+        GNoptind++;
+      }
+      else if (GNoptind == argc)
+      {
+        if (GNopterr)
+        {
+          /* 1003.2 specifies the format of this message.  */
+          fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+                   argv[0], c);
+        }
+        if (optstring[0] == ':')
+          c = ':';
         else
-          /* We already incremented `GNoptind' once;
-             increment it again when taking next ARGV-elt as argument.  */
-          GNoptarg = argv[GNoptind++];
+          c = '?';
+        return c;
+      }
+      else
+        /* We already incremented `GNoptind' once;
+         * increment it again when taking next ARGV-elt as argument.  */
+        GNoptarg = argv[GNoptind++];
 
-        /* GNoptarg is now the argument, see if it's in the
-           table of longopts.  */
+      /* GNoptarg is now the argument, see if it's in the
+       * table of longopts.  */
 
-        for (nextchar = nameend = GNoptarg; *nameend && *nameend != '=';
-             nameend++)
-          /* Do nothing.  */ ;
+      for (nextchar = nameend = GNoptarg; *nameend && *nameend != '=';
+           nameend++)
+        /* Do nothing.  */ ;
 
-        /* Test all long options for either exact match
-           or abbreviated matches.  */
-        if (longopts != NULL)
+      /* Test all long options for either exact match
+       * or abbreviated matches.  */
+      if (longopts != NULL)
         for (p = longopts, option_index = 0; p->name; p++, option_index++)
           if (!strncmp (p->name, nextchar, nameend - nextchar))
+          {
+            if ((unsigned int) (nameend - nextchar) == strlen (p->name))
+            {
+              /* Exact match found.  */
+              pfound = p;
+              indfound = option_index;
+              exact = 1;
+              break;
+            }
+            else if (pfound == NULL)
             {
-              if ((unsigned int) (nameend - nextchar) == strlen (p->name))
-                {
-                  /* Exact match found.  */
-                  pfound = p;
-                  indfound = option_index;
-                  exact = 1;
-                  break;
-                }
-              else if (pfound == NULL)
-                {
-                  /* First nonexact match found.  */
-                  pfound = p;
-                  indfound = option_index;
-                }
-              else
-                /* Second or later nonexact match found.  */
-                ambig = 1;
+              /* First nonexact match found.  */
+              pfound = p;
+              indfound = option_index;
             }
-        if (ambig && !exact)
+            else
+              /* Second or later nonexact match found.  */
+              ambig = 1;
+          }
+      if (ambig && !exact)
+      {
+        if (GNopterr)
+          fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+                   argv[0], argv[GNoptind]);
+        nextchar += strlen (nextchar);
+        GNoptind++;
+        return '?';
+      }
+      if (pfound != NULL)
+      {
+        option_index = indfound;
+        if (*nameend)
+        {
+          /* Don't test has_arg with >, because some C compilers don't
+           * allow it to be used on enums.  */
+          if (pfound->has_arg)
+            GNoptarg = nameend + 1;
+          else
           {
             if (GNopterr)
-              fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
-                       argv[0], argv[GNoptind]);
+              fprintf (stderr, _("\
+%s: option `-W %s' does not allow an argument\n"), argv[0], pfound->name);
+
             nextchar += strlen (nextchar);
-            GNoptind++;
             return '?';
           }
-        if (pfound != NULL)
+        }
+        else if (pfound->has_arg == 1)
+        {
+          if (GNoptind < argc)
+            GNoptarg = argv[GNoptind++];
+          else
           {
-            option_index = indfound;
-            if (*nameend)
-              {
-                /* Don't test has_arg with >, because some C compilers don't
-                   allow it to be used on enums.  */
-                if (pfound->has_arg)
-                  GNoptarg = nameend + 1;
-                else
-                  {
-                    if (GNopterr)
-                      fprintf (stderr, _("\
-%s: option `-W %s' does not allow an argument\n"), argv[0], pfound->name);
-
-                    nextchar += strlen (nextchar);
-                    return '?';
-                  }
-              }
-            else if (pfound->has_arg == 1)
-              {
-                if (GNoptind < argc)
-                  GNoptarg = argv[GNoptind++];
-                else
-                  {
-                    if (GNopterr)
-                      fprintf (stderr,
-                               _("%s: option `%s' requires an argument\n"),
-                               argv[0], argv[GNoptind - 1]);
-                    nextchar += strlen (nextchar);
-                    return optstring[0] == ':' ? ':' : '?';
-                  }
-              }
+            if (GNopterr)
+              fprintf (stderr,
+                       _("%s: option `%s' requires an argument\n"),
+                       argv[0], argv[GNoptind - 1]);
             nextchar += strlen (nextchar);
-            if (longind != NULL)
-              *longind = option_index;
-            if (pfound->flag)
-              {
-                *(pfound->flag) = pfound->val;
-                return 0;
-              }
-            return pfound->val;
+            return optstring[0] == ':' ? ':' : '?';
           }
-        nextchar = NULL;
-        return 'W';             /* Let the application handle it.   */
+        }
+        nextchar += strlen (nextchar);
+        if (longind != NULL)
+          *longind = option_index;
+        if (pfound->flag)
+        {
+          *(pfound->flag) = pfound->val;
+          return 0;
+        }
+        return pfound->val;
       }
+      nextchar = NULL;
+      return 'W';               /* Let the application handle it.   */
+    }
     if (temp[1] == ':')
+    {
+      if (temp[2] == ':')
       {
-        if (temp[2] == ':')
-          {
-            /* This is an option that accepts an argument optionally.  */
-            if (*nextchar != '\0')
-              {
-                GNoptarg = nextchar;
-                GNoptind++;
-              }
-            else
-              GNoptarg = NULL;
-            nextchar = NULL;
-          }
+        /* This is an option that accepts an argument optionally.  */
+        if (*nextchar != '\0')
+        {
+          GNoptarg = nextchar;
+          GNoptind++;
+        }
         else
+          GNoptarg = NULL;
+        nextchar = NULL;
+      }
+      else
+      {
+        /* This is an option that requires an argument.  */
+        if (*nextchar != '\0')
+        {
+          GNoptarg = nextchar;
+          /* If we end this ARGV-element by taking the rest as an arg,
+           * we must advance to the next element now.  */
+          GNoptind++;
+        }
+        else if (GNoptind == argc)
+        {
+          if (GNopterr)
           {
-            /* This is an option that requires an argument.  */
-            if (*nextchar != '\0')
-              {
-                GNoptarg = nextchar;
-                /* If we end this ARGV-element by taking the rest as an arg,
-                   we must advance to the next element now.  */
-                GNoptind++;
-              }
-            else if (GNoptind == argc)
-              {
-                if (GNopterr)
-                  {
-                    /* 1003.2 specifies the format of this message.  */
-                    fprintf (stderr,
-                             _("%s: option requires an argument -- %c\n"),
-                             argv[0], c);
-                  }
-                if (optstring[0] == ':')
-                  c = ':';
-                else
-                  c = '?';
-              }
-            else
-              /* We already incremented `GNoptind' once;
-                 increment it again when taking next ARGV-elt as argument.  */
-              GNoptarg = argv[GNoptind++];
-            nextchar = NULL;
+            /* 1003.2 specifies the format of this message.  */
+            fprintf (stderr,
+                     _("%s: option requires an argument -- %c\n"), argv[0], c);
           }
+          if (optstring[0] == ':')
+            c = ':';
+          else
+            c = '?';
+        }
+        else
+          /* We already incremented `GNoptind' once;
+           * increment it again when taking next ARGV-elt as argument.  */
+          GNoptarg = argv[GNoptind++];
+        nextchar = NULL;
       }
+    }
     return c;
   }
 }
@@ -1001,15 +998,15 @@ GNUNET_GETOPT_run (const char *binaryOptions,
   shorts = GNUNET_malloc (count * 2 + 1);
   spos = 0;
   for (i = 0; i < count; i++)
-    {
-      long_options[i].name = allOptions[i].name;
-      long_options[i].has_arg = allOptions[i].require_argument;
-      long_options[i].flag = NULL;
-      long_options[i].val = allOptions[i].shortName;
-      shorts[spos++] = allOptions[i].shortName;
-      if (allOptions[i].require_argument != 0)
-        shorts[spos++] = ':';
-    }
+  {
+    long_options[i].name = allOptions[i].name;
+    long_options[i].has_arg = allOptions[i].require_argument;
+    long_options[i].flag = NULL;
+    long_options[i].val = allOptions[i].shortName;
+    shorts[spos++] = allOptions[i].shortName;
+    if (allOptions[i].require_argument != 0)
+      shorts[spos++] = ':';
+  }
   long_options[count].name = NULL;
   long_options[count].has_arg = 0;
   long_options[count].flag = NULL;
@@ -1018,30 +1015,31 @@ GNUNET_GETOPT_run (const char *binaryOptions,
   cont = GNUNET_OK;
   /* main getopt loop */
   while (cont == GNUNET_OK)
-    {
-      int option_index = 0;
-      c = GNgetopt_long (argc, argv, shorts, long_options, &option_index);
+  {
+    int option_index = 0;
 
-      if (c == GNUNET_SYSERR)
-        break;                  /* No more flags to process */
+    c = GNgetopt_long (argc, argv, shorts, long_options, &option_index);
 
-      for (i = 0; i < count; i++)
-        {
-          clpc.currentArgument = GNoptind - 1;
-          if ((char) c == allOptions[i].shortName)
-            {
-              cont = allOptions[i].processor (&clpc,
-                                              allOptions[i].scls,
-                                              allOptions[i].name, GNoptarg);
-              break;
-            }
-        }
-      if (i == count)
-        {
-          fprintf (stderr, _("Use --help to get a list of options.\n"));
-          cont = GNUNET_SYSERR;
-        }
+    if (c == GNUNET_SYSERR)
+      break;                    /* No more flags to process */
+
+    for (i = 0; i < count; i++)
+    {
+      clpc.currentArgument = GNoptind - 1;
+      if ((char) c == allOptions[i].shortName)
+      {
+        cont = allOptions[i].processor (&clpc,
+                                        allOptions[i].scls,
+                                        allOptions[i].name, GNoptarg);
+        break;
+      }
+    }
+    if (i == count)
+    {
+      fprintf (stderr, _("Use --help to get a list of options.\n"));
+      cont = GNUNET_SYSERR;
     }
+  }
 
   GNUNET_free (shorts);
   GNUNET_free (long_options);