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

Use the Browser VFS in delete(1)

Browse Source
This commit is contained in:
Pierre Pronchery 2017-12-28 06:06:08 +01:00
parent 5a3b697c44
commit d06cc32b71
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/delete.c
View File

@ -39,6 +39,7 @@
#include <locale.h> #include <locale.h>
#include <libintl.h> #include <libintl.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "Browser/vfs.h"
#include "../config.h" #include "../config.h"
#define _(string) gettext(string) #define _(string) gettext(string)
@ -233,7 +234,7 @@ static void _delete_on_cancel(gpointer data)
for(i = delete->dirv_cnt; i >= 1; i--) for(i = delete->dirv_cnt; i >= 1; i--)
{ {
if(delete->dirv[i - 1]->dir != NULL) if(delete->dirv[i - 1]->dir != NULL)
closedir(delete->dirv[i - 1]->dir); browser_vfs_closedir(delete->dirv[i - 1]->dir);
free(delete->dirv[i - 1]->filename); free(delete->dirv[i - 1]->filename);
free(delete->dirv[i - 1]); free(delete->dirv[i - 1]);
} }
@ -327,7 +328,7 @@ static int _idle_do_file(Delete * delete, char const * filename)
fprintf(stderr, "DEBUG: %s(\"%s\")\n", __func__, filename); fprintf(stderr, "DEBUG: %s(\"%s\")\n", __func__, filename);
#endif #endif
_delete_refresh(delete, filename); _delete_refresh(delete, filename);
if(lstat(filename, &st) != 0 && errno == ENOENT) if(browser_vfs_lstat(filename, &st) != 0 && errno == ENOENT)
{ {
if(!(*(delete->prefs) & PREFS_f)) if(!(*(delete->prefs) & PREFS_f))
return _delete_filename_error(delete, filename, 1); return _delete_filename_error(delete, filename, 1);
@ -408,7 +409,7 @@ static int _idle_do_closedir(Delete * delete)
int ret = 0; int ret = 0;
DeleteDir * dd = delete->dirv[delete->dirv_cnt - 1]; DeleteDir * dd = delete->dirv[delete->dirv_cnt - 1];
closedir(dd->dir); browser_vfs_closedir(dd->dir);
switch(delete->mode) switch(delete->mode)
{ {
case DM_COUNT: case DM_COUNT:
@ -542,7 +543,7 @@ static int _idle_do_opendir(Delete * delete, char const * filename)
free(dd); free(dd);
return _delete_filename_error(delete, filename, 1); return _delete_filename_error(delete, filename, 1);
} }
if((dd->dir = opendir(filename)) == NULL) if((dd->dir = browser_vfs_opendir(filename, NULL)) == NULL)
{ {
free(dd); free(dd);
return _delete_filename_error(delete, filename, 1); return _delete_filename_error(delete, filename, 1);

6
src/project.conf
View File

@ -21,8 +21,14 @@ depends=../include/Browser/vfs.h
[delete] [delete]
type=binary type=binary
sources=delete.c sources=delete.c
cppflags=-I../include
ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(LIBDIR) -lBrowser
depends=$(OBJDIR)lib/libBrowser.a
install=$(BINDIR) install=$(BINDIR)
[delete.c]
depends=../include/Browser/vfs.h
[move] [move]
type=binary type=binary
sources=move.c sources=move.c