[Cvs-cvs] ccvs/src ChangeLog main.c sanity.sh

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/04/05 14:19:05

Modified files:
        src            : ChangeLog main.c sanity.sh 

Log message:
        * main.c (opt_usage): Rephrase --timeout usage.
        (main): Handle arguments to --timeout which specifying units.
        * sanity.sh (server): Check --timeout unit handling.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3363&tr2=1.3364&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/main.c.diff?tr1=1.264&tr2=1.265&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1123&tr2=1.1124&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3363 ccvs/src/ChangeLog:1.3364
--- ccvs/src/ChangeLog:1.3363   Wed Apr  5 09:07:33 2006
+++ ccvs/src/ChangeLog  Wed Apr  5 14:19:04 2006
@@ -1,3 +1,9 @@
+2006-04-05  Derek Price  <address@hidden>
+
+       * main.c (opt_usage): Rephrase --timeout usage.
+       (main): Handle arguments to --timeout which specifying units.
+       * sanity.sh (server): Check --timeout unit handling.
+
 2006-04-05  Mark D. Baushke  <address@hidden>
 
        * logmsg.c (logfile_write): Add missing "T" to format_cmdline to
Index: ccvs/src/main.c
diff -u ccvs/src/main.c:1.264 ccvs/src/main.c:1.265
--- ccvs/src/main.c:1.264       Tue Mar 28 15:30:23 2006
+++ ccvs/src/main.c     Wed Apr  5 14:19:05 2006
@@ -298,8 +298,8 @@
     "    -n           Do not execute anything that will change the disk.\n",
     "    -t           Show trace of program execution (repeat for more\n",
     "                 verbosity) -- try with -n.\n",
-    "    --timeout SECONDS\n",
-    "                 Time out network connections in SECONDS seconds.\n",
+    "    --timeout WAITFOR\n",
+    "                 Time out network connections in WAITFOR seconds.\n",
     "    -R           Assume repository is read-only, such as CDROM\n",
     "    -v           CVS version and copyright.\n",
     "    -T tmpdir    Use 'tmpdir' for temporary files.\n",
@@ -663,7 +663,31 @@
            case 5:
                /* --timeout */
                connection_timeout = strtol (optarg, &end, 10);
-               if (*end != '\0' || connection_timeout < 0)
+               if (*end != '\0')
+               {
+                   char tmp = *end++;
+                   if (*end != '\0')
+                       tmp = '?';
+                   switch (tmp)
+                   {
+                       case 'd':
+                           connection_timeout *= 24;
+                       case 'h':
+                           connection_timeout *= 60;
+                       case 'm':
+                           connection_timeout *= 60;
+                       case 's':
+                           break;
+                       default:
+                           error (0, 0,
+"unknown units (`%s') in argument to --timeout",
+                                  end - 1);
+                           error (1, 0,
+"(valid units are: none, `d', `h', `m', & `s')");
+                           break;
+                   }
+               }
+               if (connection_timeout < 0)
                  error (1, 0,
 "argument to --timeout must be greater than or equal to 0");
                break;
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1123 ccvs/src/sanity.sh:1.1124
--- ccvs/src/sanity.sh:1.1123   Wed Apr  5 09:07:34 2006
+++ ccvs/src/sanity.sh  Wed Apr  5 14:19:05 2006
@@ -31447,9 +31447,12 @@
 
            # Test the server timeout feature.  If this fails, this test may
            # block indefinitely.
-           dotest server-23 "$testcvs --timeout 5 server" \
+           dotest server-23 "$testcvs --timeout 5s server" \
 "E Fatal server error, aborting\.
 error ETIMEOUT Connection timed out\."
+           dotest_fail server-24 "$testcvs --timeout 5X server" \
+"$CPROG server: unknown units (\`X') in argument to --timeout
+$CPROG \[server aborted\]: (valid units are: none, \`d', \`h', \`m', & \`s')"
 
            dokeep
            rm -rf $TESTDIR/crerepos