script: support non-option argument as command

echoechoin · echoechoin · commit dc544926f496 · 2025-05-29T18:03:21.000+08:00
diff --git a/term-utils/script.c b/term-utils/script.c
@@ -190,7 +190,7 @@ static void __attribute__((__noreturn__)) usage(void)
 {
 	FILE *out = stdout;
 	fputs(USAGE_HEADER, out);
-	fprintf(out, _(" %s [options] [file]\n"), program_invocation_short_name);
+	fprintf(out, _(" %s [options] [file] -- [command]\n"), program_invocation_short_name);
 
 	fputs(USAGE_SEPARATOR, out);
 	fputs(_("Make a typescript of a terminal session.\n"), out);
@@ -758,6 +758,31 @@ static void die_if_link(struct script_control *ctl, const char *filename)
 		       "Program not started."), filename);
 }
 
+static char *concat_command(int argc, char *argv[])
+{
+	int i;
+	size_t len = 0;
+	char *result, *p;
+
+	for (i = 0; i < argc; i++)
+		len += strlen(argv[i]) + 1;
+
+	if (len == 0)
+		return NULL;
+	
+	p = result = xmalloc(len + 1);
+	if (!result)
+		return NULL;
+	
+	for (i = 0; i < argc; i++) {
+		memcpy(p, argv[i], strlen(argv[i]));
+		p += strlen(argv[i]);
+		*p++ = ' ';
+	}
+	*p = '\0';
+	return result;
+}
+
 int main(int argc, char **argv)
 {
 	struct script_control ctl = {
@@ -768,6 +793,7 @@ int main(int argc, char **argv)
 	int ch, format = 0, caught_signal = 0, rc = 0, echo = 1;
 	const char *outfile = NULL, *infile = NULL;
 	const char *timingfile = NULL, *shell = NULL;
+	char *posixly_correct;
 
 	enum { FORCE_OPTION = CHAR_MAX + 1 };
 
@@ -813,6 +839,10 @@ int main(int argc, char **argv)
 
 	ctl.isterm = isatty(STDIN_FILENO);
 
+	/* assure the order of argv[] unchanged */
+	posixly_correct = getenv("POSIXLY_CORRECT");
+	setenv("POSIXLY_CORRECT", "1", 1);
+
 	while ((ch = getopt_long(argc, argv, "aB:c:eE:fI:O:o:qm:T:t::Vh", longopts, NULL)) != -1) {
 
 		err_exclusive_options(ch, longopts, excl, excl_st);
@@ -888,12 +918,20 @@ int main(int argc, char **argv)
 			errtryhelp(EXIT_FAILURE);
 		}
 	}
+
+	/* restore POSIXLY_CORRECT */
+	if (posixly_correct)
+		setenv("POSIXLY_CORRECT", posixly_correct, 1);
+	else
+		unsetenv("POSIXLY_CORRECT");
+
 	argc -= optind;
 	argv += optind;
 
 	/* default if no --log-* specified */
 	if (!outfile && !infile) {
-		if (argc > 0) {
+		/* if argv[0] is not after --, use argv[0] as outfile */
+		if (argc > 0 && strcmp(argv[-1], "--") != 0) {
 			outfile = argv[0];
 			argc--;
 			argv++;
@@ -906,9 +944,29 @@ int main(int argc, char **argv)
 		log_associate(&ctl, &ctl.out, outfile, SCRIPT_FMT_RAW);
 	}
 
+	/* skip -- to non-option arguments */
+	if (argc > 0 && strcmp(argv[0], "--") == 0) {
+		argc--;
+		argv++;
+	}
+
+	/* concat non-option arguments as command */
+	if (argc > 0 && strcmp(argv[-1], "--") == 0) {
+		if (ctl.command != NULL) {
+			warnx(_("conflicting arguments of --command and non-option arguments"));
+			errtryhelp(EXIT_FAILURE);
+		}
+
+		ctl.command = concat_command(argc, argv);
+		if (!ctl.command)
+			errx(EXIT_FAILURE, _("failed to concatenate arguments"));
+
+		ctl.command_norm = xstrdup(ctl.command);
+		strrep(ctl.command_norm, '\n', ' ');
+		argc = 0;
+	}
+
 	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);
 	}
