Merge pull request #13133 from keszybz/pstore-return-value

pstore: refuse to run if arguments are specified
This commit is contained in:
Lennart Poettering
2019-07-22 18:29:52 +02:00
committed by GitHub
2 changed files with 12 additions and 2 deletions
+4
View File
@@ -359,6 +359,10 @@ static int run(int argc, char *argv[]) {
log_setup_service();
if (argc > 1)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"This program takes no arguments.");
/* Ignore all parse errors */
(void) parse_config();
+8 -2
View File
@@ -10,14 +10,20 @@ if "$1" --help | grep -v 'default:' | grep -E -q '.{80}.'; then
exit 1
fi
# --help prints something. Also catches case where args are ignored.
if ! "$1" --help | grep -q .; then
echo "$(basename "$1") --help output is empty."
exit 2
fi
# no --help output to stdout
if "$1" --help 2>&1 1>/dev/null | grep .; then
echo "$(basename "$1") --help prints to stderr"
exit 2
exit 3
fi
# error output to stderr
if ! "$1" --no-such-parameter 2>&1 1>/dev/null | grep -q .; then
echo "$(basename "$1") with an unknown parameter does not print to stderr"
exit 3
exit 4
fi