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

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Mark D. Baushke <mdb>   08/01/23 05:17:21

Modified files:
        src            : ChangeLog subr.c 

Log message:
        * subr.c (mkdir_i): Check to see if the directory exists.
        (The Solaris mkdir() returns an EACCESS rather than EEXISTS error
        when a swap filesystem is used and when access is bad to create
        the directory, even if it already exists which causes the
        toplevel-12 test to fail.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3553&r2=1.3554
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/subr.c?cvsroot=cvs&r1=1.163&r2=1.164

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3553
retrieving revision 1.3554
diff -u -b -r1.3553 -r1.3554
--- ChangeLog   1 Jan 2008 23:12:41 -0000       1.3553
+++ ChangeLog   23 Jan 2008 05:17:20 -0000      1.3554
@@ -1,3 +1,11 @@
+2008-01-22  Mark D. Baushke  <address@hidden>
+
+       * subr.c (mkdir_i): Check to see if the directory already exists.
+       (The Solaris mkdir() returns an EACCESS rather than EEXISTS error
+       when a swap filesystem is used and when access is bad to create
+       the directory, even if it already exists which causes the
+       toplevel-12 test to fail.)
+
 2008-01-01  Larry Jones  <address@hidden>
 
        * recurse.h (enum lock_type): Change to cvs_lock_type to avoid
@@ -196,7 +204,7 @@
        import_descend_dir), lock.c (lock_name), ls.c (ls_direntproc),
        mkmodules.c (init), modules.c (my_modules), update.c
        (update_dirent_proc): Replace directory access with new functions.
-       * file_subr.c (make_directory, make_directories, mkdir_if_needed):
+       * filesubr.c (make_directory, make_directories, mkdir_if_needed):
        Remove in favor of...
        * subr.c (mkdir_i, cvs_mkdir_i, cvs_mkdir, cvs_xmkdir,
        mkdir_callback, mkdir_announce_callback, cvs_mkdirs_i, cvs_mkdirs,

Index: subr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/subr.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- subr.c      20 Dec 2007 16:09:26 -0000      1.163
+++ subr.c      23 Jan 2008 05:17:21 -0000      1.164
@@ -2207,7 +2207,7 @@
         const char *update_dir, unsigned int flags)
 {
     bool err = mkdir (name, mode);
-    if (err && !(flags & MD_EXIST_OK && errno == EEXIST)
+    if (err && !(flags & MD_EXIST_OK && (errno == EEXIST || isdir (name)))
        && (flags & MD_FATAL || !(flags & MD_QUIET)))
     {
        bool uud = update_dir && strlen (update_dir)