/* alias.c -- Not a full alias, but just the kind that we use in the
shell. Csh style alias is somewhere else (`over there, in a box'). */
-/* Copyright (C) 1987,1991 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2002 Free Software Foundation, Inc.
This file is part of GNU Bash, the Bourne Again SHell.
# include "pcomplete.h"
#endif
+#define ALIAS_HASH_BUCKETS 16 /* must be power of two */
+
typedef int sh_alias_map_func_t __P((alias_t *));
static void free_alias_data __P((PTR_T));
initialize_aliases ()
{
if (!aliases)
- aliases = make_hash_table (0);
+ aliases = hash_create (ALIAS_HASH_BUCKETS);
}
/* Scan the list of aliases looking for one with NAME. Return NULL
if (aliases == 0)
return ((alias_t *)NULL);
- al = find_hash_item (name, aliases);
+ al = hash_search (name, aliases, 0);
return (al ? (alias_t *)al->data : (alias_t *)NULL);
}
{
free (temp->value);
temp->value = savestring (value);
+ temp->flags &= ~AL_EXPANDNEXT;
n = value[strlen (value) - 1];
if (n == ' ' || n == '\t')
temp->flags |= AL_EXPANDNEXT;
if (n == ' ' || n == '\t')
temp->flags |= AL_EXPANDNEXT;
- elt = add_hash_item (savestring (name), aliases);
- elt->data = (char *)temp;
+ elt = hash_insert (savestring (name), aliases, HASH_NOSRCH);
+ elt->data = temp;
#if defined (PROGRAMMABLE_COMPLETION)
set_itemlist_dirty (&it_aliases);
#endif
if (aliases == 0)
return (-1);
- elt = remove_hash_item (name, aliases);
+ elt = hash_remove (name, aliases, 0);
if (elt)
{
free_alias_data (elt->data);
if (aliases == 0)
return;
- flush_hash_table (aliases, free_alias_data);
- dispose_hash_table (aliases);
+ hash_flush (aliases, free_alias_data);
+ hash_dispose (aliases);
aliases = (HASH_TABLE *)NULL;
#if defined (PROGRAMMABLE_COMPLETION)
set_itemlist_dirty (&it_aliases);
register int i;
register BUCKET_CONTENTS *tlist;
alias_t *alias, **list;
- int list_index, list_size;
+ int list_index;
- list = (alias_t **)NULL;
- for (i = list_index = list_size = 0; i < aliases->nbuckets; i++)
- {
- tlist = get_hash_bucket (i, aliases);
+ i = HASH_ENTRIES (aliases);
+ if (i == 0)
+ return ((alias_t **)NULL);
- while (tlist)
+ list = (alias_t **)xmalloc ((i + 1) * sizeof (alias_t *));
+ for (i = list_index = 0; i < aliases->nbuckets; i++)
+ {
+ for (tlist = hash_items (i, aliases); tlist; tlist = tlist->next)
{
alias = (alias_t *)tlist->data;
if (!function || (*function) (alias))
{
- if (list_index + 1 >= list_size)
- {
- list_size += 20;
- list = (alias_t **)xrealloc (list,
- list_size * sizeof (alias_t *));
- }
-
list[list_index++] = alias;
list[list_index] = (alias_t *)NULL;
}
- tlist = tlist->next;
}
}
return (list);
sort_aliases (array)
alias_t **array;
{
- qsort (array, array_len ((char **)array), sizeof (alias_t *), (QSFUNC *)qsort_alias_compare);
+ qsort (array, strvec_len ((char **)array), sizeof (alias_t *), (QSFUNC *)qsort_alias_compare);
}
static int
{
alias_t **list;
- if (!aliases)
+ if (aliases == 0 || HASH_ENTRIES (aliases) == 0)
return ((alias_t **)NULL);
list = map_over_aliases ((sh_alias_map_func_t *)NULL);
/* If there is a backslash-escaped character quoted in TOKEN,
then we don't do alias expansion. This should check for all
other quoting characters, too. */
- if (strchr (token, '\\'))
+ if (xstrchr (token, '\\'))
expand_this_token = 0;
/* If we should be expanding here, if we are expanding all words, or if