diff options
author | ache <ache@FreeBSD.org> | 2001-04-11 03:15:56 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 2001-04-11 03:15:56 +0000 |
commit | 4b3572c3842b5f249b9193357c9603c83ec98bb8 (patch) | |
tree | 72e6460a5db15b117a3312504ecdd7d00212baf1 /contrib/libreadline/shell.c | |
parent | 7891d143f55af69c2b2170c55883b90eb511edc8 (diff) | |
download | FreeBSD-src-4b3572c3842b5f249b9193357c9603c83ec98bb8.zip FreeBSD-src-4b3572c3842b5f249b9193357c9603c83ec98bb8.tar.gz |
Merge local changes
Diffstat (limited to 'contrib/libreadline/shell.c')
-rw-r--r-- | contrib/libreadline/shell.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/contrib/libreadline/shell.c b/contrib/libreadline/shell.c index 10571e3..bbf4603 100644 --- a/contrib/libreadline/shell.c +++ b/contrib/libreadline/shell.c @@ -50,11 +50,12 @@ #include <stdio.h> +#include "rlstdc.h" #include "rlshell.h" #include "xmalloc.h" #if !defined (HAVE_GETPW_DECLS) -extern struct passwd *getpwuid (); +extern struct passwd *getpwuid __P((uid_t)); #endif /* !HAVE_GETPW_DECLS */ #ifndef NULL @@ -66,7 +67,7 @@ extern struct passwd *getpwuid (); /* Does shell-like quoting using single quotes. */ char * -single_quote (string) +sh_single_quote (string) char *string; { register int c; @@ -97,7 +98,7 @@ single_quote (string) /* Set the environment variables LINES and COLUMNS to lines and cols, respectively. */ void -set_lines_and_columns (lines, cols) +sh_set_lines_and_columns (lines, cols) int lines, cols; { char *b; @@ -122,14 +123,14 @@ set_lines_and_columns (lines, cols) } char * -get_env_value (varname) - char *varname; +sh_get_env_value (varname) + const char *varname; { return ((char *)getenv (varname)); } char * -get_home_dir () +sh_get_home_dir () { char *home_dir; struct passwd *entry; @@ -148,7 +149,7 @@ get_home_dir () #endif int -unset_nodelay_mode (fd) +sh_unset_nodelay_mode (fd) int fd; { int flags, bflags; |