From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Wed, 25 Jun 2008 20:54:45 +0000 (-0000)
Subject: b[un]zip2, g[un]zip: unlink destination if -f is given. Closes 3854
X-Git-Tag: 1_12_0~297
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a04cc47f1c53c34e81a7271d687d8b68d0489892;p=oweals%2Fbusybox.git

b[un]zip2, g[un]zip: unlink destination if -f is given. Closes 3854
---

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 90d39f682..09a4eb9eb 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -73,6 +73,12 @@ int bbunpack(char **argv,
 				bb_error_msg("%s: unknown suffix - ignored", filename);
 				goto err;
 			}
+
+			/* -f: overwrite existing output files */
+			if (option_mask32 & OPT_FORCE) {
+				unlink(new_name);
+			}
+
 			/* O_EXCL: "real" bunzip2 doesn't overwrite files */
 			/* GNU gunzip does not bail out, but goes to next file */
 			if (open_to_or_warn(STDOUT_FILENO, new_name, O_WRONLY | O_CREAT | O_EXCL,