libbb: add xunlink()

patch: do not try to delete same file twice

1 files changed, 3 insertions, 6 deletions

diff --git a/editors/patch.c b/editors/patch.c
index 2c90804..4d1425e 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -260,12 +260,9 @@ int patch_main(int argc, char **argv)
 			}
 			if ((dest_cur_line == 0) || (dest_beg_line == 0)) {
 				/* The new patched file is empty, remove it */
-				if (unlink(new_filename) == -1) {
-					bb_perror_msg_and_die("cannot remove file %s", new_filename);
-				}
-				if (unlink(original_filename) == -1) {
-					bb_perror_msg_and_die("cannot remove original file %s", new_filename);
-				}
+				xunlink(new_filename);
+				if (strcmp(new_filename, original_filename) != 0)
+					xunlink(original_filename);
 			}
 		}
 	}