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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/02/26 21:30:10

Modified files:
        src            : ChangeLog client.c 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3347&tr2=1.3348&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/client.c.diff?tr1=1.439&tr2=1.440&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3347 ccvs/src/ChangeLog:1.3348
--- ccvs/src/ChangeLog:1.3347   Sat Feb 25 22:20:43 2006
+++ ccvs/src/ChangeLog  Sun Feb 26 21:30:10 2006
@@ -1,3 +1,7 @@
+2006-02-26  Derek Price  <address@hidden>
+
+       * client.c (call_in_directory): Remove unneeded code.
+
 2006-02-25  Mark D. Baushke  <address@hidden>
 
        * sanity.sh (crerepos-6a): Simplify expected output expression.
Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.439 ccvs/src/client.c:1.440
--- ccvs/src/client.c:1.439     Sat Feb 25 07:41:50 2006
+++ ccvs/src/client.c   Sun Feb 26 21:30:10 2006
@@ -825,48 +825,6 @@
     if (CVS_CHDIR (toplevel_wd) < 0)
        error (1, errno, "could not chdir to %s", toplevel_wd);
 
-    /* Create the CVS directory at the top level if needed.  The
-       isdir seems like an unneeded system call, but it *does*
-       need to be called both if the CVS_CHDIR below succeeds
-       (e.g.  "cvs co .") or if it fails (e.g. basicb-1a in
-       testsuite).  We only need to do this for the "." case,
-       since the server takes care of forcing this directory to be
-       created in all other cases.  If we don't create CVSADM
-       here, the call to Entries_Open below will fail.  FIXME:
-       perhaps this means that we should change our algorithm
-       below that calls Create_Admin instead of having this code
-       here? */
-    if (/* I think the reposdirname_absolute case has to do with
-          things like "cvs update /foo/bar".  In any event, the
-          code below which tries to put toplevel_repos into
-          CVS/Repository is almost surely unsuited to
-          the reposdirname_absolute case.  */
-       !reposdirname_absolute
-       && !strcmp (dir_name, ".")
-       && ! isdir (CVSADM))
-    {
-       char *repo;
-       char *r;
-
-       newdir = 1;
-
-       /* If toplevel_repos doesn't have at least one character, then the
-        * reference to r[-1] below could be out of bounds.
-        */
-       assert (*toplevel_repos);
-
-       repo = xmalloc (strlen (toplevel_repos)
-                       + 10);
-       strcpy (repo, toplevel_repos);
-       r = repo + strlen (repo);
-       if (r[-1] != '.' || r[-2] != '/')
-           strcpy (r, "/.");
-
-       Create_Admin (".", ".", repo, NULL, NULL, 0, 1, 1);
-
-       free (repo);
-    }
-
     if (CVS_CHDIR (dir_name) < 0)
     {
        char *dir;