filecopy: fix handling ENOENT error

Do not fail when file was successfully created.

I will test before commit. I will test before commit. I will...
This commit is contained in:
Marek Marczykowski-Górecki 2015-01-23 00:11:55 +01:00
parent 7607b45eae
commit fcbe0363d0

View File

@ -109,11 +109,13 @@ void process_one_file_reg(struct file_header *untrusted_hdr,
/* make the file inaccessible until fully written */ /* make the file inaccessible until fully written */
if (use_tmpfile) { if (use_tmpfile) {
fdout = open(".", O_WRONLY | O_TMPFILE, 0700); fdout = open(".", O_WRONLY | O_TMPFILE, 0700);
if (fdout < 0 && errno==ENOENT) { if (fdout < 0) {
/* if it fails, do not attempt further use - most likely kernel too old */ if (errno==ENOENT)
use_tmpfile = 0; /* if it fails, do not attempt further use - most likely kernel too old */
} else use_tmpfile = 0;
do_exit(errno, untrusted_name); else
do_exit(errno, untrusted_name);
}
} }
if (fdout < 0) if (fdout < 0)
fdout = open(untrusted_name, O_WRONLY | O_CREAT | O_EXCL | O_NOFOLLOW, 0000); /* safe because of chroot */ fdout = open(untrusted_name, O_WRONLY | O_CREAT | O_EXCL | O_NOFOLLOW, 0000); /* safe because of chroot */