gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-07 22:34:18 +01:00
Code Issues Projects Releases Wiki Activity

WUtil: fixed possible problem in wcopy_file (Coverity #50141)

Browse Source 
As pointed by Coverity, the macro RETRY does not behave as expected, as it
assumes that errno is cleared on successful 'fopen' call which is not the
case.

This patch removes the uses of the macro RETRY:
 - fopen: with the appropriate check
 - fread/fwrite: nothing because they do not set errno
 - fclose: nothing because retrying is not recommended

and took the opportunity to add a little bit more information in the error
messages.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2014-05-18 00:56:40 +02:00
committed by Carlos R. Mafra
parent 5255c364b8
commit 8f9b843990
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
WINGs/findfile.c
View File

@@ -36,7 +36,6 @@
#define PATH_MAX 1024
#endif
#define RETRY( x ) do { x; } while (errno == EINTR);
char *wgethomedir()
{
@@ -431,27 +430,31 @@ int wcopy_file(const char *dir, const char *src_file, const char *dest_file)
if (stat(src_file, &st) != 0 || !S_ISREG(st.st_mode))
return -1;
RETRY( src = fopen(src_file, "rb") )
do {
src = fopen(src_file, "rb");
} while ((src == NULL) && (errno == EINTR));
if (src == NULL) {
werror(_("Could not open %s"), src_file);
werror(_("Could not open input file \"%s\""), src_file);
return -1;
}
dstpath = wstrconcat(dir, dest_file);
RETRY( dst = fopen(dstpath, "wb") )
do {
dst = fopen(dstpath, "wb");
} while ((dst == NULL) && (errno == EINTR));
if (dst == NULL) {
werror(_("Could not create %s"), dstpath);
werror(_("Could not create target file \"%s\""), dstpath);
wfree(dstpath);
RETRY( fclose(src) )
fclose(src);
return -1;
}
do {
RETRY( nread = fread(buf, 1, sizeof(buf), src) )
nread = fread(buf, 1, sizeof(buf), src);
if (ferror(src))
break;
RETRY( nwritten = fwrite(buf, 1, nread, dst) )
nwritten = fwrite(buf, 1, nread, dst);
if (ferror(dst) || feof(src) || nread != nwritten)
break;
@@ -460,10 +463,11 @@ int wcopy_file(const char *dir, const char *src_file, const char *dest_file)
if (ferror(src) || ferror(dst))
unlink(dstpath);
RETRY( fclose(src) )
fclose(src);
fchmod(fileno(dst), st.st_mode);
fsync(fileno(dst));
RETRY( fclose(dst) )
if (fclose(dst))
wwarning("error occured during fclose(\"%s\")", dstpath);
wfree(dstpath);
return 0;