DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Execute delete with "--" as first argument

Browse Source
This commit is contained in:
Pierre Pronchery 2007-04-29 23:08:16 +00:00
parent 4ee39ef70d
commit c8056584cb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/callbacks.c
View File

@ -177,7 +177,7 @@ void on_edit_delete(GtkMenuItem * menuitem, gpointer data)
static void _delete_do(Browser * browser, GList * selection, unsigned long cnt) static void _delete_do(Browser * browser, GList * selection, unsigned long cnt)
{ {
unsigned long i = 1; unsigned long i = 2;
char ** argv; char ** argv;
pid_t pid; pid_t pid;
GtkTreeIter iter; GtkTreeIter iter;
@ -191,7 +191,7 @@ static void _delete_do(Browser * browser, GList * selection, unsigned long cnt)
} }
else if(pid != 0) else if(pid != 0)
return; 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)); fprintf(stderr, "%s%s\n", "browser: malloc: ", strerror(errno));
exit(2); exit(2);
@ -201,6 +201,7 @@ static void _delete_do(Browser * browser, GList * selection, unsigned long cnt)
#else #else
argv[0] = "delete"; argv[0] = "delete";
#endif #endif
argv[1] = "--";
for(p = selection; p != NULL && i <= cnt; p = p->next) for(p = selection; p != NULL && i <= cnt; p = p->next)
{ {
if(!gtk_tree_model_get_iter(GTK_TREE_MODEL(browser->store), 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); BR_COL_PATH, &q, -1);
argv[i++] = q; argv[i++] = q;
} }
if(i != cnt+1) if(i != cnt + 1)
{ {
fprintf(stderr, "%s", "browser: Could not delete files\n"); fprintf(stderr, "%s", "browser: Could not delete files\n");
exit(2); exit(2);