libbb: add xunlink()

patch: do not try to delete same file twice
This commit is contained in:
Denis Vlasenko
2007-04-05 21:25:15 +00:00
parent 9020d850bf
commit 1bb552b1d9
4 changed files with 19 additions and 16 deletions

View File

@@ -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);
}
}
}