diff options
| author | ache <ache@FreeBSD.org> | 1997-11-06 01:00:03 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1997-11-06 01:00:03 +0000 |
| commit | d8926c95c3be457db98d447aac09cafab896739a (patch) | |
| tree | d819317a8283b33c90f631b0dc82b4ff905f5ec7 /contrib/libreadline/complete.c | |
| parent | 48d5f5c4e5389e95acfd5cf25aa5d3eb553682f3 (diff) | |
| download | FreeBSD-src-d8926c95c3be457db98d447aac09cafab896739a.zip FreeBSD-src-d8926c95c3be457db98d447aac09cafab896739a.tar.gz | |
Merge changes
Diffstat (limited to 'contrib/libreadline/complete.c')
| -rw-r--r-- | contrib/libreadline/complete.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/libreadline/complete.c b/contrib/libreadline/complete.c index 90bd870..552cb6c 100644 --- a/contrib/libreadline/complete.c +++ b/contrib/libreadline/complete.c @@ -796,7 +796,9 @@ make_quoted_replacement (match, mtype, qc) /* If there is a single match, see if we need to quote it. This also checks whether the common prefix of several matches needs to be quoted. */ - should_quote = rl_strpbrk (match, rl_filename_quote_characters) != 0; + should_quote = rl_filename_quote_characters + ? (rl_strpbrk (match, rl_filename_quote_characters) != 0) + : 0; do_replace = should_quote ? mtype : NO_MATCH; /* Quote the replacement, since we found an embedded @@ -1544,9 +1546,6 @@ rl_strpbrk (string1, string2) { register char *scan; - if (string2 == NULL) - return ((char *)NULL); - for (; *string1; string1++) { for (scan = string2; *scan; scan++) |
