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

[Derek Robert Price]

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

Modified files:
        src            : ChangeLog recurse.c 

Log message:
        * recurse.c (start_recursion): Use GNULIB's dir_name() function to
        simplify code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3530&r2=1.3531
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.c?cvsroot=cvs&r1=1.118&r2=1.119

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3530
retrieving revision 1.3531
diff -u -b -r1.3530 -r1.3531
--- ChangeLog   29 Aug 2007 17:29:37 -0000      1.3530
+++ ChangeLog   29 Aug 2007 19:05:09 -0000      1.3531
@@ -1,5 +1,8 @@
 2007-08-29  Derek Price  <address@hidden>
 
+       * recurse.c (start_recursion): Use GNULIB's dir_name() function to
+       simplify code.
+
        * update.c (update_ignproc): Add comment.
 
 2007-08-28  Derek Price  <address@hidden>

Index: recurse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- recurse.c   28 Aug 2006 20:12:06 -0000      1.118
+++ recurse.c   29 Aug 2007 19:05:09 -0000      1.119
@@ -395,22 +395,11 @@
            char *file_to_try;
 
            /* Now break out argv[i] into directory part (DIR) and file part
-            * (COMP).  DIR and COMP will each point to a newly malloc'd
-            * string.
+            * (COMP).  DIR will point to a newly malloc'd string.
             */
-           dir = xstrdup (argv[i]);
-           comp = last_component (dir);
-           if (comp == dir)
-           {
-               /* no dir component.  What we have is an implied "./" */
-               dir = xstrdup (".");
-           }
-           else if (*comp)
-           {
-               comp[-1] = '\0';
-               comp = xstrdup (comp);
-           }
-           else
+           dir = dir_name (argv[i]);
+           comp = last_component (argv[i]);
+           if (!*comp)
            {
                /* A root directory would have existed under UNIX and a missing
                 * one specified on the command line (for instance,
@@ -474,7 +463,6 @@
 
            free (file_to_try);
            free (dir);
-           free (comp);
        }
     }