X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=66dc48e131f9f82e9173053a7402befe40af3e6e;hp=f1537008ccd9d40b98077f3333133bd07d053d7d;hb=79bf9f1b8b224b6b7323b280fca704591ac17324;hpb=4ae699c927bc26f3550d1a8ca911e8d1fe75dbfc diff --git a/client/client.c b/client/client.c index f153700..66dc48e 100644 --- a/client/client.c +++ b/client/client.c @@ -1,10 +1,87 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1997, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.29 1996-01-02 08:57:25 quinn + * Revision 1.53 1997-09-29 13:18:59 adam + * Added function, oid_ent_to_oid, to replace the function + * oid_getoidbyent, which is not thread safe. + * + * Revision 1.52 1997/09/29 07:20:31 adam + * Client code uses nmem_init. + * + * Revision 1.51 1997/09/26 09:41:55 adam + * Updated client to handle multiple diagnostics. + * + * Revision 1.50 1997/09/17 12:10:29 adam + * YAZ version 1.4. + * + * Revision 1.49 1997/09/04 13:45:17 adam + * Added UNImarc to list of available syntaxes. + * + * Revision 1.48 1997/09/01 08:48:44 adam + * New windows NT/95 port using MSV5.0. Only a few changes made + * to avoid warnings. Sub project created: client.dsp. + * + * Revision 1.47 1997/07/01 13:49:56 adam + * Take care of case when invalid target is specified on command line. + * + * Revision 1.46 1997/06/23 10:30:18 adam + * Added call to ccl_rpn_delete in search. Added ODR stream "out" + * as parameter to ccl_rpn_query to release RPN query. + * + * Revision 1.45 1997/05/14 06:53:29 adam + * C++ support. + * + * Revision 1.44 1997/05/05 11:20:35 adam + * Client uses "options" utility and marc dump filename may be specified + * as an option (-m ). + * + * Revision 1.43 1996/11/08 11:03:26 adam + * Client accepts multiple database names. + * + * Revision 1.42 1996/10/08 10:44:57 quinn + * Resolved conflicts. + * + * Revision 1.41 1996/10/07 15:29:03 quinn + * Work + * + * Revision 1.40 1996/08/29 14:19:34 quinn + * Fixed conflict (CVS) + * + * Revision 1.39 1996/08/27 10:43:22 quinn + * Made select() optional + * + * Revision 1.38 1996/08/12 14:09:11 adam + * Default prefix query attribute set defined by using p_query_attset. + * + * Revision 1.37 1996/07/06 19:58:29 quinn + * System headerfiles gathered in yconfig + * + * Revision 1.36 1996/06/10 08:53:47 quinn + * Added Summary + * + * Revision 1.35 1996/06/03 09:45:50 quinn + * Added display of OIDs in the GRS routine. + * + * Revision 1.34 1996/05/09 07:26:49 quinn + * *** empty log message *** + * + * Revision 1.33 1996/05/09 07:25:22 quinn + * Small + * + * Revision 1.32 1996/03/15 11:05:33 adam + * The user can set the preferred query type (prefix, ccl, ..) with the + * querytype command. + * + * Revision 1.31 1996/02/20 12:51:54 quinn + * Fixed problems with EXTERNAL. + * + * Revision 1.30 1996/02/12 18:18:09 quinn + * Fidgeting. + * + * Revision 1.29 1996/01/02 08:57:25 quinn * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass * * Revision 1.28 1995/12/14 11:09:31 quinn @@ -99,17 +176,11 @@ * to illustrate the use of the YAZ service-level API. */ +#include #include #include -#ifdef WINDOWS #include -#else -#include -#endif #include -#ifdef _AIX -#include -#endif #include #include @@ -120,21 +191,21 @@ #include #include #include +#include -#ifdef RPN_QUERY -#ifdef PREFIX_QUERY #include -#else + +#if CCL2RPN #include #endif -#endif #define C_PROMPT "Z> " static ODR out, in, print; /* encoding and decoding streams */ static COMSTACK conn = 0; /* our z-association */ static Z_IdAuthentication *auth = 0; /* our current auth definition */ -static char database[512] = "Default"; /* Database name */ +static char *databaseNames[128]; +static int num_databaseNames = 0; static int setnumber = 0; /* current result set number */ static int smallSetUpperBound = 0; static int largeSetLowerBound = 1; @@ -144,17 +215,23 @@ static int setno = 1; /* current set offset */ static int protocol = PROTO_Z3950; /* current app protocol */ static int recordsyntax = VAL_USMARC; static int sent_close = 0; -static ODR_MEM session_mem; /* memory handle for init-response */ -static Z_InitResponse *session = 0; /* session parameters */ +static ODR_MEM session_mem; /* memory handle for init-response */ +static Z_InitResponse *session = 0; /* session parameters */ static char last_scan[512] = "0"; static char last_cmd[100] = "?"; -static oid_value attributeset = VAL_BIB1; +static FILE *marcdump = 0; -#ifdef RPN_QUERY -#ifndef PREFIX_QUERY +typedef enum { + QueryType_Prefix, + QueryType_CCL, + QueryType_CCL2RPN +} QueryType; + +static QueryType queryType = QueryType_Prefix; + +#if CCL2RPN static CCL_bibset bibset; /* CCL bibset handle */ #endif -#endif static void send_apdu(Z_APDU *a) { @@ -167,7 +244,7 @@ static void send_apdu(Z_APDU *a) exit(1); } buf = odr_getbuf(out, &len, 0); - odr_reset(out); /* release the APDU */ + odr_reset(out); /* release the APDU structure */ if (cs_put(conn, buf, len) < 0) { fprintf(stderr, "cs_put: %s", cs_errmsg(cs_errno(conn))); @@ -250,39 +327,34 @@ int cmd_open(char *arg) fprintf(stderr, "Usage: open (osi|tcp) ':' [tsel '/']host[':'port]\n"); return 0; } + if (!strcmp(type, "tcp")) + { + t = tcpip_type; + protocol = PROTO_Z3950; + } + else #ifdef USE_XTIMOSI if (!strcmp(type, "osi")) { - if (!(add = mosi_strtoaddr(addr))) - { - perror(arg); - return 0; - } t = mosi_type; protocol = PROTO_SR; } else #endif - if (!strcmp(type, "tcp")) - { - if (!(add = tcpip_strtoaddr(addr))) - { - perror(arg); - return 0; - } - t = tcpip_type; - protocol = PROTO_Z3950; - } - else { - fprintf(stderr, "Bad type: %s\n", type); - return 0; + fprintf(stderr, "Bad type: %s\n", type); + return 0; } if (!(conn = cs_create(t, 1, protocol))) { perror("cs_create"); return 0; } + if (!(add = cs_straddr(conn, addr))) + { + perror(arg); + return 0; + } printf("Connecting..."); fflush(stdout); if (cs_connect(conn, add) < 0) @@ -323,7 +395,7 @@ static void display_variant(Z_Variant *v, int level) for (i = 0; i < v->num_triples; i++) { - printf("%*sclass=%d,type=%d", level * 4, "", *v->triples[i]->class, + printf("%*sclass=%d,type=%d", level * 4, "", *v->triples[i]->zclass, *v->triples[i]->type); if (v->triples[i]->which == Z_Triple_internationalString) printf(",value=%s\n", v->triples[i]->value.internationalString); @@ -362,6 +434,21 @@ static void display_grs1(Z_GenericRecord *r, int level) printf("%s\n", t->content->u.string); else if (t->content->which == Z_ElementData_numeric) printf("%d\n", *t->content->u.numeric); + else if (t->content->which == Z_ElementData_oid) + { + int *ip = t->content->u.oid; + oident *oent; + + if ((oent = oid_getentbyoid(t->content->u.oid))) + printf("OID: %s\n", oent->desc); + else + { + printf("{"); + while (ip && *ip >= 0) + printf(" %d", *(ip++)); + printf(" }\n"); + } + } else if (t->content->which == Z_ElementData_noDataRequested) printf("[No data requested]\n"); else if (t->content->which == Z_ElementData_elementEmpty) @@ -391,6 +478,9 @@ static void display_record(Z_DatabaseRecord *p) Z_External *r = (Z_External*) p; oident *ent = oid_getentbyoid(r->direct_reference); + /* + * Tell the user what we got. + */ if (r->direct_reference) { printf("Record type: "); @@ -402,8 +492,47 @@ static void display_record(Z_DatabaseRecord *p) odr_reset(print); } } - if (r->which == Z_External_octet && p->u.octet_aligned->len) - marc_display ((char*)p->u.octet_aligned->buf, stdout); + + /* Check if this is a known, ASN.1 type tucked away in an octet string */ + if (ent && r->which == Z_External_octet) + { + Z_ext_typeent *type = z_ext_getentbyref(ent->value); + void *rr; + + if (type) + { + /* + * Call the given decoder to process the record. + */ + odr_setbuf(in, (char*)p->u.octet_aligned->buf, + p->u.octet_aligned->len, 0); + if (!(*type->fun)(in, &rr, 0)) + { + odr_perror(in, "Decoding constructed record."); + fprintf(stderr, "[Near %d]\n", odr_offset(in)); + fprintf(stderr, "Packet dump:\n---------\n"); + odr_dumpBER(stderr, (char*)p->u.octet_aligned->buf, + p->u.octet_aligned->len); + fprintf(stderr, "---------\n"); + exit(1); + } + /* + * Note: we throw away the original, BER-encoded record here. + * Do something else with it if you want to keep it. + */ + r->u.sutrs = rr; /* we don't actually check the type here. */ + r->which = type->what; + } + } + if (ent->value == VAL_SOIF) + printf("%.*s", r->u.octet_aligned->len, r->u.octet_aligned->buf); + else if (r->which == Z_External_octet && p->u.octet_aligned->len) + { + const char *marc_buf = (char*)p->u.octet_aligned->buf; + marc_display (marc_buf, NULL); + if (marcdump) + fwrite (marc_buf, strlen (marc_buf), 1, marcdump); + } else if (ent->value == VAL_SUTRS) { if (r->which != Z_External_sutrs) @@ -433,41 +562,42 @@ static void display_record(Z_DatabaseRecord *p) } } -static void display_diagrec(Z_DiagRec *p) + +static void display_diagrecs(Z_DiagRec **pp, int num) { + int i; oident *ent; -#ifdef Z_95 Z_DefaultDiagFormat *r; -#else - Z_DiagRec *r = p; -#endif - printf("Diagnostic message from database:\n"); -#ifdef Z_95 - if (p->which != Z_DiagRec_defaultFormat) + printf("Diagnostic message(s) from database:\n"); + for (i = 0; iwhich != Z_DiagRec_defaultFormat) + { + printf("Diagnostic record not in default format.\n"); + return; + } + else + r = p->u.defaultFormat; + if (!(ent = oid_getentbyoid(r->diagnosticSetId)) || + ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1) + printf("Missing or unknown diagset\n"); + printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition)); + if (r->addinfo && *r->addinfo) + printf(" -- '%s'\n", r->addinfo); + else + printf("\n"); } - else - r = p->u.defaultFormat; -#endif - if (!(ent = oid_getentbyoid(r->diagnosticSetId)) || - ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1) - printf("Missing or unknown diagset\n"); - printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition)); - if (r->addinfo && *r->addinfo) - printf(" -- %s\n", r->addinfo); - else - printf("\n"); } + static void display_nameplusrecord(Z_NamePlusRecord *p) { if (p->databaseName) printf("[%s]", p->databaseName); if (p->which == Z_NamePlusRecord_surrogateDiagnostic) - display_diagrec(p->u.surrogateDiagnostic); + display_diagrecs(&p->u.surrogateDiagnostic, 1); else display_record(p->u.databaseRecord); } @@ -477,8 +607,11 @@ static void display_records(Z_Records *p) int i; if (p->which == Z_Records_NSD) - display_diagrec(p->u.nonSurrogateDiagnostic); - else + display_diagrecs (&p->u.nonSurrogateDiagnostic, 1); + else if (p->which == Z_Records_multipleNSD) + display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs, + p->u.multipleNonSurDiagnostics->num_diagRecs); + else { printf("Records: %d\n", p->u.databaseOrSurDiagnostics->num_records); for (i = 0; i < p->u.databaseOrSurDiagnostics->num_records; i++) @@ -490,32 +623,28 @@ static int send_searchRequest(char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest); Z_SearchRequest *req = apdu->u.searchRequest; - char *databaseNames = database; Z_Query query; -#ifdef RPN_QUERY -#ifndef PREFIX_QUERY + int oid[OID_SIZE]; +#if CCL2RPN struct ccl_rpn_node *rpn; int error, pos; -#endif + oident bib1; #endif char setstring[100]; -#ifdef RPN_QUERY Z_RPNQuery *RPNquery; - oident bib1; -#else Odr_oct ccl_query; -#endif -#ifdef RPN_QUERY -#ifndef PREFIX_QUERY - rpn = ccl_find_str(bibset, arg, &error, &pos); - if (error) +#if CCL2RPN + if (queryType == QueryType_CCL2RPN) { - printf("CCL ERROR: %s\n", ccl_err_msg(error)); - return 0; + rpn = ccl_find_str(bibset, arg, &error, &pos); + if (error) + { + printf("CCL ERROR: %s\n", ccl_err_msg(error)); + return 0; + } } #endif -#endif if (!strcmp(arg, "@big")) /* strictly for troublemaking */ { @@ -541,44 +670,55 @@ static int send_searchRequest(char *arg) mediumSetPresentNumber > 0)) { oident prefsyn; + int oid[OID_SIZE]; prefsyn.proto = protocol; prefsyn.oclass = CLASS_RECSYN; prefsyn.value = recordsyntax; - req->preferredRecordSyntax = odr_oiddup(out, oid_getoidbyent(&prefsyn)); + req->preferredRecordSyntax = + odr_oiddup(out, oid_ent_to_oid(&prefsyn, oid)); req->smallSetElementSetNames = req->mediumSetElementSetNames = elementSetNames; } - req->num_databaseNames = 1; - req->databaseNames = &databaseNames; + req->num_databaseNames = num_databaseNames; + req->databaseNames = databaseNames; req->query = &query; -#ifdef RPN_QUERY - query.which = Z_Query_type_1; - -#ifndef PREFIX_QUERY - assert((RPNquery = ccl_rpn_query(rpn))); -#else - RPNquery = p_query_rpn (out, arg); - if (!RPNquery) + switch (queryType) { - printf("Prefix query error\n"); + case QueryType_Prefix: + query.which = Z_Query_type_1; + RPNquery = p_query_rpn (out, protocol, arg); + if (!RPNquery) + { + printf("Prefix query error\n"); + return 0; + } + query.u.type_1 = RPNquery; + break; + case QueryType_CCL: + query.which = Z_Query_type_2; + query.u.type_2 = &ccl_query; + ccl_query.buf = (unsigned char*) arg; + ccl_query.len = strlen(arg); + break; +#if CCL2RPN + case QueryType_CCL2RPN: + query.which = Z_Query_type_1; + assert((RPNquery = ccl_rpn_query(out, rpn))); + bib1.proto = protocol; + bib1.oclass = CLASS_ATTSET; + bib1.value = VAL_BIB1; + RPNquery->attributeSetId = oid_ent_to_oid(&bib1, oid); + query.u.type_1 = RPNquery; + ccl_rpn_delete (rpn); + break; +#endif + default: + printf ("Unsupported query type\n"); return 0; } -#endif - bib1.proto = protocol; - bib1.oclass = CLASS_ATTSET; - bib1.value = VAL_BIB1; - RPNquery->attributeSetId = oid_getoidbyent(&bib1); - query.u.type_1 = RPNquery; -#else - query.which = Z_Query_type_2; - query.u.type_2 = &ccl_query; - ccl_query.buf = (unsigned char*) arg; - ccl_query.len = strlen(arg); -#endif - send_apdu(apdu); setno = 1; printf("Sent searchRequest.\n"); @@ -649,12 +789,30 @@ static int cmd_status(char *arg) static int cmd_base(char *arg) { + int i; + char *cp; + if (!*arg) { - printf("Usage: base \n"); + printf("Usage: base ...\n"); return 0; } - strcpy(database, arg); + for (i = 0; iresultSetId = setstring; } + + +#if 0 + if (1) + { + static Z_Range range; + static Z_Range *rangep = ⦥ + req->num_ranges = 1; +#endif req->resultSetStartPoint = &setno; req->numberOfRecordsRequested = &nos; prefsyn.proto = protocol; prefsyn.oclass = CLASS_RECSYN; prefsyn.value = recordsyntax; - req->preferredRecordSyntax = oid_getoidbyent(&prefsyn); + req->preferredRecordSyntax = oid_ent_to_oid(&prefsyn, oid); + if (elementSetNames) { req->recordComposition = &compo; @@ -758,6 +927,7 @@ int cmd_quit(char *arg) { printf("See you later, alligator.\n"); exit(0); + return 0; } int cmd_cancel(char *arg) @@ -765,7 +935,7 @@ int cmd_cancel(char *arg) Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest); Z_TriggerResourceControlRequest *req = apdu->u.triggerResourceControlRequest; - bool_t false = 0; + bool_t rfalse = 0; if (!session) { @@ -778,7 +948,7 @@ int cmd_cancel(char *arg) return 0; } *req->requestedAction = Z_TriggerResourceCtrl_cancel; - req->resultSetWanted = &false; + req->resultSetWanted = &rfalse; send_apdu(apdu); printf("Sent cancel request\n"); @@ -789,16 +959,11 @@ int send_scanrequest(char *string, int pp, int num) { Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest); Z_ScanRequest *req = apdu->u.scanRequest; - char *db = database; - oident attset; - - req->num_databaseNames = 1; - req->databaseNames = &db; - attset.proto = protocol; - attset.oclass = CLASS_ATTSET; - attset.value = VAL_BIB1; - req->attributeSet = oid_getoidbyent(&attset); - req->termListAndStartPoint = p_query_scan(out, string); + + req->num_databaseNames = num_databaseNames; + req->databaseNames = databaseNames; + req->termListAndStartPoint = p_query_scan(out, protocol, + &req->attributeSet, string); req->numberOfTermsRequested = # req->preferredPositionInResponse = &pp; send_apdu(apdu); @@ -839,10 +1004,11 @@ void process_scanResponse(Z_ScanResponse *res) display_term(ent->entries[i]->u.termInfo); } else - display_diagrec(ent->entries[i]->u.surrogateDiagnostic); + display_diagrecs(&ent->entries[i]->u.surrogateDiagnostic, 1); } else - display_diagrec(res->entries->u.nonSurrogateDiagnostics->diagRecs[0]); + display_diagrecs(&res->entries-> + u.nonSurrogateDiagnostics->diagRecs[0], 1); } int cmd_scan(char *arg) @@ -875,41 +1041,13 @@ int cmd_format(char *arg) printf("Usage: format \n"); return 0; } - if (!strcmp(arg, "sutrs")) + recordsyntax = oid_getvalbyname (arg); + if (recordsyntax == VAL_NONE) { - printf("Preferred format is SUTRS.\n"); - recordsyntax = VAL_SUTRS; - return 1; - } - else if (!strcmp(arg, "usmarc")) - { - printf("Preferred format is USMARC\n"); - recordsyntax = VAL_USMARC; - return 1; - } - else if (!strcmp(arg, "danmarc")) - { - printf("Preferred format is DANMARC\n"); - recordsyntax = VAL_DANMARC; - return 1; - } - else if (!strcmp(arg, "grs1")) - { - printf("Preferred format is GRS1\n"); - recordsyntax = VAL_GRS1; - return 1; - } - else if (!strcmp(arg, "explain")) - { - printf("Preferred format is Explain\n"); - recordsyntax = VAL_EXPLAIN; - return 1; - } - else - { - printf("Specify one of {sutrs,usmarc,danmarc,grs1}.\n"); + printf ("unknown record syntax\n"); return 0; } + return 1; } int cmd_elements(char *arg) @@ -932,7 +1070,6 @@ int cmd_elements(char *arg) int cmd_attributeset(char *arg) { char what[100]; - oid_value v; if (!arg || !*arg) { @@ -940,12 +1077,34 @@ int cmd_attributeset(char *arg) return 0; } sscanf(arg, "%s", what); - if ((v = oid_getvalbyname(what)) == VAL_NONE) + if (p_query_attset (what)) { printf("Unknown attribute set name\n"); return 0; } - attributeset = v; + return 1; +} + +int cmd_querytype (char *arg) +{ + if (!strcmp (arg, "ccl")) + queryType = QueryType_CCL; + else if (!strcmp (arg, "prefix")) + queryType = QueryType_Prefix; +#if CCL2RPN + else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn")) + queryType = QueryType_CCL2RPN; +#endif + else + { + printf ("Querytype must be one of:\n"); + printf (" prefix - Prefix query\n"); + printf (" ccl - CCL query\n"); +#if CCL2RPN + printf (" ccl2rpn - CCL query converted to RPN\n"); +#endif + return 0; + } return 1; } @@ -963,12 +1122,10 @@ int cmd_close(char *arg) static void initialize(void) { -#ifdef RPN_QUERY -#ifndef PREFIX_QUERY +#if CCL2RPN FILE *inf; #endif -#endif - + nmem_init(); if (!(out = odr_createmem(ODR_ENCODE)) || !(in = odr_createmem(ODR_DECODE)) || !(print = odr_createmem(ODR_PRINT))) @@ -978,8 +1135,7 @@ static void initialize(void) } setvbuf(stdout, 0, _IONBF, 0); -#ifdef RPN_QUERY -#ifndef PREFIX_QUERY +#if CCL2RPN bibset = ccl_qual_mk (); inf = fopen ("default.bib", "r"); if (inf) @@ -988,23 +1144,22 @@ static void initialize(void) fclose (inf); } #endif -#endif } -static int client(void) +static int client(int wait) { static struct { char *cmd; int (*fun)(char *arg); char *ad; } cmd[] = { - {"open", cmd_open, "('tcp'|'osi')':'['/'][':']"}, + {"open", cmd_open, "('tcp'|'osi')':'['/'][':']"}, {"quit", cmd_quit, ""}, - {"find", cmd_find, ""}, - {"base", cmd_base, ""}, - {"show", cmd_show, "['+'<#RECS>]"}, - {"scan", cmd_scan, ""}, - {"authentication", cmd_authentication, ""}, + {"find", cmd_find, ""}, + {"base", cmd_base, ""}, + {"show", cmd_show, "['+'<#recs>]"}, + {"scan", cmd_scan, ""}, + {"authentication", cmd_authentication, ""}, {"lslb", cmd_lslb, ""}, {"ssub", cmd_ssub, ""}, {"mspn", cmd_mspn, ""}, @@ -1015,6 +1170,7 @@ static int client(void) {"elements", cmd_elements, ""}, {"close", cmd_close, ""}, {"attributeset", cmd_attributeset, ""}, + {"querytype", cmd_querytype, ""}, {0,0} }; char *netbuffer= 0; @@ -1025,9 +1181,12 @@ static int client(void) while (1) { int res; +#ifdef USE_SELECT fd_set input; +#endif char line[1024], word[1024], arg[1024]; +#ifdef USE_SELECT FD_ZERO(&input); FD_SET(0, &input); if (conn) @@ -1039,7 +1198,10 @@ static int client(void) } if (!res) continue; - if (FD_ISSET(0, &input)) + if (!wait && FD_ISSET(0, &input)) +#else + if (!wait) +#endif { /* quick & dirty way to get a command line. */ if (!gets(line)) @@ -1067,9 +1229,14 @@ static int client(void) res = 1; } if (res < 2) + { printf(C_PROMPT); + continue; + } } +#ifdef USE_SELECT if (conn && FD_ISSET(cs_fileno(conn), &input)) +#endif { do { @@ -1136,16 +1303,43 @@ static int client(void) } while (cs_more(conn)); } + wait = 0; } return 0; } int main(int argc, char **argv) { + char *prog = *argv; + char *arg; + int ret; + int opened = 0; + initialize(); - if (argc > 1) - cmd_open(argv[1]); - else - printf(C_PROMPT); - return client(); + cmd_base("Default"); + + while ((ret = options("m:", argv, argc, &arg)) != -2) + { + switch (ret) + { + case 0: + if (cmd_open (arg) == 2) + opened = 1; + break; + case 'm': + if (!(marcdump = fopen (arg, "a"))) + { + perror (arg); + exit (1); + } + break; + default: + fprintf (stderr, "Usage: %s [-m ] []\n", + prog); + exit (1); + } + } + if (!opened) + printf (C_PROMPT); + return client (opened); }