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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/29 02:19:15

Modified files:
        src            : ChangeLog ls.c 

Log message:
        * ls.c (ls_dirleaveproc): Reindent, add quoting in error message.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3619&r2=1.3620
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ls.c?cvsroot=cvs&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3619
retrieving revision 1.3620
diff -u -b -r1.3619 -r1.3620
--- ChangeLog   29 Sep 2008 02:09:41 -0000      1.3619
+++ ChangeLog   29 Sep 2008 02:19:15 -0000      1.3620
@@ -1,5 +1,7 @@
 2008-09-28  Derek R. Price  <address@hidden>
 
+       * ls.c (ls_dirleaveproc): Reindent, add quoting in error message.
+
        * find_names.c (Find_Directories): Output returned list in traces.
        * hash.h (printlist): Add prototype.
        * ls.c (ls_direntproc): Add function trace.

Index: ls.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ls.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- ls.c        29 Sep 2008 02:09:42 -0000      1.24
+++ ls.c        29 Sep 2008 02:19:15 -0000      1.25
@@ -15,10 +15,13 @@
 # include <config.h>
 #endif
 
-/* ANSI C headers.  */
+/* Standards  */
 #include <stdbool.h>
 
-/* CVS headers.  */
+/* GNULIB */
+#include "quote.h"
+
+/* CVS */
 #include "ignore.h"
 #include "recurse.h"
 #include "wrapper.h"
@@ -554,6 +557,9 @@
 ls_dirleaveproc (void *callerdat, const char *dir, int err,
                  const char *update_dir, List *entries)
 {
+    TRACE (TRACE_FUNCTION, "ls_dirleaveproc (%s, %d, %s)",
+          dir, err, update_dir);
+
        if (created_dir && STREQ (created_dir, update_dir))
        {
                if (set_tag)
@@ -564,10 +570,10 @@
                    set_tag = false;
                }
 
-               (void)CVS_CHDIR ("..");
+       CVS_CHDIR ("..");
                if (unlink_file_dir (dir))
-                   error (0, errno, "Failed to remove directory `%s'",
-                          created_dir);
+           error (0, errno, "Failed to remove directory %s",
+                  quote (created_dir));
                Subdir_Deregister (entries, NULL, dir);
 
                free (created_dir);