summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2008-02-24 22:22:49 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2008-02-24 22:22:49 +0000
commitbe1b1a4e8c9b049483577ca9bf0357013e3e7cbc (patch)
tree90c79dd6a6c691a1281d90351190de336465846b
parentc7d89cdf37e0c152b02200c4ee9439f59e232cb2 (diff)
Fix initialization of vmin. This has caused script(1) to exit immediatly
when started inside an xterm that started with vmin=0 (because it had no tty to inherit the correct value from). ok kettenis@, krw@, oga@.
-rw-r--r--app/xterm/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/xterm/main.c b/app/xterm/main.c
index 99279d899..7011fb0cd 100644
--- a/app/xterm/main.c
+++ b/app/xterm/main.c
@@ -1866,10 +1866,6 @@ main(int argc, char *argv[]ENVP_ARG)
#ifndef USE_TERMIOS /* { */
d_tio.c_line = 0;
#endif /* } */
-#if defined(USE_TERMIOS) || defined(USE_POSIX_TERMIOS) /* { */
- d_tio.c_cc[VMIN] = 1;
- d_tio.c_cc[VTIME] = 0;
-#endif /* } */
#ifdef HAS_LTCHARS /* { */
d_ltc.t_suspc = CSUSP; /* t_suspc */
d_ltc.t_dsuspc = CDSUSP; /* t_dsuspc */
@@ -1932,6 +1928,10 @@ main(int argc, char *argv[]ENVP_ARG)
}
}
}
+#if defined(USE_TERMIOS) || defined(USE_POSIX_TERMIOS) /* { */
+ d_tio.c_cc[VMIN] = 1;
+ d_tio.c_cc[VTIME] = 0;
+#endif /* } */
#ifdef HAS_LTCHARS /* { */
d_ltc.t_suspc = CharOf('\000'); /* t_suspc */
d_ltc.t_dsuspc = CharOf('\000'); /* t_dsuspc */