X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-rm.c;h=33d04bd015e43965a1bc44bb281908298f152f6c;hb=eb153837d8509fc6ef59b17630429c63c0993b2d;hp=5deb81171996029b31da14109c408ffba33f7957;hpb=e40e0135f24a140935c218af43d0bf8b7b07067b;p=git.git

diff --git a/builtin-rm.c b/builtin-rm.c
index 5deb81171..33d04bd01 100644
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -32,7 +32,7 @@ static int remove_file(const char *name)
 
 	ret = unlink(name);
 	if (!ret && (slash = strrchr(name, '/'))) {
-		char *n = strdup(name);
+		char *n = xstrdup(name);
 		do {
 			n[slash - name] = 0;
 			name = n;
@@ -43,19 +43,16 @@ static int remove_file(const char *name)
 
 static struct lock_file lock_file;
 
-int cmd_rm(int argc, const char **argv, char **envp)
+int cmd_rm(int argc, const char **argv, const char *prefix)
 {
 	int i, newfd;
 	int verbose = 0, show_only = 0, force = 0;
-	const char *prefix = setup_git_directory();
 	const char **pathspec;
 	char *seen;
 
 	git_config(git_default_config);
 
-	newfd = hold_lock_file_for_update(&lock_file, get_index_file());
-	if (newfd < 0)
-		die("unable to create new index file");
+	newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
 
 	if (read_cache() < 0)
 		die("index file corrupt");
@@ -81,7 +78,7 @@ int cmd_rm(int argc, const char **argv, char **envp)
 			force = 1;
 			continue;
 		}
-		die(builtin_rm_usage);
+		usage(builtin_rm_usage);
 	}
 	if (argc <= i)
 		usage(builtin_rm_usage);
@@ -90,8 +87,7 @@ int cmd_rm(int argc, const char **argv, char **envp)
 	seen = NULL;
 	for (i = 0; pathspec[i] ; i++)
 		/* nothing */;
-	seen = xmalloc(i);
-	memset(seen, 0, i);
+	seen = xcalloc(i, 1);
 
 	for (i = 0; i < active_nr; i++) {
 		struct cache_entry *ce = active_cache[i];
@@ -117,7 +113,7 @@ int cmd_rm(int argc, const char **argv, char **envp)
 		printf("rm '%s'\n", path);
 
 		if (remove_file_from_cache(path))
-			die("git rm: unable to remove %s", path);
+			die("git-rm: unable to remove %s", path);
 		cache_tree_invalidate_path(active_cache_tree, path);
 	}
 
@@ -141,7 +137,7 @@ int cmd_rm(int argc, const char **argv, char **envp)
 				continue;
 			}
 			if (!removed)
-				die("git rm: %s: %s", path, strerror(errno));
+				die("git-rm: %s: %s", path, strerror(errno));
 		}
 	}