Use remove_path from dir.c instead of own implementation

Besides, it fixes a memleak (builtin-rm.c) and accidental change of
the input const argument (builtin-merge-recursive.c).

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/builtin-apply.c b/builtin-apply.c
index 20bef1f21d393b0ddf36b8336af85a70c9b8c39c..70c9f93554c9bc97e5adbd924fd197973bb7d30d 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -13,6 +13,7 @@
 #include "delta.h"
 #include "builtin.h"
 #include "string-list.h"
 #include "delta.h"
 #include "builtin.h"
 #include "string-list.h"

+#include "dir.h"

 
 /*
  *  --check turns on checking that the working tree matches the
 
 /*
  *  --check turns on checking that the working tree matches the


@@ -2735,15 +2736,7 @@ static void remove_file(struct patch *patch, int rmdir_empty)
                                warning("unable to remove submodule %s",
                                        patch->old_name);
                } else if (!unlink(patch->old_name) && rmdir_empty) {
                                warning("unable to remove submodule %s",
                                        patch->old_name);
                } else if (!unlink(patch->old_name) && rmdir_empty) {

-                       char *name = xstrdup(patch->old_name);
-                       char *end = strrchr(name, '/');
-                       while (end) {
-                               *end = 0;
-                               if (rmdir(name))
-                                       break;
-                               end = strrchr(name, '/');
-                       }
-                       free(name);
+                       remove_path(patch->old_name);

                }
        }
 }
                }
        }
 }

diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index f628a62751d25d394c722bbc03f9367d3973fdd0..b9738655adc66386e55eccafa9ab891bdcf30960 100644 (file)
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -18,6 +18,7 @@
 #include "ll-merge.h"
 #include "interpolate.h"
 #include "attr.h"
 #include "ll-merge.h"
 #include "interpolate.h"
 #include "attr.h"

+#include "dir.h"

 #include "merge-recursive.h"
 
 static int subtree_merge;
 #include "merge-recursive.h"
 
 static int subtree_merge;


@@ -416,24 +417,6 @@ static int update_stages(const char *path, struct diff_filespec *o,
        return 0;
 }
 
        return 0;
 }
 

-static int remove_path(const char *name)
-{
-       int ret;
-       char *slash, *dirs;
-
-       ret = unlink(name);
-       if (ret)
-               return ret;
-       dirs = xstrdup(name);
-       while ((slash = strrchr(name, '/'))) {
-               *slash = '\0';
-               if (rmdir(name) != 0)
-                       break;
-       }
-       free(dirs);
-       return ret;
-}
-

 static int remove_file(int clean, const char *path, int no_wd)
 {
        int update_cache = index_only || clean;
 static int remove_file(int clean, const char *path, int no_wd)
 {
        int update_cache = index_only || clean;


@@ -444,7 +427,7 @@ static int remove_file(int clean, const char *path, int no_wd)
                        return -1;
        }
        if (update_working_directory) {
                        return -1;
        }
        if (update_working_directory) {

-               if (remove_path(path) && errno != ENOENT)
+               if (remove_path(path))

                        return -1;
        }
        return 0;
                        return -1;
        }
        return 0;

diff --git a/builtin-rm.c b/builtin-rm.c
index fdac34f2423409add48706497fa01010219baf72..50ae6d54011fad89387f0d56ce7a4591d07874f3 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -29,26 +29,6 @@ static void add_list(const char *name)
        list.name[list.nr++] = name;
 }
 
        list.name[list.nr++] = name;
 }
 

-static int remove_file(const char *name)
-{
-       int ret;
-       char *slash;
-
-       ret = unlink(name);
-       if (ret && errno == ENOENT)
-               /* The user has removed it from the filesystem by hand */
-               ret = errno = 0;
-
-       if (!ret && (slash = strrchr(name, '/'))) {
-               char *n = xstrdup(name);
-               do {
-                       n[slash - name] = 0;
-                       name = n;
-               } while (!rmdir(name) && (slash = strrchr(name, '/')));
-       }
-       return ret;
-}
-

 static int check_local_mod(unsigned char *head, int index_only)
 {
        /* items in list are already sorted in the cache order,
 static int check_local_mod(unsigned char *head, int index_only)
 {
        /* items in list are already sorted in the cache order,


@@ -239,7 +219,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
                int removed = 0;
                for (i = 0; i < list.nr; i++) {
                        const char *path = list.name[i];
                int removed = 0;
                for (i = 0; i < list.nr; i++) {
                        const char *path = list.name[i];

-                       if (!remove_file(path)) {
+                       if (!remove_path(path)) {

                                removed = 1;
                                continue;
                        }
                                removed = 1;
                                continue;
                        }