X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=98b8bd5e078d5d90d9d71ce2d7869b7eaa5630f3;hp=6fa0c049b114a65e2b9f3e4a1ab37d333877c6f3;hb=f5235f6ab427d98731fb5184ac284ac97e1dfb40;hpb=a2df70871ff2494610edf71f7c7c74b785a69cd6 diff --git a/client/client.c b/client/client.c index 6fa0c04..98b8bd5 100644 --- a/client/client.c +++ b/client/client.c @@ -1,8 +1,8 @@ -/* +/* * Copyright (c) 1995-2002, Index Data * See the file LICENSE for details. * - * $Id: client.c,v 1.159 2002-06-17 14:57:34 ja7 Exp $ + * $Id: client.c,v 1.169 2002-09-17 11:07:30 adam Exp $ */ #include @@ -11,10 +11,7 @@ #include -#include -#ifdef USE_XTIMOSI -#include -#endif +#include #include #include @@ -31,6 +28,7 @@ #if HAVE_READLINE_READLINE_H #include +#include #endif #if HAVE_READLINE_HISTORY_H #include @@ -76,6 +74,8 @@ static char* yazLang = 0; static char last_cmd[32] = "?"; static FILE *marcdump = 0; static char *refid = NULL; +static char *last_open_command = NULL; +static int auto_reconnect = 0; typedef enum { QueryType_Prefix, @@ -103,6 +103,12 @@ int rl_attempted_completion_over = 0; while(isspace(*args_end)) {*args_end=0;--args_end;}; \ } +#define maxOtherInfosSupported 10 +struct { + int oidval; + char* value; +} extraOtherInfos[maxOtherInfosSupported]; + void process_cmd_line(char* line); char ** readline_completer(char *text, int start, int end); @@ -115,11 +121,56 @@ ODR getODROutputStream() return out; } +const char* query_type_as_string(QueryType q) +{ + switch (q) { + case QueryType_Prefix: return "prefix (RPN sent to server)"; + case QueryType_CCL: return "CCL (CCL sent to server) "; + case QueryType_CCL2RPN: return "CCL -> RPN (RPN sent to server)"; + default: + return "unknown Query type internal yaz-client error"; + } +} + + +void do_hex_dump(char* buf,int len) +{ +#if 0 + int i,x; + for( i=0; i= 32) || strchr ("\n\r\t\f", buf[i])) - printf ("%c", buf[i]); - else - printf ("\\X%02X", buf[i]); + size_t i; + for (i = 0; i= 32) || strchr ("\n\r\t\f", buf[i])) + printf ("%c", buf[i]); + else + printf ("\\X%02X", buf[i]); } static void print_refid (Z_ReferenceId *id) @@ -209,7 +262,7 @@ static void send_initRequest(const char* type_and_host) yaz_oi_APDU(apdu, &p); - if (p0=yaz_oi_update(p, out, NULL, 0, 0)) { + if ((p0=yaz_oi_update(p, out, NULL, 0, 0))) { ODR_MASK_SET(req->options, Z_Options_negotiationModel); p0->which = Z_OtherInfo_externallyDefinedInfo; @@ -308,10 +361,11 @@ static int process_initResponse(Z_InitResponse *res) char *charset=NULL, *lang=NULL; int selected; - yaz_get_response_charneg(session_mem, p, &charset, &lang, &selected); + yaz_get_response_charneg(session_mem, p, &charset, &lang, + &selected); - printf("Accepted character set : `%s'\n", charset); - printf("Accepted code language : `%s'\n", lang); + printf("Accepted character set : %s\n", charset); + printf("Accepted code language : %s\n", lang ? lang : "none"); printf("Accepted records in ...: %d\n", selected ); } } @@ -334,13 +388,20 @@ static int cmd_base(char *arg) num_databaseNames = 0; while (1) { + char *cp1; if (!(cp = strchr(arg, ' '))) cp = arg + strlen(arg); if (cp - arg < 1) break; databaseNames[num_databaseNames] = (char *)xmalloc (1 + cp - arg); memcpy (databaseNames[num_databaseNames], arg, cp - arg); - databaseNames[num_databaseNames++][cp - arg] = '\0'; + databaseNames[num_databaseNames][cp - arg] = '\0'; + + for (cp1 = databaseNames[num_databaseNames]; *cp1 ; cp1++) + if (*cp1 == '+') + *cp1 = ' '; + num_databaseNames++; + if (!*cp) break; arg = cp+1; @@ -348,11 +409,19 @@ static int cmd_base(char *arg) return 1; } +void cmd_open_remember_last_open_command(char* arg, char* new_open_command) +{ + if(last_open_command != arg) + { + if(last_open_command) xfree(last_open_command); + last_open_command = xstrdup(new_open_command); + } +} + int cmd_open(char *arg) { void *add; - char type_and_host[101], base[101]; - CS_TYPE t; + char type_and_host[101], base[101]; if (conn) { @@ -365,24 +434,25 @@ int cmd_open(char *arg) nmem_destroy (session_mem); session_mem = NULL; } - } - if (strncmp (arg, "unix:", 5) == 0) - { + } + + if (strncmp (arg, "unix:", 5) == 0) + { base[0] = '\0'; conn = cs_create_host(arg, 1, &add); - } - else - { - t = tcpip_type; - base[0] = '\0'; - if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1) - return 0; - - if(yazProxy) - conn = cs_create_host(yazProxy, 1, &add); - else - conn = cs_create_host(type_and_host, 1, &add); + cmd_open_remember_last_open_command(arg,arg); + } + else + { + base[0] = '\0'; + if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1) + return 0; + cmd_open_remember_last_open_command(arg,type_and_host); + if (yazProxy) + conn = cs_create_host(yazProxy, 1, &add); + else + conn = cs_create_host(type_and_host, 1, &add); } if (!conn) { @@ -405,9 +475,28 @@ int cmd_open(char *arg) send_initRequest(type_and_host); if (*base) cmd_base (base); + return 2; } + +void try_reconnect() +{ + + char* open_command; + + if(!( auto_reconnect && last_open_command) ) return ; + + open_command = (char *) xmalloc (strlen(last_open_command)+6); + strcpy (open_command, "open "); + + strcat (open_command, last_open_command); + + process_cmd_line(open_command); + + xfree(open_command); +} + int cmd_authentication(char *arg) { static Z_IdAuthentication au; @@ -603,19 +692,21 @@ static void display_record(Z_External *r) fprintf(stderr, "[Near %d]\n", odr_offset(in)); fprintf(stderr, "Packet dump:\n---------\n"); odr_dumpBER(stderr, (char*)r->u.octet_aligned->buf, - r->u.octet_aligned->len); + r->u.octet_aligned->len); fprintf(stderr, "---------\n"); - exit(1); + + /* note just ignores the error ant print the bytes form the octet_aligned laiter */ + } else { + /* + * Note: we throw away the original, BER-encoded record here. + * Do something else with it if you want to keep it. + */ + r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */ + r->which = type->what; } - /* - * Note: we throw away the original, BER-encoded record here. - * Do something else with it if you want to keep it. - */ - r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */ - r->which = type->what; } } - if (ent && ent->oclass != CLASS_RECSYN) + if (ent && ent->oclass != CLASS_RECSYN) return; if (ent && ent->value == VAL_SOIF) print_record((const unsigned char *) r->u.octet_aligned->buf, @@ -808,6 +899,7 @@ static int send_searchRequest(char *arg) char setstring[100]; Z_RPNQuery *RPNquery; Odr_oct ccl_query; + YAZ_PQF_Parser pqf_parser; if (queryType == QueryType_CCL2RPN) { @@ -861,12 +953,20 @@ static int send_searchRequest(char *arg) { case QueryType_Prefix: query.which = Z_Query_type_1; - RPNquery = p_query_rpn (out, protocol, arg); + pqf_parser = yaz_pqf_create (); + RPNquery = yaz_pqf_parse (pqf_parser, out, arg); if (!RPNquery) { - printf("Prefix query error\n"); + const char *pqf_msg; + size_t off; + int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); + printf("%*s^\n", off+4, ""); + printf("Prefix query error: %s (code %d)\n", pqf_msg, code); + + yaz_pqf_destroy (pqf_parser); return 0; } + yaz_pqf_destroy (pqf_parser); query.u.type_1 = RPNquery; break; case QueryType_CCL: @@ -906,11 +1006,23 @@ static void display_queryExpression (Z_QueryExpression *qe) if (qe->u.term->queryTerm) { Z_Term *term = qe->u.term->queryTerm; - if (term->which == Z_Term_general) + switch (term->which) + { + case Z_Term_general: printf (" %.*s", term->u.general->len, term->u.general->buf); + break; + case Z_Term_characterString: + printf (" %s", term->u.characterString); + break; + case Z_Term_numeric: + printf (" %d", *term->u.numeric); + break; + case Z_Term_null: + printf (" null"); + break; + } } } - } /* see if we can find USR:SearchResult-1 */ @@ -1045,7 +1157,9 @@ static void print_string_or_numeric(int iLevel, const char *pTag, Z_StringOrNume } } -static void print_universe_report_duplicate(int iLevel, Z_UniverseReportDuplicate *pUniverseReportDuplicate) +static void print_universe_report_duplicate( + int iLevel, + Z_UniverseReportDuplicate *pUniverseReportDuplicate) { if (pUniverseReportDuplicate != NULL) { @@ -1057,9 +1171,9 @@ static void print_universe_report_duplicate(int iLevel, Z_UniverseReportDuplicat } } -static void -print_universe_report_hits(int iLevel, - Z_UniverseReportHits *pUniverseReportHits) +static void print_universe_report_hits( + int iLevel, + Z_UniverseReportHits *pUniverseReportHits) { if (pUniverseReportHits != NULL) { @@ -1083,11 +1197,13 @@ static void print_universe_report(int iLevel, Z_UniverseReport *pUniverseReport) switch (pUniverseReport->which) { case Z_UniverseReport_databaseHits: - print_universe_report_hits(iLevel, pUniverseReport->u.databaseHits); + print_universe_report_hits(iLevel, + pUniverseReport->u.databaseHits); break; case Z_UniverseReport_duplicate: - print_universe_report_duplicate(iLevel, pUniverseReport->u.duplicate); + print_universe_report_duplicate(iLevel, + pUniverseReport->u.duplicate); break; default: @@ -1255,7 +1371,8 @@ static Z_External *create_external_itemRequest() r->u.single_ASN1_type->size = item_request_size; memcpy (r->u.single_ASN1_type->buf, item_request_buf, item_request_size); - printf ("len = %d\n", item_request_size); + + do_hex_dump(item_request_buf,item_request_size); } return r; } @@ -1311,7 +1428,10 @@ static Z_External *create_external_ILL_APDU(int which) r->u.single_ASN1_type->len = ill_request_size; r->u.single_ASN1_type->size = ill_request_size; memcpy (r->u.single_ASN1_type->buf, ill_request_buf, ill_request_size); - printf ("len = %d\n", ill_request_size); +/* printf ("len = %d\n", ill_request_size); */ +/* do_hex_dump(ill_request_buf,ill_request_size); */ +/* printf("--- end of extenal\n"); */ + } return r; } @@ -1360,7 +1480,6 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) (int *) odr_malloc(out, sizeof(int)); *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno; -#if YAZ_MODULE_ill if (!strcmp (type, "item") || !strcmp(type, "2")) { printf ("using item-request\n"); @@ -1387,9 +1506,6 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) else r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; -#else - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; -#endif return r; } @@ -1493,8 +1609,12 @@ static int cmd_find(char *arg) } if (!conn) { - printf("Not connected yet\n"); - return 0; + try_reconnect(); + + if (!conn) { + printf("Not connected yet\n"); + return 0; + }; } if (!send_searchRequest(arg)) return 0; @@ -1746,7 +1866,6 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) { Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest); Z_ScanRequest *req = apdu->u.scanRequest; - int use_rpn = 1; int oid[OID_SIZE]; if (queryType == QueryType_CCL2RPN) @@ -1761,7 +1880,6 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) printf("CCL ERROR: %s\n", ccl_err_msg(error)); return -1; } - use_rpn = 0; bib1.proto = PROTO_Z3950; bib1.oclass = CLASS_ATTSET; bib1.value = VAL_BIB1; @@ -1773,11 +1891,22 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) } ccl_rpn_delete (rpn); } - if (use_rpn && !(req->termListAndStartPoint = - p_query_scan(out, protocol, &req->attributeSet, query))) + else { - printf("Prefix query error\n"); - return -1; + YAZ_PQF_Parser pqf_parser = yaz_pqf_create (); + + if (!(req->termListAndStartPoint = + yaz_pqf_scan(pqf_parser, out, &req->attributeSet, query))) + { + const char *pqf_msg; + size_t off; + int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); + printf("%*s^\n", off+7, ""); + printf("Prefix query error: %s (code %d)\n", pqf_msg, code); + yaz_pqf_destroy (pqf_parser); + return -1; + } + yaz_pqf_destroy (pqf_parser); } if (term && *term) { @@ -1957,8 +2086,12 @@ int cmd_scan(char *arg) { if (!conn) { - printf("Session not initialized yet\n"); - return 0; + try_reconnect(); + + if (!conn) { + printf("Session not initialized yet\n"); + return 0; + }; } if (!ODR_MASK_GET(session->options, Z_Options_scan)) { @@ -2108,8 +2241,9 @@ int cmd_packagename(char* arg) int cmd_proxy(char* arg) { if (*arg == '\0') { - printf("Current proxy is `%s'\n", (yazCharset)?yazProxy:NULL); - return 1; + xfree (yazProxy); + yazProxy = NULL; + } xfree (yazProxy); yazProxy = NULL; @@ -2123,17 +2257,23 @@ int cmd_proxy(char* arg) int cmd_charset(char* arg) { - if (*arg == '\0') { - printf("Current character set is `%s'\n", (yazCharset)?yazCharset:NULL); + char l1[30], l2[30]; + + *l1 = *l2 = 0; + if (sscanf(arg, "%29s %29s", l1, l2) < 1) + { + printf("Current character set is `%s'\n", (yazCharset) ? yazCharset:NULL); return 1; } xfree (yazCharset); yazCharset = NULL; - if (*arg) + if (*l1) + yazCharset = xstrdup(l1); + if (*l2) { - yazCharset = (char *) xmalloc (strlen(arg)+1); - strcpy (yazCharset, arg); - } + odr_set_charset (out, l1, l2); + odr_set_charset (in, l2, l1); + } return 1; } @@ -2238,7 +2378,7 @@ int cmd_set_apdufile(char* arg) return 1; } -int cmd_set_cclfields(char* arg) +int cmd_set_cclfile(char* arg) { FILE *inf; @@ -2251,8 +2391,32 @@ int cmd_set_cclfields(char* arg) ccl_qual_file (bibset, inf); fclose (inf); } + strcpy(ccl_fields,arg); + return 0; +} + + +int cmd_set_auto_reconnect(char* arg) +{ + REMOVE_TAILING_BLANKS(arg); - return 1; + if(strlen(arg)==0) { + auto_reconnect = ! auto_reconnect; + } else if(strcmp(arg,"on")==0) { + auto_reconnect = 1; + } else if(strcmp(arg,"off")==0) { + auto_reconnect = 0; + } else { + printf("Error use on or off\n"); + return 1; + } + + if (auto_reconnect) + printf("Set auto reconnect enabled.\n"); + else + printf("Set auto reconnect disabled.\n"); + + return 0; } int cmd_set_marcdump(char* arg) @@ -2265,23 +2429,24 @@ int cmd_set_marcdump(char* arg) if(strlen(arg)<1) { return 1; } - + if(!strcmp(arg,"-")) marcdump=stderr; else marcdump=fopen(arg, "a"); - + if(!marcdump) { perror("unable to open apdu marcdump file no marcdump done\n"); } - + return 1; } -int cmd_set_proxy(char* arg) { +int cmd_set_proxy(char* arg) +{ if(yazProxy) free(yazProxy); yazProxy=NULL; - + if(strlen(arg) > 1) { yazProxy=strdup(arg); } @@ -2290,7 +2455,7 @@ int cmd_set_proxy(char* arg) { /* this command takes 3 arge {name class oid} - */ +*/ int cmd_register_oid(char* args) { static struct { char* className; @@ -2338,7 +2503,7 @@ int cmd_register_oid(char* args) { printf("Unknonwn oid class %s\n",oclass_str); return 0; } - + i = 0; name = oid_str; val = 0; @@ -2383,7 +2548,7 @@ void source_rcfile() struct stat statbuf; char buffer[1000]; char* homedir=getenv("HOME"); - + if(!homedir) return; sprintf(buffer,"%s/.yazclientrc",homedir); @@ -2400,9 +2565,9 @@ void source_rcfile() static void initialize(void) { -#if YAZ_MODULE_ccl FILE *inf; -#endif + int i; + if (!(out = odr_createmem(ODR_ENCODE)) || !(in = odr_createmem(ODR_DECODE)) || !(print = odr_createmem(ODR_PRINT))) @@ -2411,12 +2576,11 @@ static void initialize(void) exit(1); } oid_init(); - + setvbuf(stdout, 0, _IONBF, 0); if (apdu_file) odr_setprint(print, apdu_file); -#if YAZ_MODULE_ccl bibset = ccl_qual_mk (); inf = fopen (ccl_fields, "r"); if (inf) @@ -2424,13 +2588,17 @@ static void initialize(void) ccl_qual_file (bibset, inf); fclose (inf); } -#endif cmd_base("Default"); #if HAVE_READLINE_READLINE_H rl_attempted_completion_function = (CPPFunction*)readline_completer; #endif - + + + for(i=0; i=maxOtherInfosSupported) { + printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported); + } + extraOtherInfos[otherinfoNo].oidval = -1; + if(extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value); + return 0; + } + if (sscan_res<3) { + printf("Error in set_otherinfo command \n"); + return 0; + } + + if(otherinfoNo>=maxOtherInfosSupported) { + printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported); + } + + + oidval = oid_getvalbyname (oid); + if(oidval == -1 ) { + printf("Error in set_otherinfo command unknown oid %s \n",oid); + return 0; + } + extraOtherInfos[otherinfoNo].oidval = oidval; + if(extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value); + extraOtherInfos[otherinfoNo].value = strdup(otherinfoString); + + return 0; +} + +int cmd_list_otherinfo(char* args) +{ + int i; + + if(strlen(args)>0) { + i = atoi(args); + if( i >= maxOtherInfosSupported ) { + printf("Error otherinfo index to large (%d>%d)\n",i,maxOtherInfosSupported); + return 0; + } + + if(extraOtherInfos[i].oidval != -1) + printf(" otherinfo %d %s %s\n",i,yaz_z3950_oid_value_to_str(extraOtherInfos[i].oidval,CLASS_RECSYN), extraOtherInfos[i].value); + + } else { + for(i=0; iwhich) { + case Z_IdAuthentication_idPass: + printf("Authentication : IdPass\n"); + printf(" Login User : %s\n",auth->u.idPass->userId?auth->u.idPass->userId:""); + printf(" Login Group : %s\n",auth->u.idPass->groupId?auth->u.idPass->groupId:""); + printf(" Password : %s\n",auth->u.idPass->password?auth->u.idPass->password:""); + break; + case Z_IdAuthentication_open: + printf("Authentication : psOpen\n"); + printf(" Open string : %s\n",auth->u.open); + break; + default: + printf("Authentication : Unknown\n"); + } + } + if ( yazCharset ) printf("Character set : `%s'\n", (yazCharset) ? yazCharset:NULL); + + /* bases */ + printf("Bases : "); + for (i = 0; iu.generic:""); + + /* loging options */ + printf("APDU log : %s\n",apdu_file?"on":"off"); + printf("Record log : %s\n",marcdump?"on":"off"); + + /* other infos */ + printf("Other Info: \n"); + cmd_list_otherinfo(""); + + return 0; +} + +int cmd_clear_otherinfo(char* args) +{ + if(strlen(args)>0) { + int otherinfoNo; + otherinfoNo = atoi(args); + if( otherinfoNo >= maxOtherInfosSupported ) { + printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported); + return 0; + } + + if(extraOtherInfos[otherinfoNo].oidval != -1) { + /* only clear if set. */ + extraOtherInfos[otherinfoNo].oidval=-1; + free(extraOtherInfos[otherinfoNo].value); + } + } else { + int i; + + for(i=0; i[':'][/]",NULL,0,NULL}, {"quit", cmd_quit, "",NULL,0,NULL}, @@ -2597,10 +2951,16 @@ static struct { {"!", cmd_subshell, "Subshell command",NULL,1,NULL}, {"set_apdufile", cmd_set_apdufile, "",NULL,1,NULL}, {"set_marcdump", cmd_set_marcdump," ",NULL,1,NULL}, - {"set_cclfiele", cmd_set_cclfields," ",NULL,1,NULL}, + {"set_cclfile", cmd_set_cclfile," ",NULL,1,NULL}, + {"set_auto_reconnect", cmd_set_auto_reconnect," on|off",complete_auto_reconnect,1,NULL}, + {"set_otherinfo", cmd_set_otherinfo," ",NULL,0,NULL}, {"register_oid", cmd_register_oid," ",NULL,0,NULL}, {"push_command", cmd_push_command,"",command_generator,0,NULL}, {"register_tab", cmd_register_tab," ",command_generator,0,NULL}, + {"cclparse", cmd_cclparse,"",NULL,0,NULL}, + {"list_otherinfo",cmd_list_otherinfo,"[otherinfoinddex]",NULL,0,NULL}, + {"list_all",cmd_list_all,"",NULL,0,NULL}, + {"clear_otherinfo",cmd_clear_otherinfo,"",NULL,0,NULL}, /* Server Admin Functions */ {"adm-reindex", cmd_adm_reindex, "",NULL,0,NULL}, {"adm-truncate", cmd_adm_truncate, "('database'|'index')",NULL,0,NULL}, @@ -2657,46 +3017,48 @@ static int cmd_help (char *line) int cmd_register_tab(char* arg) { - char command[101], tabargument[101]; - int i, res; - int num_of_tabs; - char** tabslist; - - if (sscanf (arg, "%100s %100s", command, tabargument) < 1) { - return 0; - }; - - /* locate the amdn in the list */ - for (i = 0; cmd[i].cmd; i++) { - if (!strncmp(cmd[i].cmd, command, strlen(command))) { - break; - } - } - - if(!cmd[i].cmd) { - fprintf(stderr,"Unknown command %s\n",command); - return 1; - }; - - - - if(!cmd[i].local_tabcompletes) { - cmd[i].local_tabcompletes = calloc(1,sizeof(char**)); - }; - - num_of_tabs=0; - - tabslist = cmd[i].local_tabcompletes; - for(;tabslist && *tabslist;tabslist++) { - num_of_tabs++; - }; - - cmd[i].local_tabcompletes=realloc(cmd[i].local_tabcompletes,(num_of_tabs+2)*sizeof(char**)); - tabslist=cmd[i].local_tabcompletes; - tabslist[num_of_tabs]=strdup(tabargument); - tabslist[num_of_tabs+1]=NULL; + char command[101], tabargument[101]; + int i; + int num_of_tabs; + char** tabslist; + + if (sscanf (arg, "%100s %100s", command, tabargument) < 1) { + return 0; + } + + /* locate the amdn in the list */ + for (i = 0; cmd[i].cmd; i++) { + if (!strncmp(cmd[i].cmd, command, strlen(command))) { + break; + } + } + + if(!cmd[i].cmd) { + fprintf(stderr,"Unknown command %s\n",command); + return 1; + } + + + + if(!cmd[i].local_tabcompletes) { + cmd[i].local_tabcompletes = calloc(1,sizeof(char**)); + } + + num_of_tabs=0; + + tabslist = cmd[i].local_tabcompletes; + for(;tabslist && *tabslist;tabslist++) { + num_of_tabs++; + } + + cmd[i].local_tabcompletes=realloc(cmd[i].local_tabcompletes,(num_of_tabs+2)*sizeof(char**)); + tabslist=cmd[i].local_tabcompletes; + tabslist[num_of_tabs]=strdup(tabargument); + tabslist[num_of_tabs+1]=NULL; + return 1; } + void process_cmd_line(char* line) { int i,res; @@ -2730,26 +3092,27 @@ void process_cmd_line(char* line) *(++lastnonspace) = 0; } - + for (i = 0; cmd[i].cmd; i++) if (!strncmp(cmd[i].cmd, word, strlen(word))) { res = (*cmd[i].fun)(arg); break; } - + if (!cmd[i].cmd) /* dump our help-screen */ { printf("Unknown command: %s.\n", word); - cmd_help (""); + printf("use help for list of commands\n"); + /* cmd_help (""); */ res = 1; } - + if(apdu_file) fflush(apdu_file); if (res >= 2) wait_and_handle_responce(); - + if(apdu_file) fflush(apdu_file); if(marcdump) @@ -2798,42 +3161,38 @@ char ** readline_completer(char *text, int start, int end) { rl_attempted_completion_over = 1; return NULL; } - - if(start != strlen(word) +1 ) { - rl_attempted_completion_over = 1; - return 0; - } + for (i = 0; cmd[i].cmd; i++) { if (!strncmp(cmd[i].cmd, word, strlen(word))) { break; } } - - if(!cmd[i].cmd) return NULL; - - - curret_global_list = cmd[i].local_tabcompletes; - - completerToUse = cmd[i].rl_completerfunction; - if(completerToUse==NULL) /* if no pr. command completer is defined use the default completer */ - completerToUse = default_completer; - + + if(!cmd[i].cmd) return NULL; + + + curret_global_list = cmd[i].local_tabcompletes; + + completerToUse = cmd[i].rl_completerfunction; + if(completerToUse==NULL) /* if no pr. command completer is defined use the default completer */ + completerToUse = default_completer; + if(completerToUse) { #ifdef HAVE_READLINE_RL_COMPLETION_MATCHES char** res= rl_completion_matches(text, - completerToUse); + completerToUse); #else char** res= completion_matches(text, (CPFunction*)completerToUse); #endif - if(!cmd[i].complete_filenames) - rl_attempted_completion_over = 1; - return res; + if(!cmd[i].complete_filenames) + rl_attempted_completion_over = 1; + return res; } else { - if(!cmd[i].complete_filenames) - rl_attempted_completion_over = 1; + if(!cmd[i].complete_filenames) + rl_attempted_completion_over = 1; return 0; } } @@ -2914,19 +3273,19 @@ int main(int argc, char **argv) exit (1); } break; - case 'c': - strncpy (ccl_fields, arg, sizeof(ccl_fields)-1); - ccl_fields[sizeof(ccl_fields)-1] = '\0'; - break; + case 'c': + strncpy (ccl_fields, arg, sizeof(ccl_fields)-1); + ccl_fields[sizeof(ccl_fields)-1] = '\0'; + break; case 'a': if (!strcmp(arg, "-")) apdu_file=stderr; else apdu_file=fopen(arg, "a"); break; - case 'p': - yazProxy=strdup(arg); - break; + case 'p': + yazProxy=strdup(arg); + break; case 'u': if (!auth_command) { @@ -2973,10 +3332,11 @@ int main(int argc, char **argv) exit (0); } - /* * Local variables: - * tab-width: 4 + * tab-width: 8 * c-basic-offset: 4 * End: + * vim600: sw=4 ts=8 fdm=marker + * vim<600: sw=4 ts=8 */