[Cvs-cvs] ccvs/src ChangeLog client.c main.c sanity.sh [cvs1-11-x-branch]

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Mark D. Baushke <address@hidden>        06/02/24 21:23:08

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

Log message:
        * client.c (gzip_level): Move to...
        * main.c (gzip_level): ...here.
        (main): Revert previous change in '-z' argument processing and
        remove CLIENT_SUPPORT ifdef/endif.
        * sanity.h (crerepos-6a): Deal with --disable-client output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.423&tr2=1.2336.2.424&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/client.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.318.4.31&tr2=1.318.4.32&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/main.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.172.4.18&tr2=1.172.4.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?only_with_tag=cvs1-11-x-branch&tr1=1.752.2.186&tr2=1.752.2.187&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.423 ccvs/src/ChangeLog:1.2336.2.424
--- ccvs/src/ChangeLog:1.2336.2.423     Fri Feb 24 18:31:35 2006
+++ ccvs/src/ChangeLog  Fri Feb 24 21:23:06 2006
@@ -1,5 +1,11 @@
 2006-02-24  Mark D. Baushke  <address@hidden>
 
+       * client.c (gzip_level): Move to...
+       * main.c (gzip_level): ...here.
+       (main): Revert previous change in '-z' argument processing and
+       remove CLIENT_SUPPORT ifdef/endif.
+       * sanity.h (crerepos-6a): Deal with --disable-client output.
+
        * main.c (main): Validate the gzip compression level for
        --disable-client configurations.
 
Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.318.4.31 ccvs/src/client.c:1.318.4.32
--- ccvs/src/client.c:1.318.4.31        Wed Dec  7 19:39:24 2005
+++ ccvs/src/client.c   Fri Feb 24 21:23:06 2006
@@ -893,12 +893,6 @@
 #if defined(CLIENT_SUPPORT) || defined(SERVER_SUPPORT)
 
 /*
- * Zero if compression isn't supported or requested; non-zero to indicate
- * a compression level to request from gzip.
- */
-int gzip_level;
-
-/*
  * Level of compression to use when running gzip on a single file.
  */
 int file_gzip_level;
Index: ccvs/src/main.c
diff -u ccvs/src/main.c:1.172.4.18 ccvs/src/main.c:1.172.4.19
--- ccvs/src/main.c:1.172.4.18  Fri Feb 24 18:31:35 2006
+++ ccvs/src/main.c     Fri Feb 24 21:23:06 2006
@@ -48,6 +48,12 @@
 int noexec = 0;
 int logoff = 0;
 
+/*
+ * Zero if compression isn't supported or requested; non-zero to indicate
+ * a compression level to request from gzip.
+ */
+int gzip_level;
+
 /* Set if we should be writing CVSADM directories at top level.  At
    least for now we'll make the default be off (the CVS 1.9, not CVS
    1.9.2, behavior). */
@@ -583,15 +589,10 @@
                use_cvsrc = 0; /* unnecessary, since we've done it above */
                break;
            case 'z':
-               {
-#ifndef CLIENT_SUPPORT
-                   int gzip_level;
-#endif /* CLIENT_SUPPORT */
-                   gzip_level = strtol (optarg, &end, 10);
-                   if (*end != '\0' || gzip_level < 0 || gzip_level > 9)
-                     error (1, 0,
-                            "gzip compression level must be between 0 and 9");
-               }
+               gzip_level = strtol (optarg, &end, 10);
+               if (*end != '\0' || gzip_level < 0 || gzip_level > 9)
+                 error (1, 0,
+                        "gzip compression level must be between 0 and 9");
                /* If no CLIENT_SUPPORT, we just silently ignore the gzip
                 * level, so that users can have it in their .cvsrc and not
                 * cause any trouble.
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.752.2.186 ccvs/src/sanity.sh:1.752.2.187
--- ccvs/src/sanity.sh:1.752.2.186      Mon Feb 13 21:50:38 2006
+++ ccvs/src/sanity.sh  Fri Feb 24 21:23:06 2006
@@ -19653,8 +19653,10 @@
            # key or somesuch.  Which error message we get depends on whether
            # false finishes running before we try to talk to it or not.
            dotest_fail crerepos-6a "CVS_RSH=false ${testcvs} -q -d ../crerepos 
get ." \
-"${PROG} \[checkout aborted\]: end of file from server (consult above messages 
if any)" \
-"${PROG} \[checkout aborted\]: received broken pipe signal"
+"${PROG} \[checkout aborted\]: .*" \
+"${PROG} checkout: CVSROOT is set for a remote access method but your
+${PROG} checkout: CVS executable doesn't support it\.
+${PROG} \[checkout aborted\]: Bad CVSROOT: .\.\./crerepos.\."
            cd ..
            rm -r 1