瀏覽代碼

env: fix env var autocompletion

commit 560d424b6d7cd4205b062ad95f1b104bd4f8bcc3 "env: re-add
support for auto-completion" fell short of its description -
the 'used' logic in hmatch_r was reversed - 'used' is 0 if
the hash table entry is not used, or -1 if deleted.  This
patch makes hmatch_r actually match on valid ('used') entries,
instead of skipping them and failing to match anything.

typing 'printenv tft' and hitting 'tab' now displays valid
choices for variable names.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Tested-by: Mike Frysinger <vapier@gentoo.org>
Kim Phillips 14 年之前
父節點
當前提交
af4d9074aa
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      lib/hashtable.c

+ 1 - 1
lib/hashtable.c

@@ -209,7 +209,7 @@ int hmatch_r(const char *match, int last_idx, ENTRY ** retval,
 	size_t key_len = strlen(match);
 	size_t key_len = strlen(match);
 
 
 	for (idx = last_idx + 1; idx < htab->size; ++idx) {
 	for (idx = last_idx + 1; idx < htab->size; ++idx) {
-		if (htab->table[idx].used > 0)
+		if (htab->table[idx].used <= 0)
 			continue;
 			continue;
 		if (!strncmp(match, htab->table[idx].entry.key, key_len)) {
 		if (!strncmp(match, htab->table[idx].entry.key, key_len)) {
 			*retval = &htab->table[idx].entry;
 			*retval = &htab->table[idx].entry;