[Cvs-cvs] ccvs/src ChangeLog add.c client.c subr.c subr.h

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/08/15 16:44:48

Modified files:
        src            : ChangeLog add.c client.c subr.c subr.h 

Log message:
        * subr.c (has_slash): Rename to...
        (hasSlash): ...this.
        (hasAdmin): New convenience function.
        * subr.h (has_slash, hasSlash, hasAdmin): Update to match.
        * add.c (add): s/has_slash/hasSlash/.
        * client.c (send_dirent_proc): Use new hasAdmin() function.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3563&r2=1.3564
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/add.c?cvsroot=cvs&r1=1.135&r2=1.136
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&r1=1.467&r2=1.468
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/subr.c?cvsroot=cvs&r1=1.166&r2=1.167
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/subr.h?cvsroot=cvs&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3563
retrieving revision 1.3564
diff -u -b -r1.3563 -r1.3564
--- ChangeLog   15 Aug 2008 16:23:10 -0000      1.3563
+++ ChangeLog   15 Aug 2008 16:44:47 -0000      1.3564
@@ -1,5 +1,12 @@
 2008-08-15  Derek R. Price  <address@hidden>
 
+       * subr.c (has_slash): Rename to...
+       (hasSlash): ...this.
+       (hasAdmin): New convenience function.
+       * subr.h (has_slash, hasSlash, hasAdmin): Update to match.
+       * add.c (add): s/has_slash/hasSlash/.
+       * client.c (send_dirent_proc): Use new hasAdmin() function.
+
        * subr.c (has_slash): New convenience function and...
        * subr.h (has_slash): ...its prototype.
        * add.c (add): Use new convenience function.

Index: add.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/add.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- add.c       15 Aug 2008 16:23:11 -0000      1.135
+++ add.c       15 Aug 2008 16:44:48 -0000      1.136
@@ -140,7 +140,7 @@
            skip_file = 1;
        }
        else
-           found_slash = found_slash || has_slash (argv[i]);
+           found_slash = found_slash || hasSlash (argv[i]);
 
        if (skip_file)
        {

Index: client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -b -r1.467 -r1.468
--- client.c    12 Sep 2007 18:27:06 -0000      1.467
+++ client.c    15 Aug 2008 16:44:48 -0000      1.468
@@ -5679,8 +5679,7 @@
                   const char *update_dir, List *entries)
 {
     struct send_data *args = callerdat;
-    int dir_exists;
-    char *cvsadm_name;
+    bool dir_exists;
 
     if (ignore_directory (update_dir))
     {
@@ -5698,9 +5697,7 @@
      * This case will happen when checking out a module defined as
      * ``-a .''.
      */
-    cvsadm_name = Xasprintf ("%s/%s", dir, CVSADM);
-    dir_exists = isdir (cvsadm_name);
-    free (cvsadm_name);
+    dir_exists = hasAdmin (dir);
 
     /*
      * If there is an empty directory (e.g. we are doing `cvs add' on a

Index: subr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/subr.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- subr.c      15 Aug 2008 16:23:11 -0000      1.166
+++ subr.c      15 Aug 2008 16:44:48 -0000      1.167
@@ -2463,10 +2463,21 @@
 /* Return TRUE if PATH contains a slash as determined by ISSLASH().
  */
 bool
-has_slash (const char *path)
+hasSlash (const char *path)
 {
     while (*path)
        if (ISSLASH (*(path++)))
            return true;
     return false;
 }
+
+
+
+bool
+hasAdmin (const char *dir)
+{
+    char *adm = file_name_concat (dir, CVSADM, NULL);
+    bool has = isdir (adm);
+    free (adm);
+    return has;
+}

Index: subr.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/subr.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- subr.h      15 Aug 2008 16:23:11 -0000      1.18
+++ subr.h      15 Aug 2008 16:44:48 -0000      1.19
@@ -141,7 +141,8 @@
 
 char *dir_append (const char *dir, const char *append);
 char *dir_append_dirs (const char *dir, ...);
-bool has_slash (const char *path);
+bool hasSlash (const char *path);
+bool hasAdmin (const char *dir);