Module Name: src
Committed By: snj
Date: Wed Dec 31 06:23:12 UTC 2014
Modified Files:
src/usr.sbin/sysinst [netbsd-7]: run.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #361):
usr.sbin/sysinst/run.c: revisions 1.4, 1.5
If we launch a program with RUN_SILENT, give it more than two seconds to
run before we create an output window. On a swapping VAX it can take
seriously longer, and we get interactive status display even if the program
did not produce any error output otherwise.
--
Revise previous: with RUN_SILENT there is never a good reason to create
the output window unless there is actually output to display.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/run.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/run.c
diff -u src/usr.sbin/sysinst/run.c:1.2 src/usr.sbin/sysinst/run.c:1.2.4.1
--- src/usr.sbin/sysinst/run.c:1.2 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/run.c Wed Dec 31 06:23:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: run.c,v 1.2 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: run.c,v 1.2.4.1 2014/12/31 06:23:11 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -497,10 +497,10 @@ launch_subwin(WINDOW **actionwin, char *
errx(1, mmsg);
}
read_fd_set = active_fd_set;
- tmo.tv_sec = 2;
+ tmo.tv_sec = flags & RUN_SILENT ? 20 : 2;
tmo.tv_usec = 0;
i = select(FD_SETSIZE, &read_fd_set, NULL, NULL, &tmo);
- if (i == 0 && *actionwin == NULL)
+ if (i == 0 && *actionwin == NULL && (flags & RUN_SILENT) == 0)
*actionwin = show_cmd(scmd, win);
if (i < 0) {
if (errno != EINTR) {
