isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use TIOCGSIZE/TIOCSSIZE instead of TIOCGWINSZ/TIOCSWINSZ

Browse Source
This commit is contained in:
Todd C. Miller
2010-03-17 08:36:17 -04:00
parent a5d2775f73
commit f08479f19a
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/script.c
View File

@@ -77,6 +77,13 @@
#define TERM_CBREAK 1 #define TERM_CBREAK 1
#define TERM_RAW 2 #define TERM_RAW 2
#if !defined(TIOCGSIZE) && defined(TIOCGWINSZ)
# define TIOCGSIZE TIOCGWINSZ
# define TIOCSSIZE TIOCSWINSZ
# define ttysize winsize
# define ts_cols ws_col
#endif
struct script_buf { struct script_buf {
int len; /* buffer length (how much read in) */ int len; /* buffer length (how much read in) */
int off; /* write position (how much already consumed) */ int off; /* write position (how much already consumed) */
@@ -106,7 +113,7 @@ static int script_child(const char *path, char *argv[], char *envp[], int, int);
static void script_run(const char *path, char *argv[], char *envp[], int); static void script_run(const char *path, char *argv[], char *envp[], int);
static void sigchild(int s); static void sigchild(int s);
static void sigwinch(int s); static void sigwinch(int s);
static void sync_winsize(int src, int dst); static void sync_ttysize(int src, int dst);
static void deliver_signal(pid_t pid, int signo); static void deliver_signal(pid_t pid, int signo);
/* sudo.c */ /* sudo.c */
@@ -167,7 +174,7 @@ check_foreground(void)
if (foreground && !tty_initialized) { if (foreground && !tty_initialized) {
if (term_copy(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE], ttyout)) { if (term_copy(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE], ttyout)) {
tty_initialized = 1; tty_initialized = 1;
sync_winsize(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE]); sync_ttysize(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE]);
} }
} }
} }
@@ -380,7 +387,7 @@ script_execve(struct command_details *details, char *argv[], char *envp[],
/* Copy terminal attrs from user tty -> pty slave. */ /* Copy terminal attrs from user tty -> pty slave. */
if (term_copy(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE], ttyout)) { if (term_copy(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE], ttyout)) {
tty_initialized = 1; tty_initialized = 1;
sync_winsize(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE]); sync_ttysize(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE]);
} }
/* Start out in raw mode is stdout is a tty. */ /* Start out in raw mode is stdout is a tty. */
@@ -918,14 +925,14 @@ script_run(const char *path, char *argv[], char *envp[], int rbac_enabled)
} }
static void static void
sync_winsize(int src, int dst) sync_ttysize(int src, int dst)
{ {
#ifdef TIOCGWINSZ #ifdef TIOCGSIZE
struct winsize win; struct ttysize tsize;
pid_t pgrp; pid_t pgrp;
if (ioctl(src, TIOCGWINSZ, &win) == 0) { if (ioctl(src, TIOCGSIZE, &tsize) == 0) {
ioctl(dst, TIOCSWINSZ, &win); ioctl(dst, TIOCSSIZE, &tsize);
#ifdef TIOCGPGRP #ifdef TIOCGPGRP
if (ioctl(dst, TIOCGPGRP, &pgrp) == 0) if (ioctl(dst, TIOCGPGRP, &pgrp) == 0)
killpg(pgrp, SIGWINCH); killpg(pgrp, SIGWINCH);
@@ -978,6 +985,6 @@ sigwinch(int s)
{ {
int serrno = errno; int serrno = errno;
sync_winsize(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE]); sync_ttysize(script_fds[SFD_USERTTY], script_fds[SFD_SLAVE]);
errno = serrno; errno = serrno;
} }