fixed spelling in of testudp in .bzrignore

[m6w6/libmemcached] / clients / memcp.c

diff --git a/clients/memcp.c b/clients/memcp.c
index 617057b32d4f54dfb836154498051ce7d6278459..dd8aba9ac907e9001d6e823374e7cf498520af8f 100644 (file)
--- a/clients/memcp.c
+++ b/clients/memcp.c
@@ -42,12 +42,41 @@ static int opt_method= OPT_SET;
 static uint32_t opt_flags= 0;
 static time_t opt_expires= 0;
 
+static long strtol_wrapper(const char *nptr, int base, bool *error)
+{
+  long val;
+  char *endptr;
+
+  errno= 0;    /* To distinguish success/failure after call */
+  val= strtol(nptr, &endptr, base);
+
+  /* Check for various possible errors */
+
+  if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN))
+      || (errno != 0 && val == 0))
+  {
+    *error= true;
+    return 0;
+  }
+
+  if (endptr == nptr)
+  {
+    *error= true;
+    return 0;
+  }
+
+  *error= false;
+  return val;
+}
+
 int main(int argc, char *argv[])
 {
   memcached_st *memc;
   memcached_return_t rc;
   memcached_server_st *servers;
 
+  int return_code= 0;
+
   options_parse(argc, argv);
 
   memc= memcached_create(NULL);
@@ -58,7 +87,9 @@ int main(int argc, char *argv[])
     char *temp;
 
     if ((temp= getenv("MEMCACHED_SERVERS")))
+    {
       opt_servers= strdup(temp);
+    }
     else
     {
       fprintf(stderr, "No Servers provided\n");
@@ -147,6 +178,8 @@ int main(int argc, char *argv[])
       if (memc->cached_errno)
        fprintf(stderr, " system error %s", strerror(memc->cached_errno));
       fprintf(stderr, "\n");
+
+      return_code= -1;
     }
 
     free(file_buffer_ptr);
@@ -161,7 +194,7 @@ int main(int argc, char *argv[])
   if (opt_hash)
     free(opt_hash);
 
-  return 0;
+  return return_code;
 }
 
 static void options_parse(int argc, char *argv[])
@@ -220,11 +253,26 @@ static void options_parse(int argc, char *argv[])
       opt_servers= strdup(optarg);
       break;
     case OPT_FLAG: /* --flag */
-      opt_flags= (uint32_t)strtol(optarg, (char **)NULL, 16);
-      break;
+      {
+        bool strtol_error;
+        opt_flags= (uint32_t)strtol_wrapper(optarg, 16, &strtol_error);
+        if (strtol_error == true)
+        {
+          fprintf(stderr, "Bad value passed via --flag\n");
+          exit(1);
+        }
+        break;
+      }
     case OPT_EXPIRE: /* --expire */
-      opt_expires= (time_t)strtoll(optarg, (char **)NULL, 10);
-      break;
+      {
+        bool strtol_error;
+        opt_expires= (time_t)strtol_wrapper(optarg, 16, &strtol_error);
+        if (strtol_error == true)
+        {
+          fprintf(stderr, "Bad value passed via --flag\n");
+          exit(1);
+        }
+      }
     case OPT_SET:
       opt_method= OPT_SET;
       break;