From c8056584cb88432fb28c48544cd5ebbbf93d5083 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sun, 29 Apr 2007 23:08:16 +0000
Subject: [PATCH] Execute delete with "--" as first argument

---
 src/callbacks.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/callbacks.c b/src/callbacks.c
index 5a99038..f1609b6 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -177,7 +177,7 @@ void on_edit_delete(GtkMenuItem * menuitem, gpointer data)
 
 static void _delete_do(Browser * browser, GList * selection, unsigned long cnt)
 {
-	unsigned long i = 1;
+	unsigned long i = 2;
 	char ** argv;
 	pid_t pid;
 	GtkTreeIter iter;
@@ -191,7 +191,7 @@ static void _delete_do(Browser * browser, GList * selection, unsigned long cnt)
 	}
 	else if(pid != 0)
 		return;
-	if((argv = malloc(sizeof(char*) * (cnt+2))) == NULL)
+	if((argv = malloc(sizeof(*argv) * (cnt + 3))) == NULL)
 	{
 		fprintf(stderr, "%s%s\n", "browser: malloc: ", strerror(errno));
 		exit(2);
@@ -201,6 +201,7 @@ static void _delete_do(Browser * browser, GList * selection, unsigned long cnt)
 #else
 	argv[0] = "delete";
 #endif
+	argv[1] = "--";
 	for(p = selection; p != NULL && i <= cnt; p = p->next)
 	{
 		if(!gtk_tree_model_get_iter(GTK_TREE_MODEL(browser->store),
@@ -210,7 +211,7 @@ static void _delete_do(Browser * browser, GList * selection, unsigned long cnt)
 				BR_COL_PATH, &q, -1);
 		argv[i++] = q;
 	}
-	if(i != cnt+1)
+	if(i != cnt + 1)
 	{
 		fprintf(stderr, "%s", "browser: Could not delete files\n");
 		exit(2);