tolerate additional IPv4 address now available for gnunet.org

[oweals/gnunet.git] / src / util / getopt_helpers.c

diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c
index fb8cc4d4551a845a42e289b37eda494166a036a4..77032e5015ffac6b08a2a61a808fda510d1461c4 100644 (file)
--- a/src/util/getopt_helpers.c
+++ b/src/util/getopt_helpers.c
@@ -2,20 +2,20 @@
      This file is part of GNUnet
      Copyright (C) 2006, 2011 GNUnet e.V.
 
-     GNUnet 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 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet 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.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
@@ -110,9 +110,10 @@ format_help (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
   (void) value;
   if (NULL != about)
   {
-    printf ("%s\n%s\n", ctx->binaryOptions, gettext (about));
-    printf (_
-           ("Arguments mandatory for long options are also mandatory for short options.\n"));
+    printf ("%s\n%s\n",
+           ctx->binaryOptions,
+           gettext (about));
+    printf (_("Arguments mandatory for long options are also mandatory for short options.\n"));
   }
   i = 0;
   opt = ctx->allOptions;
@@ -551,11 +552,13 @@ set_ulong (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
            const char *value)
 {
   unsigned long long *val = scls;
+  char dummy[2];
 
   (void) ctx;
   if (1 != SSCANF (value,
-                   "%llu",
-                   val))
+                   "%llu%1s",
+                   val,
+                  dummy))
   {
     FPRINTF (stderr,
              _("You must pass a number to the `%s' option.\n"),
@@ -748,11 +751,20 @@ set_uint (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
           const char *value)
 {
   unsigned int *val = scls;
+  char dummy[2];
 
   (void) ctx;
+  if('-' == *value)
+  {
+       FPRINTF (stderr,
+               _("Your input for the '%s' option has to be a non negative number \n"),
+               option);
+       return GNUNET_SYSERR;
+  }
   if (1 != SSCANF (value,
-                   "%u",
-                   val))
+                   "%u%1s",
+                   val,
+                  dummy))
   {
     FPRINTF (stderr,
              _("You must pass a number to the `%s' option.\n"),
@@ -815,11 +827,13 @@ set_uint16 (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
 {
   uint16_t *val = scls;
   unsigned int v;
+  char dummy[2];
   
   (void) ctx;
   if (1 != SSCANF (value,
-                   "%u",
-                   &v))
+                   "%u%1s",
+                   &v,
+                  dummy))
   {
     FPRINTF (stderr,
              _("You must pass a number to the `%s' option.\n"),