summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAri Sundholm <ari@tuxera.com>2015-05-25 13:16:11 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2015-05-25 13:17:03 (GMT)
commitfc3e40ee8102c8b17fc98fbc93417bed4d878723 (patch)
treec81cf708a85dab603f85626988585a8b833d76aa
parent7f4a49a96c4e6626f01a09a801d79c591ad0b1db (diff)
downloadbusybox-refs/heads/master.tar.gz
busybox-refs/heads/master.tar.bz2
truncate: do not die when a file doesn't exist and no-create flag is onHEADmaster
Additionally, open(2) failures do not make the program die immediately. This makes the behavior of the program match coreutils more closely. function old new delta truncate_main 161 221 +60 Signed-off-by: Ari Sundholm <ari@tuxera.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/truncate.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/coreutils/truncate.c b/coreutils/truncate.c
index 0e36dab..e5fa656 100644
--- a/coreutils/truncate.c
+++ b/coreutils/truncate.c
@@ -64,12 +64,22 @@ int truncate_main(int argc UNUSED_PARAM, char **argv)
argv += optind;
while (*argv) {
- int fd = xopen(*argv, flags);
- if (ftruncate(fd, size) == -1) {
- bb_perror_msg("%s: ftruncate", *argv);
- ret = EXIT_FAILURE;
+ int fd = open(*argv, flags);
+ if (fd < 0) {
+ if (errno != ENOENT || !(opts & OPT_NOCREATE)) {
+ bb_perror_msg("%s: open", *argv);
+ ret = EXIT_FAILURE;
+ }
+ /* else: ENOENT && OPT_NOCREATE:
+ * do not report error, exitcode is also 0.
+ */
+ } else {
+ if (ftruncate(fd, size) == -1) {
+ bb_perror_msg("%s: truncate", *argv);
+ ret = EXIT_FAILURE;
+ }
+ xclose(fd);
}
- xclose(fd);
++argv;
}