diff options
Diffstat (limited to 'sh.file.c')
| -rw-r--r-- | sh.file.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sh.file.c b/sh.file.c index dff07ab0bdc14..408f15a67da77 100644 --- a/sh.file.c +++ b/sh.file.c @@ -1,4 +1,4 @@ -/* $Header: /p/tcsh/cvsroot/tcsh/sh.file.c,v 3.37 2010/02/09 20:21:49 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/sh.file.c,v 3.40 2016/04/16 14:08:14 christos Exp $ */ /* * sh.file.c: File completion for csh. This file is not used in tcsh. */ @@ -33,7 +33,7 @@ #include "sh.h" #include "ed.h" -RCSID("$tcsh: sh.file.c,v 3.37 2010/02/09 20:21:49 christos Exp $") +RCSID("$tcsh: sh.file.c,v 3.40 2016/04/16 14:08:14 christos Exp $") #if defined(FILEC) && defined(TIOCSTI) @@ -231,7 +231,7 @@ pushback(const Char *string) # ifdef POSIX (void) tcgetattr(SHOUT, &tty); # else - (void) ioctl(SHOUT, TCSETAW, (ioctl_t) &tty); + (void) ioctl(SHOUT, TCGETA, (ioctl_t) &tty); # endif /* POSIX */ tty_normal = tty; tty.c_lflag &= ~(ECHOKE | ECHO | ECHOE | ECHOK | ECHONL | @@ -249,7 +249,7 @@ pushback(const Char *string) char buf[MB_LEN_MAX]; size_t i, len; - len = one_wctomb(buf, *p & CHAR); + len = one_wctomb(buf, *p); for (i = 0; i < len; i++) (void) ioctl(SHOUT, TIOCSTI, (ioctl_t) &buf[i]); } @@ -564,7 +564,7 @@ again: /* search for matches */ } if (looking_for_lognames) { -#ifndef HAVE_GETPWENT +#ifdef HAVE_GETPWENT (void) endpwent(); #endif } else |