summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1994-07-02 05:08:39 +0000
committerRoland McGrath <roland@gnu.org>1994-07-02 05:08:39 +0000
commit90c3b6de6ac685fe1f7455f9cb7393d48d192a17 (patch)
tree8c3411bc9380d588cf4ed841b9000a761088e489
parent9ad01b32e1bca4323cfcea5a9b439ae8eeb42431 (diff)
entered into RCS
-rw-r--r--misc/getpass.c4
-rw-r--r--termios/sys/ttydefaults.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/misc/getpass.c b/misc/getpass.c
index fec5f4d726..ec535c1cca 100644
--- a/misc/getpass.c
+++ b/misc/getpass.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1993, 1994 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
@@ -78,7 +78,7 @@ getpass (prompt)
buf[0] = '\0';
else if (buf[nread - 1] == '\n')
/* Remove the newline. */
- buf[nread] = '\0';
+ buf[nread - 1] = '\0';
/* Restore echoing. */
if (echo_off)
diff --git a/termios/sys/ttydefaults.h b/termios/sys/ttydefaults.h
index 97a9dffe06..7a95e02890 100644
--- a/termios/sys/ttydefaults.h
+++ b/termios/sys/ttydefaults.h
@@ -84,8 +84,9 @@
#ifdef TTYDEFCHARS
cc_t ttydefchars[NCCS] = {
CEOF, CEOL, CEOL, CERASE, CWERASE, CKILL, CREPRINT,
- _POSIX_VDISABLE, CINTR, CQUIT, CSUSP, CDSUSP, CSTART, CSTOP, CLNEXT,
- CDISCARD, CMIN, CTIME, CSTATUS, _POSIX_VDISABLE
+ (cc_t) _POSIX_VDISABLE, CINTR, CQUIT, CSUSP, CDSUSP,
+ CSTART, CSTOP, CLNEXT, CDISCARD, CMIN, CTIME, CSTATUS,
+ (cc_t) _POSIX_VDISABLE
};
#undef TTYDEFCHARS
#endif /* TTYDEFCHARS */