diff options
author | Pádraig Brady <P@draigBrady.com> | 2022-03-07 22:39:32 +0000 |
---|---|---|
committer | Pádraig Brady <P@draigBrady.com> | 2022-03-07 23:33:25 +0000 |
commit | 8767d75b9df3c82db6d92d40de42da760140ce75 (patch) | |
tree | 14e65ab91a280d927267671586bb64c6dc63e3d0 | |
parent | 92cb8427c537f37edd43c5cef1909585201372ab (diff) | |
download | coreutils-8767d75b9df3c82db6d92d40de42da760140ce75.tar.gz |
maint: address syntax-check issues in recent commit
* cfg.mk (sc_die_EXIT_FAILURE): Generalize to match any EXIT_ define,
and also relax to ignore error() usage with ternary operator.
* src/chroot.c (main): Use () to avoid the sc_error_quotes check.
-rw-r--r-- | cfg.mk | 4 | ||||
-rw-r--r-- | src/chroot.c | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -192,7 +192,7 @@ sc_prohibit_quotes_notation: # Files in src/ should quote all strings in error() output, so that # unexpected input chars like \r etc. don't corrupt the error. # In edge cases this can be avoided by putting the format string -# on a separate line to the following arguments. +# on a separate line to the arguments, or the arguments in parenthesis. sc_error_quotes: @cd $(srcdir)/src && GIT_PAGER= git grep -n 'error *(.*%s.*, [^(]*);$$'\ *.c | grep -v ', q' \ @@ -236,7 +236,7 @@ sc_error_shell_always_quotes: # to the compiler that it doesn't return. sc_die_EXIT_FAILURE: @cd $(srcdir)/src && GIT_PAGER= git grep -E \ - 'error \(.*_(FAILURE|INVALID)' \ + 'error \([^?]*EXIT_' \ && { echo '$(ME): '"Use die() instead of error" 1>&2; \ exit 1; } \ || : diff --git a/src/chroot.c b/src/chroot.c index be9601304..983940400 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -358,7 +358,7 @@ main (int argc, char **argv) char const *err = parse_user_spec_warn (userspec, &uid, &gid, NULL, NULL, &warn); if (err) - error (warn ? 0 : EXIT_CANCELED, 0, "%s", err); + error (warn ? 0 : EXIT_CANCELED, 0, "%s", (err)); } /* If no gid is supplied or looked up, do so now. |