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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/07/05 19:10:33

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

Log message:
        * sanity.sh (abspath-2a.*): Insert `r' to remote test name variants.
        Misc cleanup.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3466&r2=1.3467
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/rcs.c?cvsroot=cvs&r1=1.375&r2=1.376
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1162&r2=1.1163

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3466
retrieving revision 1.3467
diff -u -b -r1.3466 -r1.3467
--- ChangeLog   5 Jul 2006 15:27:13 -0000       1.3466
+++ ChangeLog   5 Jul 2006 19:10:32 -0000       1.3467
@@ -1,5 +1,8 @@
 2006-07-05  Derek Price  <address@hidden>
 
+       * sanity.sh (abspath-2a.*): Insert `r' to remote test name variants.
+       Misc cleanup.
+
        * subr.c (get_stream): Be slightly more conservative about memory
        allocation.  Comment more fully.
 

Index: rcs.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/rcs.c,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -b -r1.375 -r1.376
--- rcs.c       26 Jun 2006 21:23:53 -0000      1.375
+++ rcs.c       5 Jul 2006 19:10:32 -0000       1.376
@@ -5884,8 +5884,7 @@
           change text as a text file, then reading it as a text file.
           This should cause no harm, but doesn't strike me as
           immensely clean.  */
-       get_file (changefile, changefile,
-                 rcs->expand != NULL && STREQ (rcs->expand, "b") ? "rb" : "r",
+       get_file (changefile, changefile, "r",
                  &commitpt->text->text, &bufsize, &commitpt->text->len);
 
        /* If COMMITPT->TEXT->TEXT is NULL, it means that CHANGEFILE
@@ -5922,10 +5921,8 @@
        }
        /* See the comment above, at the other get_file invocation,
           regarding binary vs. text.  */
-       get_file (changefile, changefile, 
-                 rcs->expand != NULL && STREQ (rcs->expand, "b") ? "rb" : "r",
-                 &dtext->text, &bufsize,
-                 &dtext->len);
+       get_file (changefile, changefile, "r",
+                 &dtext->text, &bufsize, &dtext->len);
        if (dtext->text == NULL)
        {
            dtext->text = xstrdup ("");

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1162
retrieving revision 1.1163
diff -u -b -r1.1162 -r1.1163
--- sanity.sh   3 Jul 2006 16:32:10 -0000       1.1162
+++ sanity.sh   5 Jul 2006 19:10:33 -0000       1.1163
@@ -15566,15 +15566,15 @@
          
          # Try checking out the module in a local directory
          if $remote; then
-           dotest_fail abspath-2a "${testcvs} co -d ${TESTDIR}/1 mod1" \
-"${SPROG} \[checkout aborted\]: absolute pathnames invalid for server 
(specified .${TESTDIR}/1.)"
-           dotest abspath-2a-try2 "${testcvs} co -d 1 mod1" \
-"${SPROG} checkout: Updating 1
+           dotest_fail abspath-2ar "$testcvs co -d $TESTDIR/1 mod1" \
+"$SPROG \[checkout aborted\]: absolute pathnames invalid for server (specified 
\`$TESTDIR/1')"
+           dotest abspath-2ar-try2 "$testcvs co -d 1 mod1" \
+"$SPROG checkout: Updating 1
 U 1/file1"
          else
-           dotest abspath-2a "${testcvs} co -d ${TESTDIR}/1 mod1" \
-"${SPROG} checkout: Updating ${TESTDIR}/1
-U ${TESTDIR}/1/file1"
+           dotest abspath-2a "$testcvs co -d $TESTDIR/1 mod1" \
+"$SPROG checkout: Updating $TESTDIR/1
+U $TESTDIR/1/file1"
          fi # remote workaround
 
          dotest abspath-2b "cat ${TESTDIR}/1/CVS/Repository" "mod1"