2
0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-03 15:55:40 +00:00

now use USE_TERMIO #define for sgi & hpux

This commit is contained in:
Todd C. Miller
1993-12-07 05:23:42 +00:00
parent 253d2da1cc
commit e3344ec4c5

View File

@@ -18,16 +18,30 @@
/* /*
* This version of getpass() is known to work under Ultrix 4.2/4.3, 4.3 BSD, * This version of getpass() is known to work under Ultrix 4.2/4.3, 4.3 BSD,
* HP-UX 8.07, AIX 3.1/3.2, and Iirix 4.05F. It should be easy to change it * HP-UX 8.07, AIX 3.1/3.2, and Irix 4.05F. It should be easy to change it
* to suit your tty interface. * to suit your tty interface. There's no support for POSIX termios here
* but it should be trivial to add.
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)getpass.c based on 5.3 (Berkeley) 9/22/88"; static char sccsid[] = "@(#)getpass.c based on 5.3 (Berkeley) 9/22/88";
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
/*
* HP-UX and Irix defines
*/
#if defined(sgi) || defined(hpux)
#ifndef USE_TERMIO
#define USE_TERMIO
#endif /* USE_TERMIO */
#endif /* sgi || hpux */
#include <fcntl.h> #include <fcntl.h>
#ifdef USE_TERMIO
#include <termio.h>
#else
#include <sgtty.h> #include <sgtty.h>
#endif
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/signal.h> #include <sys/signal.h>
#include <stdio.h> #include <stdio.h>
@@ -36,7 +50,7 @@ char *
getpass(prompt) getpass(prompt)
char *prompt; char *prompt;
{ {
#if defined(sgi) #ifdef USE_TERMIO
struct termio ttyb; struct termio ttyb;
#else #else
struct sgttyb ttyb; struct sgttyb ttyb;
@@ -46,7 +60,7 @@ char *
FILE *fp, *outfp; FILE *fp, *outfp;
long omask; long omask;
int fd_tmp; int fd_tmp;
#if defined(sgi) #ifdef USE_TERMIO
tcflag_t svflagval; tcflag_t svflagval;
#else #else
int svflagval; int svflagval;
@@ -63,7 +77,7 @@ char *
outfp = stderr; outfp = stderr;
fp = stdin; fp = stdin;
} }
#if defined(sgi) #ifdef USE_TERMIO
(void) ioctl(fileno(fp), TCGETA, &ttyb); (void) ioctl(fileno(fp), TCGETA, &ttyb);
svflagval = ttyb.c_lflag; svflagval = ttyb.c_lflag;
ttyb.c_lflag &= ~ECHO; ttyb.c_lflag &= ~ECHO;
@@ -78,9 +92,6 @@ char *
#endif #endif
(void) fprintf(outfp, "%s", prompt); (void) fprintf(outfp, "%s", prompt);
#ifdef hpux
(void) fflush(outfp);
#endif
rewind(outfp); /* implied flush */ rewind(outfp); /* implied flush */
for (p = buf; (ch = getc(fp)) != EOF && ch != '\n';) for (p = buf; (ch = getc(fp)) != EOF && ch != '\n';)
if (p < buf + PASSWD_LEN) if (p < buf + PASSWD_LEN)
@@ -88,7 +99,7 @@ char *
*p = '\0'; *p = '\0';
(void) write(fileno(outfp), "\n", 1); (void) write(fileno(outfp), "\n", 1);
#if defined(sgi) #ifdef USE_TERMIO
ttyb.c_lflag = svflagval; ttyb.c_lflag = svflagval;
(void) ioctl(fileno(fp), TCSETA, &ttyb); (void) ioctl(fileno(fp), TCSETA, &ttyb);
#else #else