openkylin
/
util-linux
mirror of https://gitee.com/openkylin/util-linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

script: abort if unused arguments are given 

scripts uses either a free-standing "file" argument, or the value
passed as --log-out "file". Additional filenames are ignored.
They are also ignored if --log-in "file" is given, as it turns off
output logging by default (can still be overriden by adding --log-out).
Avoid surprises when passing multiple filenames by writing usage
message instead.

[kzak@redhat.com: - use errtryhelp() rather than usage()]

Signed-off-by: Chris Hofstaedtler <zeha@debian.org>
Reported-by: наб <nabijaczleweli@nabijaczleweli.xyz>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1016193
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Chris Hofstaedtler 2022-11-18 13:23:37 +00:00 committed by su-fang
parent cc4b6a6570
commit 267d2ac0f1
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
term-utils/script.c
View File

@ -889,9 +889,11 @@ int main(int argc, char **argv)
/* default if no --log-* specified */ /* default if no --log-* specified */
if (!outfile && !infile) { if (!outfile && !infile) {
if (argc > 0) if (argc > 0) {
outfile = argv[0]; outfile = argv[0];
else { argc--;
argv++;
} else {
die_if_link(&ctl, DEFAULT_TYPESCRIPT_FILENAME); die_if_link(&ctl, DEFAULT_TYPESCRIPT_FILENAME);
outfile = DEFAULT_TYPESCRIPT_FILENAME; outfile = DEFAULT_TYPESCRIPT_FILENAME;
} }
@ -900,6 +902,13 @@ int main(int argc, char **argv)
log_associate(&ctl, &ctl.out, outfile, SCRIPT_FMT_RAW); log_associate(&ctl, &ctl.out, outfile, SCRIPT_FMT_RAW);
} }
if (argc > 0) {
/* only one filename is accepted. if --log-out was given,
* freestanding filename is ignored */
warnx(_("unexpected number of arguments"));
errtryhelp(EXIT_FAILURE);
}
if (timingfile) { if (timingfile) {
/* the old SCRIPT_FMT_TIMING_SIMPLE should be used when /* the old SCRIPT_FMT_TIMING_SIMPLE should be used when
* recoding output only (just for backward compatibility), * recoding output only (just for backward compatibility),