[Cvs-cvs] ccvs/src ChangeLog recurse.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/28 04:39:49

Modified files:
        src            : ChangeLog recurse.c 

Log message:
        * recurse.c: Back out previous accidental, undocumented, and broken
        commit.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3617&r2=1.3618
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.c?cvsroot=cvs&r1=1.134&r2=1.135

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3617
retrieving revision 1.3618
diff -u -b -r1.3617 -r1.3618
--- ChangeLog   25 Sep 2008 22:26:00 -0000      1.3617
+++ ChangeLog   28 Sep 2008 04:39:48 -0000      1.3618
@@ -1,3 +1,8 @@
+2008-09-28  Derek R. Price  <address@hidden>
+
+       * recurse.c: Back out previous accidental, undocumented, and broken
+       commit.
+
 2008-09-25  Derek R. Price  <address@hidden>
 
        * client.c (send_repository, send_dirent_proc), recurse.c

Index: recurse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- recurse.c   25 Sep 2008 22:26:01 -0000      1.134
+++ recurse.c   28 Sep 2008 04:39:49 -0000      1.135
@@ -925,8 +925,6 @@
     int ret;
     char *tmp;
 
-    TRACE (TRACE_FLOW, "do_file_proc (%s, %s)", finfo->update_dir, p->key);
-
     finfo->file = p->key;
     tmp = dir_append (finfo->update_dir, finfo->file);
 
@@ -1021,7 +1019,27 @@
     }
 
     saved_update_dir = update_dir;
-    update_dir = dir_append (saved_update_dir, dir);
+    update_dir = xmalloc (strlen (saved_update_dir)
+                         + strlen (dir)
+                         + 5);
+    strcpy (update_dir, saved_update_dir);
+
+    /* set up update_dir - skip dots if not at start */
+    if (STREQ (dir, "."))
+    {
+       if (update_dir[0] == '\0')
+           strcpy (update_dir, dir);
+    }
+    else
+    {
+       if (update_dir[0])
+       {
+           strcat (update_dir, "/");
+           strcat (update_dir, dir);
+       }
+       else
+           strcpy (update_dir, dir);
+    }
 
     /* Here we need a plausible repository name for the sub-directory.  We
      * create one by concatenating the new directory name onto the previous