summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-01-06 22:07:28 +0000
committerUlrich Drepper <drepper@redhat.com>1997-01-06 22:07:28 +0000
commitdf4ef2ab9c0899b2670067cd97e58f7eb2913e00 (patch)
tree4cb343b5ba9ccdc9c0b96144412567b6a4eda0ee /misc
parent6f9e7002f38ae778b3ff2f586a3e5766382228e9 (diff)
downloadglibc-df4ef2ab9c0899b2670067cd97e58f7eb2913e00.tar.gz
update from main archive 960105cvs/libc-970107cvs/libc-970106
Diffstat (limited to 'misc')
-rw-r--r--misc/Makefile4
-rw-r--r--misc/getpass.c31
-rw-r--r--misc/mntent_r.c31
-rw-r--r--misc/sys/select.h5
-rw-r--r--misc/sys/syscall.h1
5 files changed, 38 insertions, 34 deletions
diff --git a/misc/Makefile b/misc/Makefile
index 74e0a736e7..b789659eaa 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@ headers := sys/uio.h iovec.h sys/ioctl.h ioctls.h ioctl-types.h \
sys/mman.h sys/param.h fstab.h mntent.h search.h err.h error.h\
sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \
sys/select.h ustat.h sys/ustat.h ustatbits.h sys/sysinfo.h \
- regexp.h
+ regexp.h selectbits.h
routines := brk sbrk sstk ioctl \
readv writev \
diff --git a/misc/getpass.c b/misc/getpass.c
index 81c0f689de..74af9b5dc7 100644
--- a/misc/getpass.c
+++ b/misc/getpass.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1993,1994,1995,1996 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -34,8 +34,8 @@ getpass (prompt)
const char *prompt;
{
FILE *in, *out;
- struct termios t;
- int echo_off;
+ struct termios s, t;
+ int tty_changed;
static char *buf = NULL;
static size_t bufsize = 0;
ssize_t nread;
@@ -56,17 +56,16 @@ getpass (prompt)
if (tcgetattr (fileno (in), &t) == 0)
{
- if (t.c_lflag & ECHO)
- {
- t.c_lflag &= ~ECHO;
- echo_off = tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &t) == 0;
- t.c_lflag |= ECHO;
- }
- else
- echo_off = 0;
+ /* Save the old one. */
+ s = t;
+ /* Tricky, tricky. */
+ t.c_lflag &= ~(ECHO|ISIG|ICANON);
+ t.c_cc[VTIME] = 0;
+ t.c_cc[VMIN] = 1;
+ tty_changed = (tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &t) == 0);
}
else
- echo_off = 0;
+ tty_changed = 0;
/* Write the prompt. */
fputs (prompt, out);
@@ -81,14 +80,14 @@ getpass (prompt)
{
/* Remove the newline. */
buf[nread - 1] = '\0';
- if (echo_off)
+ if (tty_changed)
/* Write the newline that was not echoed. */
putc ('\n', out);
}
- /* Restore echoing. */
- if (echo_off)
- (void) tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &t);
+ /* Restore the original setting. */
+ if (tty_changed)
+ (void) tcsetattr (fileno (in), TCSAFLUSH|TCSASOFT, &s);
if (in != stdin)
/* We opened the terminal; now close it. */
diff --git a/misc/mntent_r.c b/misc/mntent_r.c
index 70da258de6..4dc0358f03 100644
--- a/misc/mntent_r.c
+++ b/misc/mntent_r.c
@@ -1,21 +1,21 @@
/* Utilities for reading/writing fstab, mtab, etc.
-Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
#include <mntent.h>
#include <stdio.h>
@@ -134,6 +134,9 @@ __hasmntopt (const struct mntent *mnt, const char *opt)
return p;
rest = strchr (rest, ',');
+ if (rest == NULL)
+ break;
+ ++rest;
}
return NULL;
diff --git a/misc/sys/select.h b/misc/sys/select.h
index 6a7e0213fb..2e102dd9fe 100644
--- a/misc/sys/select.h
+++ b/misc/sys/select.h
@@ -1,5 +1,5 @@
/* `fd_set' type and related macros, and `select'/`pselect' declarations.
- Copyright (C) 1996 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -27,6 +27,9 @@
/* Get definition of needed basic types. */
#include <gnu/types.h>
+/* Get __FD_* definitions. */
+#include <selectbits.h>
+
/* Get definition of timer specification structures. */
#define __need_timespec
#include <time.h>
diff --git a/misc/sys/syscall.h b/misc/sys/syscall.h
deleted file mode 100644
index 27ba3782e3..0000000000
--- a/misc/sys/syscall.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <syscall.h>