external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

dtcopy: Fix file removal

Browse source
This commit is contained in:
alx 2014-12-25 22:06:11 +01:00 committed by Jon Trulson
parent f6d6aafc93
commit 123d4ba8fc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cde/programs/dtfile/dtcopy/fsrtns.c
View file

@ -387,7 +387,7 @@ static int
EraseObject(char *nameP, int force) EraseObject(char *nameP, int force)
{ {
struct stat src_stat; struct stat src_stat;
int rc; int rc = 0;
if (periodicCallback) if (periodicCallback)
if (periodicCallback() != 0) if (periodicCallback() != 0)
@ -396,15 +396,15 @@ EraseObject(char *nameP, int force)
if (lstat(nameP, &src_stat) < 0) if (lstat(nameP, &src_stat) < 0)
rc = errno; rc = errno;
else if ((src_stat.st_mode & S_IFMT) == S_IFDIR) { else if ((src_stat.st_mode & S_IFMT) == S_IFDIR) {
if (! access(nameP, X_OK|W_OK)) if (access(nameP, X_OK|W_OK))
return errno; return errno;
rc = EmptyDir(nameP, 1, force); rc = EmptyDir(nameP, 1, force);
} }
else { else {
if (! (force || access(nameP, W_OK))) if (!force && access(nameP, W_OK))
return errno; return errno;
if (! unlink(nameP)) if (unlink(nameP))
rc = errno; rc = errno;
} }