enhanced the isNumber() method:
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Sun, 22 Jan 2006 11:23:47 +0000 (11:23 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Sun, 22 Jan 2006 11:23:47 +0000 (11:23 +0000)
* now, it accepts units like 'm' or 'K'; 'isNumber()' needs now a
  third parameter telling whether to interprete the number strictly or
  whether to accept such units
* an 'isNumberUnsigned()' method was created for unsigned types; an
  'util-isnumber.hc' template file was created for this purpose
* proper tests for over/underflow were implemented

git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2255 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/lib_internal/Makefile-files
util-vserver/lib_internal/util-isnumber.c
util-vserver/lib_internal/util-isnumber.hc [new file with mode: 0644]
util-vserver/lib_internal/util-isnumberunsigned.c [new file with mode: 0644]
util-vserver/lib_internal/util.h

index aca43da..215eca1 100644 (file)
@@ -96,7 +96,9 @@ lib_internal_libinternal_common_SRCS = \
                                lib_internal/unify-isiunlinkable.c \
                                lib_internal/util-canonify.c \
                                lib_internal/util-exitlikeprocess.c \
+                               lib_internal/util-isnumber.hc \
                                lib_internal/util-isnumber.c \
+                               lib_internal/util-isnumberunsigned.c \
                                lib_internal/util-lockfile.c \
                                lib_internal/util-safechdir.c \
                                $(command_SRCS) \
index f5a41c7..165b7a7 100644 (file)
 #endif
 
 #include "util.h"
+#include "util-isnumber.hc"
+#include <limits.h>
 
-bool
-isNumber(char const *str, signed long *result)
+static inline bool
+checkConstraints(signed long val, unsigned int fac)
 {
-  char *       errptr;
-  signed long  val;
-
-  val = strtol(str, &errptr, 0);
-  if (*errptr!='\0' || errptr==str)
-    return false;
-  else {
-    if (result) *result = val;
-    return true;
-  }
+  if (val>0 && (signed long)(LONG_MAX/fac) <= val) return false;
+  if (val<0 && (signed long)(LONG_MIN/fac) >= val) return false;
+  return true;
 }
+
+ENSC_DECL_UTIL_ISNUMBER(isNumber, signed long, strtol)
diff --git a/util-vserver/lib_internal/util-isnumber.hc b/util-vserver/lib_internal/util-isnumber.hc
new file mode 100644 (file)
index 0000000..27ec093
--- /dev/null
@@ -0,0 +1,52 @@
+// $Id$    --*- c -*--
+
+// Copyright (C) 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+//  
+// This program 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; version 2 of the License.
+//  
+// This program 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 <stdbool.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#define ENSC_DECL_UTIL_ISNUMBER(NAME,TYPE,FUNC)                        \
+  bool                                                         \
+  NAME(char const *str, TYPE *result, bool is_strict)          \
+  {                                                            \
+    char *             errptr;                                 \
+    TYPE               val;                                    \
+    unsigned int       fac = 1;                                \
+                                                               \
+    errno = 0;                                                 \
+    val   = FUNC(str, &errptr, 0);                             \
+    if (errno==ERANGE)                                         \
+      return false;                                            \
+    if (errptr!=str && !is_strict) {                           \
+      switch (*errptr) {                                       \
+       case 'M'        :  fac *= 1024; /* fallthrough */       \
+       case 'K'        :  fac *= 1024; ++errptr; break;        \
+       case 'm'        :  fac *= 1000; /* fallthrough */       \
+       case 'k'        :  fac *= 1000; ++errptr; break;        \
+       default :  break;                                       \
+      }                                                                \
+    }                                                          \
+    if (!checkConstraints(val,fac))                            \
+      return false;                                            \
+                                                               \
+    if (*errptr!='\0' || errptr==str)                          \
+      return false;                                            \
+    else {                                                     \
+      if (result) *result = val*fac;                           \
+      return true;                                             \
+    }                                                          \
+  }
diff --git a/util-vserver/lib_internal/util-isnumberunsigned.c b/util-vserver/lib_internal/util-isnumberunsigned.c
new file mode 100644 (file)
index 0000000..902c3e5
--- /dev/null
@@ -0,0 +1,35 @@
+// $Id$    --*- c -*--
+
+// Copyright (C) 2005 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+//  
+// This program 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; version 2 of the License.
+//  
+// This program 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.
+
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include "util.h"
+#include "util-isnumber.hc"
+#include <limits.h>
+
+static inline bool
+checkConstraints(unsigned long val, unsigned int fac)
+{
+  if ((long)(val)   <    0) return false;
+  if (ULONG_MAX/fac <= val) return false;
+  return true;
+}
+
+ENSC_DECL_UTIL_ISNUMBER(isNumberUnsigned, unsigned long, strtoul)
index 955fbe6..8a919d9 100644 (file)
@@ -35,6 +35,7 @@
 
 bool           switchToWatchXid(char const **);
 size_t         canonifyVserverName(char *);
-bool           isNumber(char const *, signed long *result);
+bool           isNumber(char const *, signed long *result, bool is_strict);
+bool           isNumberUnsigned(char const *, unsigned long *result, bool is_strict);
 
 #endif //  H_UTILVSERVER_LIB_INTERNAL_UTIL_H