Fix rare SEGV in unix_addrstr with bad reference of UNIX socket path.

[yaz-moved-to-github.git] / client / client.c

diff --git a/client/client.c b/client/client.c
index 3eae707..94292d0 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.203 2003-07-18 19:54:30 mike Exp $
+ * $Id: client.c,v 1.208 2003-09-04 18:51:49 adam Exp $
  */
 
 #include <stdio.h>
@@ -343,10 +343,8 @@ static int process_initResponse(Z_InitResponse *res)
         {
             printf("Guessing visiblestring:\n");
             printf("'%s'\n", uif->u. octet_aligned->buf);
-        } else if (uif->which == Z_External_single
-// && oid_is(uif->direct_reference, "1.2.840.10003.10.1000.17.1")
-                  ) {
-           /* FirstSearch's crappy private init-diagnostic OID */
+        } else if (uif->which == Z_External_single) {
+           /* Peek at any private Init-diagnostic APDUs */
            Odr_any *sat = uif->u.single_ASN1_type;
            printf("### NAUGHTY: External is '%s'\n", sat->buf);
        }
@@ -406,6 +404,15 @@ static int process_initResponse(Z_InitResponse *res)
             
             yaz_get_response_charneg(session_mem, p, &charset, &lang,
                                      &selected);
+
+           if (outputCharset && negotiationCharset) {
+                   odr_set_charset (out, charset, outputCharset);
+                   odr_set_charset (in, outputCharset, charset);
+           }
+           else {
+                   odr_set_charset (out, 0, 0);
+                   odr_set_charset (in, 0, 0);
+           }
             
             printf("Accepted character set : %s\n", charset);
             printf("Accepted code language : %s\n", lang ? lang : "none");
@@ -592,9 +599,14 @@ int cmd_authentication(const char *arg)
     if (r == 1)
     {
         auth = &au;
-        au.which = Z_IdAuthentication_open;
-        au.u.open = user;
-       printf("Authentication set to Open (%s)\n", user);
+       if (!strcmp(user, "-")) {
+           au.which = Z_IdAuthentication_anonymous;
+           printf("Authentication set to Anonymous\n");
+       } else {
+           au.which = Z_IdAuthentication_open;
+           au.u.open = user;
+           printf("Authentication set to Open (%s)\n", user);
+       }
     }
     if (r == 2)
     {
@@ -1837,14 +1849,24 @@ static int only_z3950()
     return 0;
 }
 
+static int cmd_update_common(const char *arg, int version);
+
 static int cmd_update(const char *arg)
 {
+    return cmd_update_common(arg, 1);
+}
+
+static int cmd_update0(const char *arg)
+{
+    return cmd_update_common(arg, 0);
+}
+
+static int cmd_update_common(const char *arg, int version)
+{
     Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest );
     Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
     Z_External *r;
     int oid[OID_SIZE];
-    Z_IUOriginPartToKeep *toKeep;
-    Z_IUSuppliedRecords *notToKeep;
     oident update_oid;
     char action[20], recid[20], fname[80];
     int action_no;
@@ -1908,7 +1930,10 @@ static int cmd_update(const char *arg)
 
     update_oid.proto = PROTO_Z3950;
     update_oid.oclass = CLASS_EXTSERV;
-    update_oid.value = VAL_DBUPDATE;
+    if (version == 0)
+       update_oid.value = VAL_DBUPDATE0;
+    else
+       update_oid.value = VAL_DBUPDATE;
     oid_ent_to_oid (&update_oid, oid);
     req->packageType = odr_oiddup(out,oid);
     req->packageName = esPackageName;
@@ -1920,41 +1945,90 @@ static int cmd_update(const char *arg)
     r->direct_reference = odr_oiddup(out,oid);
     r->indirect_reference = 0;
     r->descriptor = 0;
-    r->which = Z_External_update;
-    r->u.update = (Z_IUUpdate *) odr_malloc(out, sizeof(*r->u.update));
-    r->u.update->which = Z_IUUpdate_esRequest;
-    r->u.update->u.esRequest = (Z_IUUpdateEsRequest *)
-        odr_malloc(out, sizeof(*r->u.update->u.esRequest));
-    toKeep = r->u.update->u.esRequest->toKeep = (Z_IUOriginPartToKeep *)
-        odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep));
-    toKeep->databaseName = databaseNames[0];
-    toKeep->schema = 0;
-    toKeep->elementSetName = 0;
-    toKeep->actionQualifier = 0;
-    toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
-    *toKeep->action = action_no;
-
-    notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *)
-        odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep));
-    notToKeep->num = 1;
-    notToKeep->elements = (Z_IUSuppliedRecords_elem **)
-        odr_malloc(out, sizeof(*notToKeep->elements));
-    notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *)
-        odr_malloc(out, sizeof(**notToKeep->elements));
-    notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
-    if (*recid)
-    {
-        notToKeep->elements[0]->u.opaque = (Odr_oct *)
-            odr_malloc (out, sizeof(Odr_oct));
-        notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid;
-        notToKeep->elements[0]->u.opaque->size = strlen(recid);
-        notToKeep->elements[0]->u.opaque->len = strlen(recid);
+    if (version == 0)
+    {
+       Z_IU0OriginPartToKeep *toKeep;
+       Z_IU0SuppliedRecords *notToKeep;
+
+       r->which = Z_External_update0;
+       r->u.update0 = (Z_IU0Update *) odr_malloc(out, sizeof(*r->u.update0));
+       r->u.update0->which = Z_IUUpdate_esRequest;
+       r->u.update0->u.esRequest = (Z_IU0UpdateEsRequest *)
+           odr_malloc(out, sizeof(*r->u.update0->u.esRequest));
+       toKeep = r->u.update0->u.esRequest->toKeep = (Z_IU0OriginPartToKeep *)
+           odr_malloc(out, sizeof(*r->u.update0->u.esRequest->toKeep));
+       
+       toKeep->databaseName = databaseNames[0];
+       toKeep->schema = 0;
+       toKeep->elementSetName = 0;
+
+       toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
+       *toKeep->action = action_no;
+       
+       notToKeep = r->u.update0->u.esRequest->notToKeep = (Z_IU0SuppliedRecords *)
+           odr_malloc(out, sizeof(*r->u.update0->u.esRequest->notToKeep));
+       notToKeep->num = 1;
+       notToKeep->elements = (Z_IU0SuppliedRecords_elem **)
+           odr_malloc(out, sizeof(*notToKeep->elements));
+       notToKeep->elements[0] = (Z_IU0SuppliedRecords_elem *)
+           odr_malloc(out, sizeof(**notToKeep->elements));
+       notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
+       if (*recid)
+       {
+           notToKeep->elements[0]->u.opaque = (Odr_oct *)
+               odr_malloc (out, sizeof(Odr_oct));
+           notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid;
+           notToKeep->elements[0]->u.opaque->size = strlen(recid);
+           notToKeep->elements[0]->u.opaque->len = strlen(recid);
+       }
+       else
+           notToKeep->elements[0]->u.opaque = 0;
+       notToKeep->elements[0]->supplementalId = 0;
+       notToKeep->elements[0]->correlationInfo = 0;
+       notToKeep->elements[0]->record = record_this;
     }
     else
-        notToKeep->elements[0]->u.opaque = 0;
-    notToKeep->elements[0]->supplementalId = 0;
-    notToKeep->elements[0]->correlationInfo = 0;
-    notToKeep->elements[0]->record = record_this;
+    {
+       Z_IUOriginPartToKeep *toKeep;
+       Z_IUSuppliedRecords *notToKeep;
+
+       r->which = Z_External_update;
+       r->u.update = (Z_IUUpdate *) odr_malloc(out, sizeof(*r->u.update));
+       r->u.update->which = Z_IUUpdate_esRequest;
+       r->u.update->u.esRequest = (Z_IUUpdateEsRequest *)
+           odr_malloc(out, sizeof(*r->u.update->u.esRequest));
+       toKeep = r->u.update->u.esRequest->toKeep = (Z_IUOriginPartToKeep *)
+           odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep));
+       
+       toKeep->databaseName = databaseNames[0];
+       toKeep->schema = 0;
+       toKeep->elementSetName = 0;
+       toKeep->actionQualifier = 0;
+       toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
+       *toKeep->action = action_no;
+
+       notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *)
+           odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep));
+       notToKeep->num = 1;
+       notToKeep->elements = (Z_IUSuppliedRecords_elem **)
+           odr_malloc(out, sizeof(*notToKeep->elements));
+       notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *)
+           odr_malloc(out, sizeof(**notToKeep->elements));
+       notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
+       if (*recid)
+       {
+           notToKeep->elements[0]->u.opaque = (Odr_oct *)
+               odr_malloc (out, sizeof(Odr_oct));
+           notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid;
+           notToKeep->elements[0]->u.opaque->size = strlen(recid);
+           notToKeep->elements[0]->u.opaque->len = strlen(recid);
+       }
+       else
+           notToKeep->elements[0]->u.opaque = 0;
+       notToKeep->elements[0]->supplementalId = 0;
+       notToKeep->elements[0]->correlationInfo = 0;
+       notToKeep->elements[0]->record = record_this;
+    }
     
     send_apdu(apdu);
 
@@ -2759,16 +2833,7 @@ int cmd_charset(const char* arg)
         else
             printf ("Output charset conversion disabled\n");
     } 
-    if (outputCharset && negotiationCharset)
-    {
-        odr_set_charset (out, negotiationCharset, outputCharset);
-        odr_set_charset (in, outputCharset, negotiationCharset);
-    }
-    else
-    {
-        odr_set_charset (out, 0, 0);
-        odr_set_charset (in, 0, 0);
-    }
+
     return 1;
 }
 
@@ -3583,6 +3648,7 @@ static struct {
     {"refid", cmd_refid, "<id>",NULL,0,NULL},
     {"itemorder", cmd_itemorder, "ill|item <itemno>",NULL,0,NULL},
     {"update", cmd_update, "<action> <recid> [<file>]",NULL,0,NULL},
+    {"update0", cmd_update0, "<action> <recid> [<file>]",NULL,0,NULL},
     {"packagename", cmd_packagename, "<packagename>",NULL,0,NULL},
     {"proxy", cmd_proxy, "[('tcp'|'ssl')]<host>[':'<port>]",NULL,0,NULL},
     {"charset", cmd_charset, "<nego_charset> <output_charset>",NULL,0,NULL},