diff options
| -rw-r--r-- | cfg.mk | 2 | ||||
| -rw-r--r-- | src/basename.c | 3 | ||||
| -rw-r--r-- | src/cp.c | 1 | ||||
| -rw-r--r-- | src/csplit.c | 4 | ||||
| -rw-r--r-- | src/die.h | 31 | ||||
| -rw-r--r-- | src/install.c | 4 | ||||
| -rw-r--r-- | src/ls.c | 1 | ||||
| -rw-r--r-- | src/nl.c | 3 | ||||
| -rw-r--r-- | src/tail.c | 4 |
9 files changed, 44 insertions, 9 deletions
@@ -794,7 +794,7 @@ exclude_file_name_regexp--sc_bindtextdomain = \ exclude_file_name_regexp--sc_trailing_blank = \ ^(tests/pr/|gl/.*\.diff$$|man/help2man) exclude_file_name_regexp--sc_system_h_headers = \ - ^src/((system|copy)\.h|make-prime-list\.c)$$ + ^src/((die|system|copy)\.h|make-prime-list\.c)$$ _src = (false|lbracket|ls-(dir|ls|vdir)|tac-pipe|uname-(arch|uname)) exclude_file_name_regexp--sc_require_config_h_first = \ diff --git a/src/basename.c b/src/basename.c index e2ed879ec..fe3cb3f07 100644 --- a/src/basename.c +++ b/src/basename.c @@ -146,7 +146,8 @@ main (int argc, char **argv) { case 's': suffix = optarg; - /* Fall through: -s implies -a. */ + /* -s implies -a, so... */ + /* fall through */ case 'a': multiple_names = true; @@ -1040,6 +1040,7 @@ main (int argc, char **argv) x.require_preserve = true; break; } + /* fall through */ case 'p': x.preserve_ownership = true; diff --git a/src/csplit.c b/src/csplit.c index ac92d4c43..30a97e572 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -28,6 +28,7 @@ #include <regex.h> +#include "die.h" #include "error.h" #include "fd-reopen.h" #include "quote.h" @@ -1287,8 +1288,7 @@ check_format_conv_type (char *format, int flags) break; case 0: - error (EXIT_FAILURE, 0, _("missing conversion specifier in suffix")); - break; + die (EXIT_FAILURE, 0, _("missing conversion specifier in suffix")); default: if (isprint (ch)) diff --git a/src/die.h b/src/die.h new file mode 100644 index 000000000..f64ab349f --- /dev/null +++ b/src/die.h @@ -0,0 +1,31 @@ +/* Report an error and exit. + Copyright 2016 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ + +#ifndef DIE_H +# define DIE_H + +# include <error.h> +# include <stdbool.h> +# include <verify.h> + +/* Like 'error (STATUS, ...)', except STATUS must be a nonzero constant. + This may pacify the compiler or help it generate better code. */ +# define die(status, ...) \ + verify_expr (status, (error (status, __VA_ARGS__), assume (false))) + +#endif /* DIE_H */ diff --git a/src/install.c b/src/install.c index 1e1fed5b6..8f512d8c6 100644 --- a/src/install.c +++ b/src/install.c @@ -31,6 +31,7 @@ #include "error.h" #include "cp-hash.h" #include "copy.h" +#include "die.h" #include "filenamecat.h" #include "full-read.h" #include "mkancesdirs.h" @@ -555,8 +556,7 @@ strip (char const *name) break; case 0: /* Child. */ execlp (strip_program, strip_program, name, NULL); - error (EXIT_FAILURE, errno, _("cannot run %s"), quoteaf (strip_program)); - break; + die (EXIT_FAILURE, errno, _("cannot run %s"), quoteaf (strip_program)); default: /* Parent. */ if (waitpid (pid, &status, 0) < 0) error (0, errno, _("waiting for strip")); @@ -3113,6 +3113,7 @@ gobble_file (char const *name, enum filetype type, ino_t inode, directory, and --dereference-command-line-symlink-to-dir is in effect. Fall through so that we call lstat instead. */ } + /* fall through */ default: /* DEREF_NEVER */ err = lstat (absolute_name, &f->stat); @@ -27,6 +27,7 @@ #include <regex.h> +#include "die.h" #include "error.h" #include "fadvise.h" #include "linebuffer.h" @@ -352,7 +353,7 @@ proc_text (void) 0, line_buf.length - 1, NULL)) { case -2: - error (EXIT_FAILURE, errno, _("error in regular expression search")); + die (EXIT_FAILURE, errno, _("error in regular expression search")); case -1: fputs (print_no_line_fmt, stdout); diff --git a/src/tail.c b/src/tail.c index 545da033c..4e98dd505 100644 --- a/src/tail.c +++ b/src/tail.c @@ -34,6 +34,7 @@ #include "system.h" #include "argmatch.h" #include "c-strtod.h" +#include "die.h" #include "error.h" #include "fcntl--.h" #include "isapipe.h" @@ -2161,8 +2162,7 @@ parse_options (int argc, char **argv, case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': - error (EXIT_FAILURE, 0, - _("option used in invalid context -- %c"), c); + die (EXIT_FAILURE, 0, _("option used in invalid context -- %c"), c); default: usage (EXIT_FAILURE); |