mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
Update from gnulib.
This commit is contained in:
1 parent
e3985ae055
commit
e15cff65a2
1 file changed
+108
-17
+108
-17
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1992,93,94,95,96,97,98,99,2000, 2001 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1992-2001, 2003 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
@@ -19,11 +19,53 @@
|
||||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#if _LIBC
|
||||
# define HAVE_STDIO_EXT_H 1
|
||||
#endif
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#if HAVE_STDIO_EXT_H
|
||||
# include <stdio_ext.h>
|
||||
#else
|
||||
# define __fsetlocking(stream, type) /* empty */
|
||||
#endif
|
||||
#if !_LIBC
|
||||
# include "getline.h"
|
||||
#endif
|
||||
|
||||
#include <termios.h>
|
||||
#include <unistd.h>
|
||||
#include "getline.h"
|
||||
#include "unlocked-io.h"
|
||||
|
||||
#if _LIBC
|
||||
# include <wchar.h>
|
||||
#endif
|
||||
|
||||
#if _LIBC
|
||||
# define NOTCANCEL_MODE "c"
|
||||
#else
|
||||
# define NOTCANCEL_MODE
|
||||
#endif
|
||||
|
||||
#if _LIBC
|
||||
# define flockfile(s) _IO_flockfile (s)
|
||||
# define funlockfile(s) _IO_funlockfile (s)
|
||||
#else
|
||||
# include "unlocked-io.h"
|
||||
#endif
|
||||
|
||||
#if _LIBC
|
||||
# include <bits/libc-lock.h>
|
||||
#else
|
||||
# define __libc_cleanup_push(function, arg) /* empty */
|
||||
# define __libc_cleanup_pop(execute) /* empty */
|
||||
#endif
|
||||
|
||||
#if !_LIBC
|
||||
# define __getline getline
|
||||
# define __tcgetattr tcgetattr
|
||||
#endif
|
||||
|
||||
/* It is desirable to use this bit on systems that have it.
|
||||
The only bit of terminal state we want to twiddle is echoing, which is
|
||||
@@ -34,12 +76,20 @@
|
||||
# define TCSASOFT 0
|
||||
#endif
|
||||
|
||||
static void
|
||||
call_fclose (void *arg)
|
||||
{
|
||||
if (arg != NULL)
|
||||
fclose (arg);
|
||||
}
|
||||
|
||||
char *
|
||||
getpass (const char *prompt)
|
||||
{
|
||||
FILE *tty;
|
||||
FILE *in, *out;
|
||||
struct termios s, t;
|
||||
int tty_changed;
|
||||
bool tty_changed;
|
||||
static char *buf;
|
||||
static size_t bufsize;
|
||||
ssize_t nread;
|
||||
@@ -47,18 +97,29 @@ getpass (const char *prompt)
|
||||
/* Try to write to and read from the terminal if we can.
|
||||
If we can't open the terminal, use stderr and stdin. */
|
||||
|
||||
in = fopen ("/dev/tty", "w+");
|
||||
if (in == NULL)
|
||||
tty = fopen ("/dev/tty", "w+" NOTCANCEL_MODE);
|
||||
if (tty == NULL)
|
||||
{
|
||||
in = stdin;
|
||||
out = stderr;
|
||||
}
|
||||
else
|
||||
out = in;
|
||||
{
|
||||
/* We do the locking ourselves. */
|
||||
__fsetlocking (tty, FSETLOCKING_BYCALLER);
|
||||
|
||||
out = in = tty;
|
||||
}
|
||||
|
||||
/* Make sure the stream we opened is closed even if the thread is
|
||||
canceled. */
|
||||
__libc_cleanup_push (call_fclose, tty);
|
||||
|
||||
flockfile (out);
|
||||
|
||||
/* Turn echoing off if it is on now. */
|
||||
|
||||
if (tcgetattr (fileno (in), &t) == 0)
|
||||
if (__tcgetattr (fileno (in), &t) == 0)
|
||||
{
|
||||
/* Save the old one. */
|
||||
s = t;
|
||||
@@ -67,14 +128,35 @@ getpass (const char *prompt)
|
||||
tty_changed = (tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &t) == 0);
|
||||
}
|
||||
else
|
||||
tty_changed = 0;
|
||||
tty_changed = false;
|
||||
|
||||
/* Write the prompt. */
|
||||
fputs (prompt, out);
|
||||
fflush (out);
|
||||
#ifdef USE_IN_LIBIO
|
||||
if (_IO_fwide (out, 0) > 0)
|
||||
__fwprintf (out, L"%s", prompt);
|
||||
else
|
||||
#endif
|
||||
fputs_unlocked (prompt, out);
|
||||
fflush_unlocked (out);
|
||||
|
||||
/* Read the password. */
|
||||
nread = getline (&buf, &bufsize, in);
|
||||
nread = __getline (&buf, &bufsize, in);
|
||||
|
||||
#if !_LIBC
|
||||
/* As far as is known, glibc doesn't need this no-op fseek. */
|
||||
|
||||
/* According to the C standard, input may not be followed by output
|
||||
on the same stream without an intervening call to a file
|
||||
positioning function. Suppose in == out; then without this fseek
|
||||
call, on Solaris, HP-UX, AIX, OSF/1, the previous input gets
|
||||
echoed, whereas on IRIX, the following newline is not output as
|
||||
it should be. POSIX imposes similar restrictions if fileno (in)
|
||||
== fileno (out). The POSIX restrictions are tricky and change
|
||||
from POSIX version to POSIX version, so play it safe and invoke
|
||||
fseek even if in != out. */
|
||||
fseek (out, 0, SEEK_CUR);
|
||||
#endif
|
||||
|
||||
if (buf != NULL)
|
||||
{
|
||||
if (nread < 0)
|
||||
@@ -84,8 +166,15 @@ getpass (const char *prompt)
|
||||
/* Remove the newline. */
|
||||
buf[nread - 1] = '\0';
|
||||
if (tty_changed)
|
||||
/* Write the newline that was not echoed. */
|
||||
putc ('\n', out);
|
||||
{
|
||||
/* Write the newline that was not echoed. */
|
||||
#ifdef USE_IN_LIBIO
|
||||
if (_IO_fwide (out, 0) > 0)
|
||||
putwc_unlocked (L'\n', out);
|
||||
else
|
||||
#endif
|
||||
putc_unlocked ('\n', out);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,9 +182,11 @@ getpass (const char *prompt)
|
||||
if (tty_changed)
|
||||
(void) tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &s);
|
||||
|
||||
if (in != stdin)
|
||||
/* We opened the terminal; now close it. */
|
||||
fclose (in);
|
||||
funlockfile (out);
|
||||
|
||||
__libc_cleanup_pop (0);
|
||||
|
||||
call_fclose (tty);
|
||||
|
||||
return buf;
|
||||
}
|
||||
Reference in new issue
Block a user