command line error reporting, use my_errno

diff --git a/lib/memcached_strerror.c b/lib/memcached_strerror.c
index 587ac862aad37bd16a6ec5d6e0b1e5eb2f000265..5ebeebf62a43a553e5e8282b2853d606b8d6e6da 100644 (file)
--- a/lib/memcached_strerror.c
+++ b/lib/memcached_strerror.c
@@ -55,7 +55,7 @@ char *memcached_strerror(memcached_st *ptr, memcached_return rc)
   case MEMCACHED_STAT:
     return "STAT VALUE";
   case MEMCACHED_ERRNO:
-    return "UNKOWN ERROR SEE MY_ERRNO";
+    return "SYSTEM ERROR";
   case MEMCACHED_MAXIMUM_RETURN:
     return "Gibberish returned!";
   default:

diff --git a/src/memcat.c b/src/memcat.c
index 59d4a871f652927f09ed21addff2db3c463569d0..057a585c8e7f61332c23090b0fc273f6c166abbc 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -69,8 +69,11 @@ int main(int argc, char *argv[])
     }
     else if (rc != MEMCACHED_NOTFOUND)
     {
-      fprintf(stderr, "memcat: %s: memcache error %s\n", 
+      fprintf(stderr, "memcat: %s: memcache error %s", 
               argv[optind], memcached_strerror(memc, rc));
+      if (memc->my_errno)
+       fprintf(stderr, " system error %s", strerror(memc->my_errno));
+      fprintf(stderr, "\n");
     }
     optind++;
   }

diff --git a/src/memcp.c b/src/memcp.c
index 8f505eb37169641da7856021ff103ac94618412e..0eb210a701c13dd45ec10c29ceeeba8bd31a877e 100644 (file)
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -116,8 +116,13 @@ int main(int argc, char *argv[])
                         opt_expires, opt_flags);
 
     if (rc != MEMCACHED_SUCCESS)
-      fprintf(stderr, "memcp: %s: memcache error %s\n", 
+    {
+      fprintf(stderr, "memcp: %s: memcache error %s", 
              ptr, memcached_strerror(memc, rc));
+      if (memc->my_errno)
+       fprintf(stderr, " system error %s", strerror(memc->my_errno));
+      fprintf(stderr, "\n");
+    }
 
     free(file_buffer_ptr);
     close(fd);

diff --git a/src/memflush.c b/src/memflush.c
index 657a782d8fa1f343975fb7af85e92ffd57a4b29c..075875a2d2778616b2361cd88dd66ebf896391bf 100644 (file)
--- a/src/memflush.c
+++ b/src/memflush.c
@@ -43,8 +43,11 @@ int main(int argc, char *argv[])
   rc = memcached_flush(memc, opt_expire);
   if (rc != MEMCACHED_SUCCESS) 
   {
-    fprintf(stderr, "memflush: memcache error %s\n", 
+    fprintf(stderr, "memflush: memcache error %s", 
            memcached_strerror(memc, rc));
+    if (memc->my_errno)
+      fprintf(stderr, " system error %s", strerror(memc->my_errno));
+    fprintf(stderr, "\n");
   }
 
   memcached_free(memc);

diff --git a/src/memrm.c b/src/memrm.c
index 77416c95601a33bce603fe704b3e77b59f1c7c36..acfbf53fd9bf62d60eb176bc1f9397773c141d74 100644 (file)
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -48,8 +48,11 @@ int main(int argc, char *argv[])
 
     if (rc != MEMCACHED_SUCCESS) 
     {
-      fprintf(stderr, "memrm: %s: memcache error %s\n", 
+      fprintf(stderr, "memrm: %s: memcache error %s", 
              argv[optind], memcached_strerror(memc, rc));
+      if (memc->my_errno)
+       fprintf(stderr, " system error %s", strerror(memc->my_errno));
+      fprintf(stderr, "\n");
     }
 
     optind++;