#define READLINE_LIBRARY
#if defined (HAVE_CONFIG_H)
-# include "config.h"
+# include <config.h>
#endif
#include <stdio.h>
#include <sys/types.h>
#include <fcntl.h>
-#if !defined (NO_SYS_FILE)
-# include <sys/file.h>
-#endif /* !NO_SYS_FILE */
+#if defined (HAVE_SYS_FILE_H)
+#include <sys/file.h>
+#endif
#if defined (HAVE_UNISTD_H)
# include <unistd.h>
#endif /* HAVE_STDLIB_H */
#include <errno.h>
-/* Not all systems declare ERRNO in errno.h... and some systems #define it! */
#if !defined (errno)
extern int errno;
#endif /* !errno */
#include <pwd.h>
-#if defined (USG) && !defined (HAVE_GETPW_DECLS)
+#if !defined (HAVE_GETPW_DECLS)
extern struct passwd *getpwent ();
#endif /* USG && !HAVE_GETPW_DECLS */
# endif /* !__STDC__ */
#endif /* isc386 && _POSIX_SOURCE */
+#include "posixdir.h"
#include "posixstat.h"
/* System-specific feature definitions and include files. */
/* Some standard library routines. */
#include "readline.h"
-/* Possible values for do_replace in rl_complete_internal. */
-#define NO_MATCH 0
-#define SINGLE_MATCH 1
-#define MULT_MATCH 2
-
-#if !defined (strchr) && !defined (__STDC__)
-extern char *strchr (), *strrchr ();
-#endif /* !strchr && !__STDC__ */
-
extern char *tilde_expand ();
extern char *rl_copy_text ();
+extern void _rl_abort_internal ();
+extern int _rl_qsort_string_compare ();
extern Function *rl_last_func;
extern int rl_editing_mode;
extern int screenwidth;
+extern void _rl_move_vert ();
+extern int _rl_vis_botlin;
+extern int rl_display_fixed;
+
/* Forward declarations for functions defined and used in this file. */
char *filename_completion_function ();
char **completion_matches ();
-static int compare_strings ();
+static char *rl_quote_filename ();
static char *rl_strpbrk ();
-#if defined (STATIC_MALLOC)
-static char *xmalloc (), *xrealloc ();
-#else
+static char **remove_duplicate_matches ();
+static void insert_text ();
+static void insert_match ();
+static void append_to_match ();
+static void insert_all_matches ();
+static void display_matches ();
+static int compute_lcd_of_matches ();
+
extern char *xmalloc (), *xrealloc ();
-#endif /* STATIC_MALLOC */
-\f
+
/* If non-zero, then this is the address of a function to call when
completing on a directory name. The function is called with
the address of a string (the current directory name) as an arg. */
/* If non-zero, non-unique completions always show the list of matches. */
int _rl_complete_show_all = 0;
+/* If non-zero, completed directory names have a slash appended. */
+int _rl_complete_mark_directories = 1;
+
#if defined (VISIBLE_STATS)
# if !defined (X_OK)
# define X_OK 1
/* */
/* **************************************************************** */
+/* Local variable states what happened during the last completion attempt. */
+static int completion_changed_buffer;
+
/* Pointer to the generator function for completion_matches ().
NULL means to use filename_entry_function (), the default filename
completer. */
user-specified completion function has been called. */
int rl_attempted_completion_over = 0;
-/* Local variable states what happened during the last completion attempt. */
-static int completion_changed_buffer = 0;
-
-/* Complete the word at or before point. You have supplied the function
- that does the initial simple matching selection algorithm (see
- completion_matches ()). The default is to do filename completion. */
-
-rl_complete (ignore, invoking_key)
- int ignore, invoking_key;
-{
- if (rl_last_func == rl_complete && !completion_changed_buffer)
- return (rl_complete_internal ('?'));
- else if (_rl_complete_show_all)
- return (rl_complete_internal ('!'));
- else
- return (rl_complete_internal (TAB));
-}
-
-/* List the possible completions. See description of rl_complete (). */
-rl_possible_completions (ignore, invoking_key)
- int ignore, invoking_key;
-{
- return (rl_complete_internal ('?'));
-}
-
-rl_insert_completions (ignore, invoking_key)
- int ignore, invoking_key;
-{
- return (rl_complete_internal ('*'));
-}
-
-/* The user must press "y" or "n". Non-zero return means "y" pressed. */
-get_y_or_n ()
-{
- int c;
-
- for (;;)
- {
- c = rl_read_key ();
- if (c == 'y' || c == 'Y' || c == ' ')
- return (1);
- if (c == 'n' || c == 'N' || c == RUBOUT)
- return (0);
- if (c == ABORT_CHAR)
- rl_abort ();
- ding ();
- }
-}
+/* Set to a character indicating the type of completion being performed
+ by rl_complete_internal, available for use by application completion
+ functions. */
+int rl_completion_type = 0;
/* Up to this many items will be displayed in response to a
possible-completions call. After that, we ask the user if
in the shell, i.e. " \t\n\"\\'`@$><=" */
char *rl_basic_word_break_characters = " \t\n\"\\'`@$><=;|&{(";
+/* List of basic quoting characters. */
+char *rl_basic_quote_characters = "\"'";
+
/* The list of characters that signal a break between words for
rl_complete_internal. The default list is the contents of
rl_basic_word_break_characters. */
unless they also appear within this list. */
char *rl_completer_quote_characters = (char *)NULL;
+/* List of characters that should be quoted in filenames by the completer. */
+char *rl_filename_quote_characters = (char *)NULL;
+
/* List of characters that are word break characters, but should be left
in TEXT when it is passed to the completion function. The shell uses
this to help determine what kind of completing to do. */
/* Non-zero means that the results of the matches are to be quoted using
double quotes (or an application-specific quoting mechanism) if the
- filename contains any characters in rl_word_break_chars. This is
+ filename contains any characters in rl_filename_quote_chars. This is
ALWAYS non-zero on entry, and can only be changed within a completion
entry finder function. */
int rl_filename_quoting_desired = 1;
to implement FIGNORE a la SunOS csh. */
Function *rl_ignore_some_completions_function = (Function *)NULL;
-#if defined (SHELL)
-/* A function to strip quotes that are not protected by backquotes. It
- allows single quotes to appear within double quotes, and vice versa.
- It should be smarter. It's fairly shell-specific, hence the SHELL
- definition wrapper. */
-static char *
-_delete_quotes (text)
- char *text;
+/* Set to a function to quote a filename in an application-specific fashion.
+ Called with the text to quote, the type of match found (single or multiple)
+ and a pointer to the quoting character to be used, which the function can
+ reset if desired. */
+CPFunction *rl_filename_quoting_function = rl_quote_filename;
+
+/* Function to call to remove quoting characters from a filename. Called
+ before completion is attempted, so the embedded quotes do not interfere
+ with matching names in the file system. Readline doesn't do anything
+ with this; it's set only by applications. */
+CPFunction *rl_filename_dequoting_function = (CPFunction *)NULL;
+
+/* Function to call to decide whether or not a word break character is
+ quoted. If a character is quoted, it does not break words for the
+ completer. */
+Function *rl_char_is_quoted_p = (Function *)NULL;
+
+/* Character appended to completed words when at the end of the line. The
+ default is a space. */
+int rl_completion_append_character = ' ';
+
+/* If non-zero, inhibit completion (temporarily). */
+int rl_inhibit_completion;
+
+/* Complete the word at or before point. You have supplied the function
+ that does the initial simple matching selection algorithm (see
+ completion_matches ()). The default is to do filename completion. */
+int
+rl_complete (ignore, invoking_key)
+ int ignore, invoking_key;
+{
+ if (rl_inhibit_completion)
+ return (rl_insert (ignore, invoking_key));
+ else if (rl_last_func == rl_complete && !completion_changed_buffer)
+ return (rl_complete_internal ('?'));
+ else if (_rl_complete_show_all)
+ return (rl_complete_internal ('!'));
+ else
+ return (rl_complete_internal (TAB));
+}
+
+/* List the possible completions. See description of rl_complete (). */
+int
+rl_possible_completions (ignore, invoking_key)
+ int ignore, invoking_key;
+{
+ return (rl_complete_internal ('?'));
+}
+
+int
+rl_insert_completions (ignore, invoking_key)
+ int ignore, invoking_key;
{
- char *ret, *p, *r;
- int l, quoted;
+ return (rl_complete_internal ('*'));
+}
- l = strlen (text);
- ret = xmalloc (l + 1);
- for (quoted = 0, p = text, r = ret; p && *p; p++)
+/* The user must press "y" or "n". Non-zero return means "y" pressed. */
+static int
+get_y_or_n ()
+{
+ int c;
+
+ for (;;)
{
- /* Allow backslash-quoted characters to pass through unscathed. */
- if (*p == '\\')
- continue;
- /* Close quote. */
- if (quoted && *p == quoted)
- {
- quoted = 0;
- continue;
- }
- /* Open quote. */
- if (quoted == 0 && (*p == '\'' || *p == '"'))
- {
- quoted = *p;
- continue;
- }
- *r++ = *p;
+ c = rl_read_key ();
+ if (c == 'y' || c == 'Y' || c == ' ')
+ return (1);
+ if (c == 'n' || c == 'N' || c == RUBOUT)
+ return (0);
+ if (c == ABORT_CHAR)
+ _rl_abort_internal ();
+ ding ();
}
- *r = '\0';
- return ret;
}
-#endif /* SHELL */
/* Return the portion of PATHNAME that should be output when listing
possible completions. If we are hacking filename completion, we
printable_part (pathname)
char *pathname;
{
- char *temp = (char *)NULL;
-
- if (rl_filename_completion_desired)
- temp = strrchr (pathname, '/');
+ char *temp;
- if (!temp)
- return (pathname);
- else
- return (++temp);
+ temp = rl_filename_completion_desired ? strrchr (pathname, '/') : (char *)NULL;
+ return (temp ? ++temp : pathname);
}
/* Output TO_PRINT to rl_outstream. If VISIBLE_STATS is defined and we
are using it, check for and output a single character for `special'
filenames. Return 1 if we printed an extension character, 0 if not. */
+
#define PUTX(c) \
if (CTRL_CHAR (c)) \
{ \
putc (UNCTRL (c), rl_outstream); \
} \
else if (c == RUBOUT) \
- { \
- putc ('^', rl_outstream); \
- putc ('?', rl_outstream); \
- } \
+ { \
+ putc ('^', rl_outstream); \
+ putc ('?', rl_outstream); \
+ } \
else \
- putc (c, rl_outstream)
+ putc (c, rl_outstream)
static int
print_filename (to_print, full_pathname)
return 0;
#else
char *s, c, *new_full_pathname;
- int extension_char = 0, slen, tlen;
+ int extension_char, slen, tlen;
for (s = to_print; *s; s++)
{
PUTX (*s);
- }
+ }
- if (rl_filename_completion_desired && rl_visible_stats)
+ if (rl_filename_completion_desired && rl_visible_stats)
{
/* If to_print != full_pathname, to_print is the basename of the
path passed. In this case, we try to expand the directory
#endif /* VISIBLE_STATS */
}
-/* Complete the word at or before point.
- WHAT_TO_DO says what to do with the completion.
- `?' means list the possible completions.
- TAB means do standard completion.
- `*' means insert all of the possible completions.
- `!' means to do standard completion, and list all possible completions if
- there is more than one. */
-rl_complete_internal (what_to_do)
- int what_to_do;
+static char *
+rl_quote_filename (s, rtype, qcp)
+ char *s;
+ int rtype;
+ char *qcp;
{
- char **matches;
- Function *our_func;
- int start, scan, end, delimiter = 0, pass_next;
- char *text, *saved_line_buffer;
- char *replacement;
- char quote_char = '\0';
- int found_quote = 0;
-
- if (rl_line_buffer)
- saved_line_buffer = savestring (rl_line_buffer);
- else
- saved_line_buffer = (char *)NULL;
-
- if (rl_completion_entry_function)
- our_func = rl_completion_entry_function;
- else
- our_func = (Function *)filename_completion_function;
+ char *r;
+
+ r = xmalloc (strlen (s) + 2);
+ *r = *rl_completer_quote_characters;
+ strcpy (r + 1, s);
+ if (qcp)
+ *qcp = *rl_completer_quote_characters;
+ return r;
+}
- /* Only the completion entry function can change these. */
- rl_filename_completion_desired = 0;
- rl_filename_quoting_desired = 1;
+/* Find the bounds of the current word for completion purposes, and leave
+ rl_point set to the end of the word. This function skips quoted
+ substrings (characters between matched pairs of characters in
+ rl_completer_quote_characters. First we try to find an unclosed
+ quoted substring on which to do matching. If one is not found, we use
+ the word break characters to find the boundaries of the current word.
+ We call an application-specific function to decide whether or not a
+ particular word break character is quoted; if that function returns a
+ non-zero result, the character does not break a word. This function
+ returns the opening quote character if we found an unclosed quoted
+ substring, '\0' otherwise. FP, if non-null, is set to a value saying
+ which (shell-like) quote characters we found (single quote, double
+ quote, or backslash) anywhere in the string. DP, if non-null, is set to
+ the value of the delimiter character that caused a word break. */
+
+static char
+find_completion_word (fp, dp)
+ int *fp, *dp;
+{
+ int scan, end, found_quote, delimiter, pass_next, isbrk;
+ char quote_char;
- /* We now look backwards for the start of a filename/variable word. */
end = rl_point;
+ found_quote = delimiter = 0;
+ quote_char = '\0';
- if (rl_point)
+ if (rl_completer_quote_characters)
{
- if (rl_completer_quote_characters)
+ /* We have a list of characters which can be used in pairs to
+ quote substrings for the completer. Try to find the start
+ of an unclosed quoted substring. */
+ /* FOUND_QUOTE is set so we know what kind of quotes we found. */
+ for (scan = pass_next = 0; scan < end; scan++)
{
- /* We have a list of characters which can be used in pairs to
- quote substrings for the completer. Try to find the start
- of an unclosed quoted substring. */
- /* FOUND_QUOTE is set so we know what kind of quotes we found. */
- for (scan = pass_next = 0; scan < end; scan++)
+ if (pass_next)
{
- if (pass_next)
- {
- pass_next = 0;
- continue;
- }
+ pass_next = 0;
+ continue;
+ }
- if (rl_line_buffer[scan] == '\\')
- {
- pass_next = 1;
- found_quote |= 4;
- continue;
- }
+ if (rl_line_buffer[scan] == '\\')
+ {
+ pass_next = 1;
+ found_quote |= RL_QF_BACKSLASH;
+ continue;
+ }
- if (quote_char != '\0')
- {
- /* Ignore everything until the matching close quote char. */
- if (rl_line_buffer[scan] == quote_char)
- {
- /* Found matching close. Abandon this substring. */
- quote_char = '\0';
- rl_point = end;
- }
- }
- else if (strchr (rl_completer_quote_characters, rl_line_buffer[scan]))
+ if (quote_char != '\0')
+ {
+ /* Ignore everything until the matching close quote char. */
+ if (rl_line_buffer[scan] == quote_char)
{
- /* Found start of a quoted substring. */
- quote_char = rl_line_buffer[scan];
- rl_point = scan + 1;
- /* Shell-like quoting conventions. */
- if (quote_char == '\'')
- found_quote |= 1;
- else if (quote_char == '"')
- found_quote |= 2;
+ /* Found matching close. Abandon this substring. */
+ quote_char = '\0';
+ rl_point = end;
}
}
+ else if (strchr (rl_completer_quote_characters, rl_line_buffer[scan]))
+ {
+ /* Found start of a quoted substring. */
+ quote_char = rl_line_buffer[scan];
+ rl_point = scan + 1;
+ /* Shell-like quoting conventions. */
+ if (quote_char == '\'')
+ found_quote |= RL_QF_SINGLE_QUOTE;
+ else if (quote_char == '"')
+ found_quote |= RL_QF_DOUBLE_QUOTE;
+ }
}
+ }
- if (rl_point == end && quote_char == '\0')
+ if (rl_point == end && quote_char == '\0')
+ {
+ /* We didn't find an unclosed quoted substring upon which to do
+ completion, so use the word break characters to find the
+ substring on which to complete. */
+ while (--rl_point)
{
- int quoted = 0;
- /* We didn't find an unclosed quoted substring upon which to do
- completion, so use the word break characters to find the
- substring on which to complete. */
- while (--rl_point)
- {
- scan = rl_line_buffer[rl_point];
+ scan = rl_line_buffer[rl_point];
- if (strchr (rl_completer_word_break_characters, scan) == 0)
- continue;
+ if (strchr (rl_completer_word_break_characters, scan) == 0)
+ continue;
-#if defined (SHELL)
- /* Don't let word break characters in quoted substrings break
- words for the completer. */
- if (found_quote && char_is_quoted (rl_line_buffer, rl_point))
- continue;
-#endif /* SHELL */
-
- /* Convoluted code, but it avoids an n^2 algorithm with calls
- to char_is_quoted. */
- break;
- }
- }
+ /* Call the application-specific function to tell us whether
+ this word break character is quoted and should be skipped. */
+ if (rl_char_is_quoted_p && found_quote &&
+ (*rl_char_is_quoted_p) (rl_line_buffer, rl_point))
+ continue;
- /* If we are at an unquoted word break, then advance past it. */
- scan = rl_line_buffer[rl_point];
-#if defined (SHELL)
- if ((found_quote == 0 || char_is_quoted (rl_line_buffer, rl_point) == 0) &&
- strchr (rl_completer_word_break_characters, scan))
-#else
- if (strchr (rl_completer_word_break_characters, scan))
-#endif
- {
- /* If the character that caused the word break was a quoting
- character, then remember it as the delimiter. */
- if (strchr ("\"'", scan) && (end - rl_point) > 1)
- delimiter = scan;
-
- /* If the character isn't needed to determine something special
- about what kind of completion to perform, then advance past it. */
- if (!rl_special_prefixes || strchr (rl_special_prefixes, scan) == 0)
- rl_point++;
+ /* Convoluted code, but it avoids an n^2 algorithm with calls
+ to char_is_quoted. */
+ break;
}
}
- /* At this point, we know we have an open quote if quote_char != '\0'. */
- start = rl_point;
- rl_point = end;
- text = rl_copy_text (start, end);
+ /* If we are at an unquoted word break, then advance past it. */
+ scan = rl_line_buffer[rl_point];
+
+ /* If there is an application-specific function to say whether or not
+ a character is quoted and we found a quote character, let that
+ function decide whether or not a character is a word break, even
+ if it is found in rl_completer_word_break_characters. */
+ if (rl_char_is_quoted_p)
+ isbrk = (found_quote == 0 ||
+ (*rl_char_is_quoted_p) (rl_line_buffer, rl_point) == 0) &&
+ strchr (rl_completer_word_break_characters, scan) != 0;
+ else
+ isbrk = strchr (rl_completer_word_break_characters, scan) != 0;
+
+ if (isbrk)
+ {
+ /* If the character that caused the word break was a quoting
+ character, then remember it as the delimiter. */
+ if (rl_basic_quote_characters && strchr (rl_basic_quote_characters, scan) && (end - rl_point) > 1)
+ delimiter = scan;
+
+ /* If the character isn't needed to determine something special
+ about what kind of completion to perform, then advance past it. */
+ if (rl_special_prefixes == 0 || strchr (rl_special_prefixes, scan) == 0)
+ rl_point++;
+ }
+
+ if (fp)
+ *fp = found_quote;
+ if (dp)
+ *dp = delimiter;
+
+ return (quote_char);
+}
+
+static char **
+gen_completion_matches (text, start, end, our_func, found_quote, quote_char)
+ char *text;
+ int start, end;
+ Function *our_func;
+ int found_quote, quote_char;
+{
+ char **matches, *temp;
/* If the user wants to TRY to complete, but then wants to give
up and use the default completion function, they set the
if (matches || rl_attempted_completion_over)
{
rl_attempted_completion_over = 0;
- our_func = (Function *)NULL;
- goto after_usual_completion;
+ return (matches);
}
}
-#if defined (SHELL)
/* Beware -- we're stripping the quotes here. Do this only if we know
- we are doing filename completion. */
- if (found_quote && our_func == (Function *)filename_completion_function)
+ we are doing filename completion and the application has defined a
+ filename dequoting function. */
+ temp = (char *)NULL;
+ if (found_quote && our_func == (Function *)filename_completion_function &&
+ rl_filename_dequoting_function)
{
/* delete single and double quotes */
- replacement = _delete_quotes (text);
- free (text);
- text = replacement;
- replacement = (char *)0;
+ temp = (*rl_filename_dequoting_function) (text, quote_char);
+ text = temp; /* not freeing text is not a memory leak */
}
-#endif /* SHELL */
matches = completion_matches (text, our_func);
+ FREE (temp);
+ return matches;
+}
- after_usual_completion:
- free (text);
+/* Filter out duplicates in MATCHES. This frees up the strings in
+ MATCHES. */
+static char **
+remove_duplicate_matches (matches)
+ char **matches;
+{
+ char *lowest_common;
+ int i, j, newlen;
+ char dead_slot;
+ char **temp_array;
- if (!matches)
- ding ();
- else
- {
- register int i;
- int should_quote;
+ /* Sort the items. */
+ for (i = 0; matches[i]; i++)
+ ;
+
+ /* Sort the array without matches[0], since we need it to
+ stay in place no matter what. */
+ if (i)
+ qsort (matches+1, i-1, sizeof (char *), _rl_qsort_string_compare);
+
+ /* Remember the lowest common denominator for it may be unique. */
+ lowest_common = savestring (matches[0]);
- /* It seems to me that in all the cases we handle we would like
- to ignore duplicate possiblilities. Scan for the text to
- insert being identical to the other completions. */
- if (rl_ignore_completion_duplicates)
+ for (i = newlen = 0; matches[i + 1]; i++)
+ {
+ if (strcmp (matches[i], matches[i + 1]) == 0)
{
- char *lowest_common;
- int j, newlen = 0;
- char dead_slot;
- char **temp_array;
-
- /* Sort the items. */
- /* It is safe to sort this array, because the lowest common
- denominator found in matches[0] will remain in place. */
- for (i = 0; matches[i]; i++)
- ;
- /* Try sorting the array without matches[0], since we need it to
- stay in place no matter what. */
- if (i)
- qsort (matches+1, i-1, sizeof (char *), compare_strings);
+ free (matches[i]);
+ matches[i] = (char *)&dead_slot;
+ }
+ else
+ newlen++;
+ }
- /* Remember the lowest common denominator for it may be unique. */
- lowest_common = savestring (matches[0]);
+ /* We have marked all the dead slots with (char *)&dead_slot.
+ Copy all the non-dead entries into a new array. */
+ temp_array = (char **)xmalloc ((3 + newlen) * sizeof (char *));
+ for (i = j = 1; matches[i]; i++)
+ {
+ if (matches[i] != (char *)&dead_slot)
+ temp_array[j++] = matches[i];
+ }
+ temp_array[j] = (char *)NULL;
- for (i = 0; matches[i + 1]; i++)
- {
- if (strcmp (matches[i], matches[i + 1]) == 0)
- {
- free (matches[i]);
- matches[i] = (char *)&dead_slot;
- }
- else
- newlen++;
- }
+ if (matches[0] != (char *)&dead_slot)
+ free (matches[0]);
- /* We have marked all the dead slots with (char *)&dead_slot.
- Copy all the non-dead entries into a new array. */
- temp_array = (char **)xmalloc ((3 + newlen) * sizeof (char *));
- for (i = j = 1; matches[i]; i++)
- {
- if (matches[i] != (char *)&dead_slot)
- temp_array[j++] = matches[i];
- }
- temp_array[j] = (char *)NULL;
+ /* Place the lowest common denominator back in [0]. */
+ temp_array[0] = lowest_common;
+
+ /* If there is one string left, and it is identical to the
+ lowest common denominator, then the LCD is the string to
+ insert. */
+ if (j == 2 && strcmp (temp_array[0], temp_array[1]) == 0)
+ {
+ free (temp_array[1]);
+ temp_array[1] = (char *)NULL;
+ }
+ return (temp_array);
+}
- if (matches[0] != (char *)&dead_slot)
- free (matches[0]);
- free (matches);
+static void
+display_matches (matches)
+ char **matches;
+{
+ int len, count, limit, max, printed_len;
+ int i, j, k, l;
+ char *temp;
- matches = temp_array;
+ /* Move to the last visible line of a possibly-multiple-line command. */
+ _rl_move_vert (_rl_vis_botlin);
- /* Place the lowest common denominator back in [0]. */
- matches[0] = lowest_common;
+ /* Handle simple case first. What if there is only one answer? */
+ if (matches[1] == 0)
+ {
+ temp = printable_part (matches[0]);
+ crlf ();
+ print_filename (temp, matches[0]);
+ crlf ();
+#if 0
+ rl_on_new_line ();
+#else
+ rl_forced_update_display ();
+ rl_display_fixed = 1;
+#endif
+ return;
+ }
- /* If there is one string left, and it is identical to the
- lowest common denominator, then the LCD is the string to
- insert. */
- if (j == 2 && strcmp (matches[0], matches[1]) == 0)
- {
- free (matches[1]);
- matches[1] = (char *)NULL;
- }
+ /* There is more than one answer. Find out how many there are,
+ and find the maximum printed length of a single entry. */
+ for (max = 0, i = 1; matches[i]; i++)
+ {
+ temp = printable_part (matches[i]);
+ len = strlen (temp);
+
+ if (len > max)
+ max = len;
+ }
+
+ len = i - 1;
+
+ /* If there are many items, then ask the user if she really wants to
+ see them all. */
+ if (len >= rl_completion_query_items)
+ {
+ crlf ();
+ fprintf (rl_outstream, "Display all %d possibilities? (y or n)", len);
+ fflush (rl_outstream);
+ if (get_y_or_n () == 0)
+ {
+ crlf ();
+#if 0
+ rl_on_new_line ();
+#else
+ rl_forced_update_display ();
+ rl_display_fixed = 1;
+#endif
+ return;
}
+ }
+
+ /* How many items of MAX length can we fit in the screen window? */
+ max += 2;
+ limit = screenwidth / max;
+ if (limit != 1 && (limit * max == screenwidth))
+ limit--;
+
+ /* Avoid a possible floating exception. If max > screenwidth,
+ limit will be 0 and a divide-by-zero fault will result. */
+ if (limit == 0)
+ limit = 1;
+
+ /* How many iterations of the printing loop? */
+ count = (len + (limit - 1)) / limit;
- switch (what_to_do)
+ /* Watch out for special case. If LEN is less than LIMIT, then
+ just do the inner printing loop.
+ 0 < len <= limit implies count = 1. */
+
+ /* Sort the items if they are not already sorted. */
+ if (rl_ignore_completion_duplicates == 0)
+ qsort (matches + 1, len, sizeof (char *), _rl_qsort_string_compare);
+
+ /* Print the sorted items, up-and-down alphabetically, like ls. */
+ crlf ();
+
+ for (i = 1; i <= count; i++)
+ {
+ for (j = 0, l = i; j < limit; j++)
{
- case TAB:
- case '!':
- /* If we are matching filenames, then here is our chance to
- do clever processing by re-examining the list. Call the
- ignore function with the array as a parameter. It can
- munge the array, deleting matches as it desires. */
- if (rl_ignore_some_completions_function &&
- our_func == (Function *)filename_completion_function)
+ if (l > len || matches[l] == 0)
+ break;
+ else
{
- (void)(*rl_ignore_some_completions_function)(matches);
- if (matches == 0 || matches[0] == 0)
- {
- if (matches)
- free (matches);
- ding ();
- return;
- }
+ temp = printable_part (matches[l]);
+ printed_len = strlen (temp) + print_filename (temp, matches[l]);
+
+ if (j + 1 < limit)
+ for (k = 0; k < max - printed_len; k++)
+ putc (' ', rl_outstream);
}
+ l += count;
+ }
+ crlf ();
+ }
- /* If we are doing completion on quoted substrings, and any matches
- contain any of the completer_word_break_characters, then auto-
- matically prepend the substring with a quote character (just pick
- the first one from the list of such) if it does not already begin
- with a quote string. FIXME: Need to remove any such automatically
- inserted quote character when it no longer is necessary, such as
- if we change the string we are completing on and the new set of
- matches don't require a quoted substring. */
- replacement = matches[0];
-
- should_quote = matches[0] && rl_completer_quote_characters &&
- rl_filename_completion_desired &&
- rl_filename_quoting_desired;
-
- if (should_quote)
-#if defined (SHELL)
- should_quote = should_quote && (!quote_char || quote_char == '"');
+#if 0
+ rl_on_new_line ();
#else
- should_quote = should_quote && !quote_char;
+ rl_forced_update_display ();
+ rl_display_fixed = 1;
#endif
+}
- if (should_quote)
- {
- int do_replace;
-
- do_replace = NO_MATCH;
+static void
+insert_text (text, start, end)
+ char *text;
+ int start, end;
+{
+ rl_begin_undo_group ();
+ rl_delete_text (start, end + 1);
+ rl_point = start;
+ rl_insert_text (text);
+ rl_end_undo_group ();
+}
- /* 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. If the common prefix should
- not be checked, add !matches[1] to the if clause. */
- should_quote = rl_strpbrk (matches[0], rl_completer_word_break_characters) != 0;
+static char *
+make_quoted_replacement (match, mtype, quote_char)
+ char *match;
+ int mtype, quote_char;
+{
+ int should_quote, do_replace;
+ char *replacement, qc;
+
+ /* If we are doing completion on quoted substrings, and any matches
+ contain any of the completer_word_break_characters, then auto-
+ matically prepend the substring with a quote character (just pick
+ the first one from the list of such) if it does not already begin
+ with a quote string. FIXME: Need to remove any such automatically
+ inserted quote character when it no longer is necessary, such as
+ if we change the string we are completing on and the new set of
+ matches don't require a quoted substring. */
+ replacement = match;
+
+ should_quote = match && rl_completer_quote_characters &&
+ rl_filename_completion_desired &&
+ rl_filename_quoting_desired;
+
+ if (should_quote)
#if defined (SHELL)
- should_quote = should_quote || rl_strpbrk (matches[0], "#$`?*[!") != 0;
+ should_quote = should_quote && (!quote_char || quote_char == '"' || quote_char == '\'');
+#else
+ should_quote = should_quote && !quote_char;
#endif
- if (should_quote)
- do_replace = matches[1] ? MULT_MATCH : SINGLE_MATCH;
-
- if (do_replace != NO_MATCH)
- {
-#if defined (SHELL)
- /* Quote the replacement, since we found an
- embedded word break character in a potential
- match. */
- char *rtext, *mtext;
- int rlen;
- extern char *double_quote (); /* in builtins/common.c */
-
- /* If DO_REPLACE == MULT_MATCH, it means that there is
- more than one match. In this case, we do not add
- the closing quote or attempt to perform tilde
- expansion. If DO_REPLACE == SINGLE_MATCH, we try
- to perform tilde expansion, because double quotes
- inhibit tilde expansion by the shell. */
-
- mtext = matches[0];
- if (mtext[0] == '~' && do_replace == SINGLE_MATCH)
- mtext = tilde_expand (matches[0]);
- rtext = double_quote (mtext);
- if (mtext != matches[0])
- free (mtext);
-
- rlen = strlen (rtext);
- replacement = xmalloc (rlen + 1);
- /* If we're completing on a quoted string where the user
- has already supplied the opening quote, we don't want
- the quote in the replacement text, and we reset
- QUOTE_CHAR to 0 to avoid an extra closing quote. */
- if (quote_char == '"')
- {
- strcpy (replacement, rtext + 1);
- rlen--;
- quote_char = 0;
- }
- else
- strcpy (replacement, rtext);
- if (do_replace == MULT_MATCH)
- replacement[rlen - 1] = '\0';
- free (rtext);
-#else /* !SHELL */
- /* Found an embedded word break character in a potential
- match, so we need to prepend a quote character if we
- are replacing the completion string. */
- replacement = xmalloc (strlen (matches[0]) + 2);
- quote_char = *rl_completer_quote_characters;
- *replacement = quote_char;
- strcpy (replacement + 1, matches[0]);
-#endif /* SHELL */
- }
- }
+ if (should_quote)
+ {
+ /* 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;
- if (replacement)
+ do_replace = should_quote ? mtype : NO_MATCH;
+ if (do_replace != NO_MATCH)
+ {
+ /* Quote the replacement, since we found an embedded
+ word break character in a potential match. */
+ if (rl_filename_quoting_function)
{
- rl_begin_undo_group ();
- rl_delete_text (start, rl_point);
- rl_point = start;
- rl_insert_text (replacement);
- rl_end_undo_group ();
- if (replacement != matches[0])
- free (replacement);
+ qc = quote_char; /* must pass a (char *) to quoting function */
+ replacement = (*rl_filename_quoting_function)
+ (match, do_replace, &qc);
+ quote_char = qc;
}
+ }
+ }
+ return (replacement);
+}
- /* If there are more matches, ring the bell to indicate.
- If this was the only match, and we are hacking files,
- check the file to see if it was a directory. If so,
- add a '/' to the name. If not, and we are at the end
- of the line, then add a space. */
- if (matches[1])
- {
- if (what_to_do == '!')
- goto display_matches; /* XXX */
- else if (rl_editing_mode != vi_mode)
- ding (); /* There are other matches remaining. */
- }
- else
- {
- char temp_string[4];
- int temp_string_index = 0;
+static void
+insert_match (match, start, mtype, quote_char)
+ char *match;
+ int start, mtype, quote_char;
+{
+ char *replacement;
- if (quote_char)
- temp_string[temp_string_index++] = quote_char;
+ replacement = make_quoted_replacement (match, mtype, quote_char);
- temp_string[temp_string_index++] = delimiter ? delimiter : ' ';
- temp_string[temp_string_index++] = '\0';
+ /* Now insert the match. */
+ if (replacement)
+ {
+ /* Don't double an opening quote character. */
+ if (quote_char && start && rl_line_buffer[start - 1] == quote_char &&
+ replacement[0] == quote_char)
+ start--;
+ insert_text (replacement, start, rl_point - 1);
+ if (replacement != match)
+ free (replacement);
+ }
+}
- if (rl_filename_completion_desired)
- {
- struct stat finfo;
- char *filename = tilde_expand (matches[0]);
-
- if ((stat (filename, &finfo) == 0) && S_ISDIR (finfo.st_mode))
- {
- if (rl_line_buffer[rl_point] != '/')
- rl_insert_text ("/");
- }
- else
- {
- if (rl_point == rl_end)
- rl_insert_text (temp_string);
- }
- free (filename);
- }
- else
- {
- if (rl_point == rl_end)
- rl_insert_text (temp_string);
- }
- }
- break;
+/* Append any necessary closing quote and a separator character to the
+ just-inserted match. If the user has specified that directories
+ should be marked by a trailing `/', append one of those instead. The
+ default trailing character */
+static void
+append_to_match (text, delimiter, quote_char)
+ char *text;
+ int delimiter, quote_char;
+{
+ char temp_string[4], *filename;
+ int temp_string_index;
+ struct stat finfo;
- case '*':
- {
- int i = 1;
-
- rl_begin_undo_group ();
- rl_delete_text (start, rl_point);
- rl_point = start;
- if (matches[1])
- {
- while (matches[i])
- {
- rl_insert_text (matches[i++]);
- rl_insert_text (" ");
- }
- }
- else
- {
- rl_insert_text (matches[0]);
- rl_insert_text (" ");
- }
- rl_end_undo_group ();
- }
- break;
+ temp_string_index = 0;
+ if (quote_char && rl_point && rl_line_buffer[rl_point - 1] != quote_char)
+ temp_string[temp_string_index++] = quote_char;
- case '?':
- {
- int len, count, limit, max;
- int j, k, l;
-
- /* Handle simple case first. What if there is only one answer? */
- if (!matches[1])
- {
- char *temp;
-
- temp = printable_part (matches[0]);
- crlf ();
- print_filename (temp, matches[0]);
- crlf ();
- goto restart;
- }
-
- /* There is more than one answer. Find out how many there are,
- and find out what the maximum printed length of a single entry
- is. */
- display_matches:
- for (max = 0, i = 1; matches[i]; i++)
- {
- char *temp;
- int name_length;
-
- temp = printable_part (matches[i]);
- name_length = strlen (temp);
-
- if (name_length > max)
- max = name_length;
- }
-
- len = i - 1;
-
- /* If there are many items, then ask the user if she
- really wants to see them all. */
- if (len >= rl_completion_query_items)
- {
- crlf ();
- fprintf (rl_outstream,
- "There are %d possibilities. Do you really", len);
- crlf ();
- fprintf (rl_outstream, "wish to see them all? (y or n)");
- fflush (rl_outstream);
- if (!get_y_or_n ())
- {
- crlf ();
- goto restart;
- }
- }
-
- /* How many items of MAX length can we fit in the screen window? */
- max += 2;
- limit = screenwidth / max;
- if (limit != 1 && (limit * max == screenwidth))
- limit--;
-
- /* Avoid a possible floating exception. If max > screenwidth,
- limit will be 0 and a divide-by-zero fault will result. */
- if (limit == 0)
- limit = 1;
-
- /* How many iterations of the printing loop? */
- count = (len + (limit - 1)) / limit;
-
- /* Watch out for special case. If LEN is less than LIMIT, then
- just do the inner printing loop.
- 0 < len <= limit implies count = 1. */
-
- /* Sort the items if they are not already sorted. */
- if (!rl_ignore_completion_duplicates)
- qsort (matches + 1, len - 1, sizeof (char *), compare_strings);
-
- /* Print the sorted items, up-and-down alphabetically, like
- ls might. */
- crlf ();
-
- for (i = 1; i <= count; i++)
- {
- for (j = 0, l = i; j < limit; j++)
- {
- if (l > len || !matches[l])
- break;
- else
- {
- char *temp;
- int printed_length;
-
- temp = printable_part (matches[l]);
- printed_length = strlen (temp);
- printed_length += print_filename (temp, matches[l]);
-
- if (j + 1 < limit)
- {
- for (k = 0; k < max - printed_length; k++)
- putc (' ', rl_outstream);
- }
- }
- l += count;
- }
- crlf ();
- }
- restart:
-
- rl_on_new_line ();
- }
- break;
+ if (delimiter)
+ temp_string[temp_string_index++] = delimiter;
+ else if (rl_completion_append_character)
+ temp_string[temp_string_index++] = rl_completion_append_character;
+
+ temp_string[temp_string_index++] = '\0';
+
+ if (rl_filename_completion_desired)
+ {
+ filename = tilde_expand (text);
+ if (stat (filename, &finfo) == 0 && S_ISDIR (finfo.st_mode))
+ {
+ if (_rl_complete_mark_directories && rl_line_buffer[rl_point] != '/')
+ rl_insert_text ("/");
+ }
+ else
+ {
+ if (rl_point == rl_end)
+ rl_insert_text (temp_string);
+ }
+ free (filename);
+ }
+ else
+ {
+ if (rl_point == rl_end)
+ rl_insert_text (temp_string);
+ }
+}
- default:
- fprintf (stderr, "\r\nreadline: bad value for what_to_do in rl_complete\n");
- abort ();
+static void
+insert_all_matches (matches, point, quote_char)
+ char **matches;
+ int point, quote_char;
+{
+ int i;
+ char *rp;
+
+ rl_begin_undo_group ();
+ /* remove any opening quote character; make_quoted_replacement will add
+ it back. */
+ if (quote_char && point && rl_line_buffer[point - 1] == quote_char)
+ point--;
+ rl_delete_text (point, rl_point);
+ rl_point = point;
+
+ if (matches[1])
+ {
+ for (i = 1; matches[i]; i++)
+ {
+ rp = make_quoted_replacement (matches[i], SINGLE_MATCH, quote_char);
+ rl_insert_text (rp);
+ rl_insert_text (" ");
+ if (rp != matches[i])
+ free (rp);
}
+ }
+ else
+ {
+ rp = make_quoted_replacement (matches[0], SINGLE_MATCH, quote_char);
+ rl_insert_text (rp);
+ rl_insert_text (" ");
+ if (rp != matches[0])
+ free (rp);
+ }
+ rl_end_undo_group ();
+}
+
+/* Complete the word at or before point.
+ WHAT_TO_DO says what to do with the completion.
+ `?' means list the possible completions.
+ TAB means do standard completion.
+ `*' means insert all of the possible completions.
+ `!' means to do standard completion, and list all possible completions if
+ there is more than one. */
+int
+rl_complete_internal (what_to_do)
+ int what_to_do;
+{
+ char **matches, **temp_matches;
+ Function *our_func;
+ int start, end, delimiter, found_quote, nmatch, i;
+ char *text, *saved_line_buffer, *t;
+ char quote_char;
+
+ saved_line_buffer = rl_line_buffer ? savestring (rl_line_buffer) : (char *)NULL;
+
+ our_func = rl_completion_entry_function
+ ? rl_completion_entry_function
+ : (Function *)filename_completion_function;
+
+ /* Only the completion entry function can change these. */
+ rl_filename_completion_desired = 0;
+ rl_filename_quoting_desired = 1;
+
+ rl_completion_type = what_to_do;
+
+ /* We now look backwards for the start of a filename/variable word. */
+ end = rl_point;
+
+ found_quote = delimiter = 0;
+ quote_char = '\0';
+
+ if (rl_point)
+ /* This (possibly) changes rl_point. If it returns a non-zero char,
+ we know we have an open quote. */
+ quote_char = find_completion_word (&found_quote, &delimiter);
+
+ start = rl_point;
+ rl_point = end;
+
+ text = rl_copy_text (start, end);
+ matches = gen_completion_matches (text, start, end, our_func, found_quote, quote_char);
+ free (text);
- for (i = 0; matches[i]; i++)
- free (matches[i]);
+ if (matches == 0)
+ {
+ ding ();
+ FREE (saved_line_buffer);
+ return 0;
+ }
+
+ /* It seems to me that in all the cases we handle we would like
+ to ignore duplicate possiblilities. Scan for the text to
+ insert being identical to the other completions. */
+ if (rl_ignore_completion_duplicates)
+ {
+ temp_matches = remove_duplicate_matches (matches);
free (matches);
+ matches = temp_matches;
}
- /* Check to see if the line has changed through all of this manipulation. */
- if (saved_line_buffer)
+ /* If we are matching filenames, then here is our chance to
+ do clever processing by re-examining the list. Call the
+ ignore function with the array as a parameter. It can
+ munge the array, deleting matches as it desires. */
+ if (rl_ignore_some_completions_function &&
+ our_func == (Function *)filename_completion_function)
{
- if (strcmp (rl_line_buffer, saved_line_buffer) != 0)
- completion_changed_buffer = 1;
+ for (nmatch = 1; matches[nmatch]; nmatch++)
+ ;
+ (void)(*rl_ignore_some_completions_function) (matches);
+ if (matches == 0 || matches[0] == 0)
+ {
+ FREE (matches);
+ ding ();
+ FREE (saved_line_buffer);
+ return 0;
+ }
else
- completion_changed_buffer = 0;
+ {
+ /* If we removed some matches, recompute the common prefix. */
+ for (i = 1; matches[i]; i++)
+ ;
+ if (i > 1 && i < nmatch)
+ {
+ t = matches[0];
+ compute_lcd_of_matches (matches, i - 1, text);
+ FREE (t);
+ }
+ }
+ }
+ switch (what_to_do)
+ {
+ case TAB:
+ case '!':
+ /* Insert the first match with proper quoting. */
+ if (*matches[0])
+ insert_match (matches[0], start, matches[1] ? MULT_MATCH : SINGLE_MATCH, quote_char);
+
+ /* If there are more matches, ring the bell to indicate.
+ If we are in vi mode, Posix.2 says to not ring the bell.
+ If the `show-all-if-ambiguous' variable is set, display
+ all the matches immediately. Otherwise, if this was the
+ only match, and we are hacking files, check the file to
+ see if it was a directory. If so, and the `mark-directories'
+ variable is set, add a '/' to the name. If not, and we
+ are at the end of the line, then add a space. */
+ if (matches[1])
+ {
+ if (what_to_do == '!')
+ {
+ display_matches (matches);
+ break;
+ }
+ else if (rl_editing_mode != vi_mode)
+ ding (); /* There are other matches remaining. */
+ }
+ else
+ append_to_match (matches[0], delimiter, quote_char);
+
+ break;
+
+ case '*':
+ insert_all_matches (matches, start, quote_char);
+ break;
+
+ case '?':
+ display_matches (matches);
+ break;
+
+ default:
+ fprintf (stderr, "\r\nreadline: bad value %d for what_to_do in rl_complete\n", what_to_do);
+ ding ();
+ FREE (saved_line_buffer);
+ return 1;
+ }
+
+ for (i = 0; matches[i]; i++)
+ free (matches[i]);
+ free (matches);
+
+ /* Check to see if the line has changed through all of this manipulation. */
+ if (saved_line_buffer)
+ {
+ completion_changed_buffer = strcmp (rl_line_buffer, saved_line_buffer) != 0;
free (saved_line_buffer);
}
+
return 0;
}
`@' for symbolic links
`/' for directories
`*' for executables
- `=' for sockets */
+ `=' for sockets
+ `|' for FIFOs
+ `%' for character special devices
+ `#' for block special devices */
static int
stat_char (filename)
char *filename;
struct stat finfo;
int character, r;
-#if defined (S_ISLNK)
+#if defined (HAVE_LSTAT) && defined (S_ISLNK)
r = lstat (filename, &finfo);
#else
r = stat (filename, &finfo);
character = 0;
if (S_ISDIR (finfo.st_mode))
character = '/';
+ else if (S_ISCHR (finfo.st_mode))
+ character = '%';
+ else if (S_ISBLK (finfo.st_mode))
+ character = '#';
#if defined (S_ISLNK)
else if (S_ISLNK (finfo.st_mode))
character = '@';
else if (S_ISSOCK (finfo.st_mode))
character = '=';
#endif /* S_ISSOCK */
+#if defined (S_ISFIFO)
+ else if (S_ISFIFO (finfo.st_mode))
+ character = '|';
+#endif
else if (S_ISREG (finfo.st_mode))
{
if (access (filename, X_OK) == 0)
}
#endif /* VISIBLE_STATS */
-/* Stupid comparison routine for qsort () ing strings. */
-static int
-compare_strings (s1, s2)
- char **s1, **s2;
-{
- int result;
-
- result = **s1 - **s2;
- if (result == 0)
- result = strcmp (*s1, *s2);
-
- return result;
-}
-
/* A completion function for usernames.
TEXT contains a partial username preceded by a random
character (usually `~'). */
int state;
char *text;
{
-#if defined (__GO32__)
+#if defined (__GO32__) || defined (__WIN32__)
return (char *)NULL;
#else /* !__GO32__ */
static char *username = (char *)NULL;
static struct passwd *entry;
static int namelen, first_char, first_char_loc;
+ char *value;
- if (!state)
+ if (state == 0)
{
- if (username)
- free (username);
+ FREE (username);
first_char = *text;
-
- if (first_char == '~')
- first_char_loc = 1;
- else
- first_char_loc = 0;
+ first_char_loc = first_char == '~';
username = savestring (&text[first_char_loc]);
namelen = strlen (username);
while (entry = getpwent ())
{
/* Null usernames should result in all users as possible completions. */
- if (namelen == 0)
- break;
- else if ((username[0] == entry->pw_name[0]) &&
- (strncmp (username, entry->pw_name, namelen) == 0))
+ if (namelen == 0 || (STREQN (username, entry->pw_name, namelen)))
break;
}
- if (!entry)
+ if (entry == 0)
{
endpwent ();
return ((char *)NULL);
}
else
{
- char *value = xmalloc (2 + strlen (entry->pw_name));
+ value = xmalloc (2 + strlen (entry->pw_name));
*value = *text;
}
#endif /* !__GO32__ */
}
-\f
+
/* **************************************************************** */
/* */
/* Completion */
/* Non-zero means that case is not significant in completion. */
int completion_case_fold = 0;
+/* Find the common prefix of the list of matches, and put it into
+ matches[0]. */
+static int
+compute_lcd_of_matches (match_list, matches, text)
+ char **match_list;
+ int matches;
+ char *text;
+{
+ register int i, c1, c2, si;
+ int low; /* Count of max-matched characters. */
+
+ /* If only one match, just use that. Otherwise, compare each
+ member of the list with the next, finding out where they
+ stop matching. */
+ if (matches == 1)
+ {
+ match_list[0] = match_list[1];
+ match_list[1] = (char *)NULL;
+ return 1;
+ }
+
+ for (i = 1, low = 100000; i < matches; i++)
+ {
+ if (completion_case_fold)
+ {
+ for (si = 0;
+ (c1 = _rl_to_lower(match_list[i][si])) &&
+ (c2 = _rl_to_lower(match_list[i + 1][si]));
+ si++)
+ if (c1 != c2)
+ break;
+ }
+ else
+ {
+ for (si = 0;
+ (c1 = match_list[i][si]) &&
+ (c2 = match_list[i + 1][si]);
+ si++)
+ if (c1 != c2)
+ break;
+ }
+
+ if (low > si)
+ low = si;
+ }
+
+ /* If there were multiple matches, but none matched up to even the
+ first character, and the user typed something, use that as the
+ value of matches[0]. */
+ if (low == 0 && text && *text)
+ {
+ match_list[0] = xmalloc (strlen (text) + 1);
+ strcpy (match_list[0], text);
+ }
+ else
+ {
+ match_list[0] = xmalloc (low + 1);
+ strncpy (match_list[0], match_list[1], low);
+ match_list[0][low] = '\0';
+ }
+
+ return matches;
+}
+
/* Return an array of (char *) which is a list of completions for TEXT.
If there are no completions, return a NULL pointer.
The first entry in the returned array is the substitution for TEXT.
int match_list_size;
/* The list of matches. */
- char **match_list =
- (char **)xmalloc (((match_list_size = 10) + 1) * sizeof (char *));
+ char **match_list;
/* Number of matches actually found. */
- int matches = 0;
+ int matches;
/* Temporary string binder. */
char *string;
+ matches = 0;
+ match_list_size = 10;
+ match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *));
match_list[1] = (char *)NULL;
while (string = (*entry_function) (text, matches))
/* If there were any matches, then look through them finding out the
lowest common denominator. That then becomes match_list[0]. */
if (matches)
- {
- register int i = 1;
- int low = 100000; /* Count of max-matched characters. */
-
- /* If only one match, just use that. */
- if (matches == 1)
- {
- match_list[0] = match_list[1];
- match_list[1] = (char *)NULL;
- }
- else
- {
- /* Otherwise, compare each member of the list with
- the next, finding out where they stop matching. */
-
- while (i < matches)
- {
- register int c1, c2, si;
-
- if (completion_case_fold)
- {
- for (si = 0;
- (c1 = to_lower(match_list[i][si])) &&
- (c2 = to_lower(match_list[i + 1][si]));
- si++)
- if (c1 != c2) break;
- }
- else
- {
- for (si = 0;
- (c1 = match_list[i][si]) &&
- (c2 = match_list[i + 1][si]);
- si++)
- if (c1 != c2) break;
- }
-
- if (low > si) low = si;
- i++;
- }
- match_list[0] = xmalloc (low + 1);
- strncpy (match_list[0], match_list[1], low);
- match_list[0][low] = '\0';
- }
- }
+ compute_lcd_of_matches (match_list, matches, text);
else /* There were no matches. */
{
free (match_list);
static char *dirname = (char *)NULL;
static char *users_dirname = (char *)NULL;
static int filename_len;
-
- struct dirent *entry = (struct dirent *)NULL;
+ char *temp;
+ int dirlen;
+ struct dirent *entry;
/* If we don't have any state, then do some initialization. */
- if (!state)
+ if (state == 0)
{
- char *temp;
-
- if (dirname) free (dirname);
- if (filename) free (filename);
- if (users_dirname) free (users_dirname);
+ FREE (dirname);
+ FREE (filename);
+ FREE (users_dirname);
filename = savestring (text);
- if (!*text) text = ".";
+ if (*text == 0)
+ text = ".";
dirname = savestring (text);
temp = strrchr (dirname, '/');
*temp = '\0';
}
else
- strcpy (dirname, ".");
+ {
+ dirname[0] = '.';
+ dirname[1] = '\0';
+ }
/* We aren't done yet. We also support the "~user" syntax. */
/* Save the version of the directory that the user typed. */
users_dirname = savestring (dirname);
- {
- char *temp_dirname;
- int replace_dirname;
-
- temp_dirname = tilde_expand (dirname);
- free (dirname);
- dirname = temp_dirname;
-
- replace_dirname = 0;
- if (rl_directory_completion_hook)
- replace_dirname = (*rl_directory_completion_hook) (&dirname);
- if (replace_dirname)
- {
- free (users_dirname);
- users_dirname = savestring (dirname);
- }
- }
+
+ if (*dirname == '~')
+ {
+ temp = tilde_expand (dirname);
+ free (dirname);
+ dirname = temp;
+ }
+
+ if (rl_directory_completion_hook && (*rl_directory_completion_hook) (&dirname))
+ {
+ free (users_dirname);
+ users_dirname = savestring (dirname);
+ }
+
directory = opendir (dirname);
filename_len = strlen (filename);
/* Now that we have some state, we can read the directory. */
+ entry = (struct dirent *)NULL;
while (directory && (entry = readdir (directory)))
{
/* Special case for no filename.
All entries except "." and ".." match. */
- if (!filename_len)
+ if (filename_len == 0)
{
- if ((strcmp (entry->d_name, ".") != 0) &&
- (strcmp (entry->d_name, "..") != 0))
+ if (entry->d_name[0] != '.' ||
+ (entry->d_name[1] &&
+ (entry->d_name[1] != '.' || entry->d_name[2])))
break;
}
else
}
}
- if (!entry)
+ if (entry == 0)
{
if (directory)
{
}
else
{
- char *temp;
-
/* dirname && (strcmp (dirname, ".") != 0) */
if (dirname && (dirname[0] != '.' || dirname[1]))
{
if (rl_complete_with_tilde_expansion && *users_dirname == '~')
{
- int dirlen = strlen (dirname);
+ dirlen = strlen (dirname);
temp = xmalloc (2 + dirlen + D_NAMLEN (entry));
strcpy (temp, dirname);
- /* Canonicalization cuts off any final slash present. We need
- to add it back. */
+ /* Canonicalization cuts off any final slash present. We
+ may need to add it back. */
if (dirname[dirlen - 1] != '/')
{
- temp[dirlen] = '/';
- temp[dirlen + 1] = '\0';
+ temp[dirlen++] = '/';
+ temp[dirlen] = '\0';
}
}
else
{
- temp = xmalloc (1 + strlen (users_dirname) + D_NAMLEN (entry));
+ dirlen = strlen (users_dirname);
+ temp = xmalloc (1 + dirlen + D_NAMLEN (entry));
strcpy (temp, users_dirname);
}
- strcat (temp, entry->d_name);
+ strcpy (temp + dirlen, entry->d_name); /* strcat (temp, entry->d_name); */
}
else
- temp = (savestring (entry->d_name));
+ temp = savestring (entry->d_name);
return (temp);
}
int ignore, key;
{
register int start, end;
- char *homedir;
+ char *homedir, *temp;
+ int len;
end = rl_point;
start = end - 1;
if (rl_point == rl_end && rl_line_buffer[rl_point] == '~')
{
homedir = tilde_expand ("~");
- goto insert;
+ insert_text (homedir, start, end);
+ return (0);
}
else if (rl_line_buffer[start] != '~')
{
- for (; !whitespace (rl_line_buffer[start]) && start >= 0; start--);
+ for (; !whitespace (rl_line_buffer[start]) && start >= 0; start--)
+ ;
start++;
}
end = start;
do
- {
- end++;
- }
- while (!whitespace (rl_line_buffer[end]) && end < rl_end);
+ end++;
+ while (whitespace (rl_line_buffer[end]) == 0 && end < rl_end);
if (whitespace (rl_line_buffer[end]) || end >= rl_end)
end--;
nothing. */
if (rl_line_buffer[start] == '~')
{
- char *temp;
- int len;
-
len = end - start + 1;
temp = xmalloc (len + 1);
strncpy (temp, rl_line_buffer + start, len);
homedir = tilde_expand (temp);
free (temp);
- insert:
- rl_begin_undo_group ();
- rl_delete_text (start, end + 1);
- rl_point = start;
- rl_insert_text (homedir);
- rl_end_undo_group ();
+ insert_text (homedir, start, end);
}
return (0);
}
return ((char *)NULL);
}
-
-#if defined (STATIC_MALLOC)
-\f
-/* **************************************************************** */
-/* */
-/* xmalloc and xrealloc () */
-/* */
-/* **************************************************************** */
-
-static void memory_error_and_abort ();
-
-static char *
-xmalloc (bytes)
- int bytes;
-{
- char *temp = (char *)malloc (bytes);
-
- if (!temp)
- memory_error_and_abort ();
- return (temp);
-}
-
-static char *
-xrealloc (pointer, bytes)
- char *pointer;
- int bytes;
-{
- char *temp;
-
- if (!pointer)
- temp = (char *)malloc (bytes);
- else
- temp = (char *)realloc (pointer, bytes);
-
- if (!temp)
- memory_error_and_abort ();
-
- return (temp);
-}
-
-static void
-memory_error_and_abort ()
-{
- fprintf (stderr, "readline: Out of virtual memory!\n");
- abort ();
-}
-#endif /* STATIC_MALLOC */
projects / platform / upstream / bash.git / blobdiff