X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Ftabcomplete.c;h=db4552c9dca55779465462db8dc79607c627129d;hb=79fb4b8deb48939a8d9e3fce48c7736eb3b1cf0b;hp=d7bbe1c350e968b66f6acb114d513fba9a47d307;hpb=c142c150b731e1dde2a1aef89fb3b326ea88cace;p=yaz-moved-to-github.git

diff --git a/client/tabcomplete.c b/client/tabcomplete.c
index d7bbe1c..db4552c 100644
--- a/client/tabcomplete.c
+++ b/client/tabcomplete.c
@@ -2,15 +2,18 @@
  * Copyright (c) 2002, Index Data
  * See the file LICENSE for details.
  *
- * $Id: tabcomplete.c,v 1.2 2002-01-30 14:51:45 adam Exp $
+ * $Id: tabcomplete.c,v 1.5 2002-06-17 14:57:34 ja7 Exp $
  */
 
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <yaz/oid.h>
 #include "tabcomplete.h"
 
+extern char** curret_global_list;
+
 /* *****************************************************************************
  *
  * generic compleater 
@@ -18,13 +21,15 @@
  * *****************************************************************************/
 
 char* complete_from_list(char* completions[], const char *text, int state)
-{
-	static idx;
+{	
+	static int idx;
+
+	if(!completions) return NULL;
 	if(state==0) {
 		idx = 0;
 	}
 	for(; completions[idx]; ++ idx) {
-		if(!strncmp(completions[idx],text,strlen(text))) {
+		if(!strncasecmp(completions[idx],text,strlen(text))) {
 			++idx; /* skip this entry on the next run */ 
 			return (char*)strdup(completions[idx-1]);
 		};
@@ -56,7 +61,7 @@ void oid_loader(struct oident* oid, void* data_)
 {
 	oid_callback_t* data=(oid_callback_t*) data_;
 	
-	//fprintf(stderr,"ja7: called with %d: %s\n",oid->oclass,oid->desc);	
+	
 	if((oid->oclass == CLASS_GENERAL) || (oid->oclass == data->oclass)) {
 		if(data->index==data->max) {
 			data->values=(char**)realloc(data->values,((data->max+1)*2)*sizeof(char*));
@@ -65,7 +70,7 @@ void oid_loader(struct oident* oid, void* data_)
 		data->values[data->index]=oid->desc;
 		++data->index;		
 	}
-};
+}
 
 char** build_list_for_oclass(oid_class oclass) {	
 	oid_callback_t data;	
@@ -119,7 +124,15 @@ char* complete_attributeset(const char* text, int state)
 	
 	free(list);	
 	return res;
-};
+}
+
+
+char* default_completer(const char* text, int state)
+{
+	return complete_from_list(curret_global_list,text,state);
+}
+
+
 
 /*
  * Local variables: