JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

implement tty tracking and bump to R41 for feature completeness

Browse Source 
• tty_fd is now never closed
• new tty_hasstate tracks tty_state (cf. thread around
  http://article.gmane.org/gmane.os.miros.mksh/79 and PLD bug)
• as users requested, importing COLUMNS or LINES from the environment
  now removes its special-ness as does unsetting it
• otherwise, setting COLUMNS or LINES is honoured until the next SIGWINCH
  arrives or change_winsz is otherwise run (e.g. before displaying the
  prompt in the interactive command line editing modes)
• SIGWINCH is now honoured before each reading of $COLUMNS and $LINES too
• change the Uhr to match – it no longer calls stty(1) ☺
This commit is contained in:
tg
2012-11-30 19:25:08 +00:00
parent 730bc915bd
commit 77c4cb88e4
6 changed files with 145 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
var.c
View File

@@ -27,7 +27,7 @@
#include <sys/sysctl.h>
#endif
__RCSID("$MirOS: src/bin/mksh/var.c,v 1.160 2012/11/30 19:02:10 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/var.c,v 1.161 2012/11/30 19:25:08 tg Exp $");
/*-
* Variables
@@ -1090,10 +1090,8 @@ getspec(struct tbl *vp)
struct timeval tv;
switch ((st = special(vp->name))) {
case V_BASHPID:
i = (mksh_ari_t)procpid;
break;
case V_COLUMNS:
case V_LINES:
/*
* Do NOT export COLUMNS/LINES. Many applications
* check COLUMNS/LINES before checking ws.ws_col/row,
@@ -1101,6 +1099,15 @@ getspec(struct tbl *vp)
* and the window is then resized, the app won't
* see the change cause the environ doesn't change.
*/
if (got_winch)
change_winsz();
break;
}
switch (st) {
case V_BASHPID:
i = (mksh_ari_t)procpid;
break;
case V_COLUMNS:
i = x_cols;
break;
case V_HISTSIZE:
@@ -1197,9 +1204,16 @@ setspec(struct tbl *vp)
return;
/* common sub-cases */
case V_COLUMNS:
case V_LINES:
if (vp->flag & IMPORT) {
/* do not touch */
unspecial(vp->name);
vp->flag &= ~SPECIAL;
return;
}
/* FALLTHROUGH */
case V_HISTSIZE:
case V_LINENO:
case V_LINES:
case V_OPTIND:
case V_RANDOM:
case V_SECONDS:
@@ -1466,7 +1480,7 @@ change_winsz(void)
{
#ifdef TIOCGWINSZ
/* check if window size has changed */
if (tty_fd >= 0) {
if (tty_init_fd() < 2) {
struct winsize ws;
if (ioctl(tty_fd, TIOCGWINSZ, &ws) >= 0) {