[Cvs-cvs] ccvs/src filesubr.c rcs.c server.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/04/07 01:49:03

Modified files:
        src            : filesubr.c rcs.c server.c 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/filesubr.c.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/rcs.c.diff?tr1=1.360&tr2=1.361&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/server.c.diff?tr1=1.456&tr2=1.457&r1=text&r2=text

Patches:
Index: ccvs/src/filesubr.c
diff -u ccvs/src/filesubr.c:1.105 ccvs/src/filesubr.c:1.106
--- ccvs/src/filesubr.c:1.105   Mon Sep 26 00:33:39 2005
+++ ccvs/src/filesubr.c Fri Apr  7 01:49:03 2006
@@ -766,7 +766,8 @@
 last_component (const char *path)
 {
     const char *last = strrchr (path, '/');
-    
+
+    assert (path);
     if (last && (last != path))
         return last + 1;
     else
@@ -842,6 +843,7 @@
 expand_wild (int argc, char **argv, int *pargc, char ***pargv)
 {
     int i;
+    assert (argv || !argc);
     if (size_overflow_p (xtimes (argc, sizeof (char *)))) {
        *pargc = 0;
        *pargv = NULL;
Index: ccvs/src/rcs.c
diff -u ccvs/src/rcs.c:1.360 ccvs/src/rcs.c:1.361
--- ccvs/src/rcs.c:1.360        Fri Mar 10 12:56:07 2006
+++ ccvs/src/rcs.c      Fri Apr  7 01:49:03 2006
@@ -7287,6 +7287,8 @@
        rcsbuf = &rcsbuf_local;
     }
 
+   assert (rcsbuf);
+
    if (log) *log = NULL;
 
     ishead = 1;
@@ -8608,6 +8610,8 @@
     FILE *fin, *fout;
     struct rcsbuffer rcsbufin;
 
+    assert (rcs);
+
     if (noexec)
        return;
 
Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.456 ccvs/src/server.c:1.457
--- ccvs/src/server.c:1.456     Tue Mar 28 15:30:23 2006
+++ ccvs/src/server.c   Fri Apr  7 01:49:03 2006
@@ -4560,6 +4560,10 @@
 server_checked_in (const char *file, const char *update_dir,
                    const char *repository)
 {
+    assert (file);
+    assert (update_dir);
+    assert (repository);
+
     if (noexec)
        return;
     if (scratched_file != NULL && entries_line == NULL)