diff options
author | ache <ache@FreeBSD.org> | 2006-03-27 22:47:12 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 2006-03-27 22:47:12 +0000 |
commit | 027bd1dc0a82d8aec04b232384f1e2905ebc5f73 (patch) | |
tree | 9d498e1f8ccecf6d278ce31776ae6c07e7d8dcac /contrib/libreadline/tilde.c | |
parent | 1f7d4ffc3ee3be256a7722ba250a9076f2ddbd0f (diff) | |
parent | 8aeb9782f4a5d98c23b918bdae2477810088d0d1 (diff) | |
download | FreeBSD-src-027bd1dc0a82d8aec04b232384f1e2905ebc5f73.zip FreeBSD-src-027bd1dc0a82d8aec04b232384f1e2905ebc5f73.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r157184,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/libreadline/tilde.c')
-rw-r--r-- | contrib/libreadline/tilde.c | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/contrib/libreadline/tilde.c b/contrib/libreadline/tilde.c index 154f7f8..d757f7a 100644 --- a/contrib/libreadline/tilde.c +++ b/contrib/libreadline/tilde.c @@ -43,7 +43,9 @@ #endif /* HAVE_STDLIB_H */ #include <sys/types.h> +#if defined (HAVE_PWD_H) #include <pwd.h> +#endif #include "tilde.h" @@ -54,8 +56,12 @@ static void *xmalloc (), *xrealloc (); #endif /* TEST || STATIC_MALLOC */ #if !defined (HAVE_GETPW_DECLS) +# if defined (HAVE_GETPWUID) extern struct passwd *getpwuid PARAMS((uid_t)); +# endif +# if defined (HAVE_GETPWNAM) extern struct passwd *getpwnam PARAMS((const char *)); +# endif #endif /* !HAVE_GETPW_DECLS */ #if !defined (savestring) @@ -277,6 +283,39 @@ isolate_tilde_prefix (fname, lenp) return ret; } +#if 0 +/* Public function to scan a string (FNAME) beginning with a tilde and find + the portion of the string that should be passed to the tilde expansion + function. Right now, it just calls tilde_find_suffix and allocates new + memory, but it can be expanded to do different things later. */ +char * +tilde_find_word (fname, flags, lenp) + const char *fname; + int flags, *lenp; +{ + int x; + char *r; + + x = tilde_find_suffix (fname); + if (x == 0) + { + r = savestring (fname); + if (lenp) + *lenp = 0; + } + else + { + r = (char *)xmalloc (1 + x); + strncpy (r, fname, x); + r[x] = '\0'; + if (lenp) + *lenp = x; + } + + return r; +} +#endif + /* Return a string that is PREFIX concatenated with SUFFIX starting at SUFFIND. */ static char * @@ -347,7 +386,11 @@ tilde_expand_word (filename) /* No preexpansion hook, or the preexpansion hook failed. Look in the password database. */ dirname = (char *)NULL; +#if defined (HAVE_GETPWNAM) user_entry = getpwnam (username); +#else + user_entry = 0; +#endif if (user_entry == 0) { /* If the calling program has a special syntax for expanding tildes, @@ -372,8 +415,9 @@ tilde_expand_word (filename) free (username); dirname = glue_prefix_and_suffix (user_entry->pw_dir, filename, user_len); } - +#if defined (HAVE_GETPWENT) endpwent (); +#endif return (dirname); } |