diff options
| author | Ari Sundholm <ari@tuxera.com> | 2015-05-25 15:16:11 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-05-25 15:17:03 +0200 |
| commit | fc3e40ee8102c8b17fc98fbc93417bed4d878723 (patch) | |
| tree | c81cf708a85dab603f85626988585a8b833d76aa /coreutils | |
| parent | 7f4a49a96c4e6626f01a09a801d79c591ad0b1db (diff) | |
| download | busybox-fc3e40ee8102c8b17fc98fbc93417bed4d878723.tar.gz | |
truncate: do not die when a file doesn't exist and no-create flag is on
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>
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/truncate.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/coreutils/truncate.c b/coreutils/truncate.c index 0e36daba3..e5fa656c8 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; } |