From fc3e40ee8102c8b17fc98fbc93417bed4d878723 Mon Sep 17 00:00:00 2001 From: Ari Sundholm Date: Mon, 25 May 2015 15:16:11 +0200 Subject: 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 Signed-off-by: Denys Vlasenko --- coreutils/truncate.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'coreutils') 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; } -- cgit v1.1