cvs-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Derek Robert Price
Subject: [Cvs-cvs] ccvs/src ChangeLog rcs.c
Date: Mon, 30 Jan 2006 23:21:52 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/01/30 23:21:52

Modified files:
        src            : ChangeLog rcs.c 

Log message:
        * rcs.c (locate_rcs): Improve comments and plug memory leak.
        (rcsbuf_cache_open): Don't recopy file name - it was an ignore case
        issue.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3338&tr2=1.3339&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/rcs.c.diff?tr1=1.357&tr2=1.358&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3338 ccvs/src/ChangeLog:1.3339
--- ccvs/src/ChangeLog:1.3338   Fri Jan 27 17:15:33 2006
+++ ccvs/src/ChangeLog  Mon Jan 30 23:21:52 2006
@@ -1,3 +1,9 @@
+2006-01-30  Derek Price  <address@hidden>
+
+       * rcs.c (locate_rcs): Improve comments and plug memory leak.
+       (rcsbuf_cache_open): Don't recopy file name - it was an ignore case
+       issue.
+
 2006-01-26  Mark D. Baushke  <address@hidden>
 
        Dump pagealign_alloc in favor of malloc to avoid mmap() problems.
Index: ccvs/src/rcs.c
diff -u ccvs/src/rcs.c:1.357 ccvs/src/rcs.c:1.358
--- ccvs/src/rcs.c:1.357        Sat Dec 31 23:33:43 2005
+++ ccvs/src/rcs.c      Mon Jan 30 23:21:52 2006
@@ -214,7 +214,7 @@
 {
     char *retval;
 
-    /* First, try to find the file as cased. */
+    /* First, try to find the file as if we knew it existed on the trunk.  */
     retval = xmalloc (strlen (repository)
                       + sizeof (CVSATTIC)
                       + strlen (file)
@@ -227,6 +227,8 @@
            *inattic = 0;
        return retval;
     }
+
+    /* Next, look in the Attic.  */
     sprintf (retval, "%s/%s/%s%s", repository, CVSATTIC, file, RCSEXT);
     if (isreadable (retval))
     {
@@ -294,9 +296,10 @@
        free (rcsfile);
        retval = rcs;
     }
-    else if (!existence_error (errno))
+    else
     {
-       error (0, errno, "cannot open `%s'", rcsfile);
+       if (!existence_error (errno))
+           error (0, errno, "cannot open `%s'", rcsfile);
        free (rcsfile);
     }
 
@@ -1973,12 +1976,6 @@
        }
        *pfp = cached_rcsbuf.fp;
 
-       /* When RCS_parse opens a file using fopen_case, it frees the
-           filename which we cached in CACHED_RCSBUF and stores a new
-           file name in RCS->PATH.  We avoid problems here by always
-           copying the filename over.  FIXME: This is hackish.  */
-       cached_rcsbuf.filename = rcs->path;
-
        *prcsbuf = cached_rcsbuf;
 
        cached_rcs = NULL;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]