Check there are files to add the archive before removing a specified

tar file.
This commit is contained in:
Glenn L McGrath 2003-11-20 09:06:10 +00:00
parent 90c9df93f3
commit ba49651de9

View File

@ -462,11 +462,6 @@ static inline int writeTarFile(const int tar_fd, const int verboseFlag,
tbInfo.hlInfoHead = NULL; tbInfo.hlInfoHead = NULL;
/* Make sure there is at least one file to tar up. */
if (include == NULL) {
bb_error_msg_and_die("Cowardly refusing to create an empty archive");
}
fchmod(tar_fd, 0644); fchmod(tar_fd, 0644);
tbInfo.tarFd = tar_fd; tbInfo.tarFd = tar_fd;
tbInfo.verboseFlag = verboseFlag; tbInfo.verboseFlag = verboseFlag;
@ -748,6 +743,10 @@ int tar_main(int argc, char **argv)
#ifdef CONFIG_FEATURE_TAR_CREATE #ifdef CONFIG_FEATURE_TAR_CREATE
if (ctx_flag == CTX_CREATE) { if (ctx_flag == CTX_CREATE) {
/* Make sure there is at least one file to tar up. */
if (tar_handle->accept == NULL) {
bb_error_msg_and_die("Cowardly refusing to create an empty archive");
}
tar_stream = stdout; tar_stream = stdout;
flags = O_WRONLY | O_CREAT | O_EXCL; flags = O_WRONLY | O_CREAT | O_EXCL;
unlink(tar_filename); unlink(tar_filename);