X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=602dde830c226def1e01d04b30aa8b08d89835cd;hb=d2fc23a41ae7eb6bd5f6e76a45530ede776bd018;hp=001e0ad7afaf7c29da584b6f67d9ea9405bd66d0;hpb=2b3dd45defce5c722aea0d5cecfbd8db7df55818;p=yaz-moved-to-github.git

diff --git a/client/client.c b/client/client.c
index 001e0ad..602dde8 100644
--- a/client/client.c
+++ b/client/client.c
@@ -1,20 +1,33 @@
 /* 
- * Copyright (c) 1995-2005, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.267 2005-01-11 12:07:55 adam Exp $
+ * $Id: client.c,v 1.272 2005-01-27 09:05:09 adam Exp $
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <time.h>
+#include <ctype.h>
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #if HAVE_LOCALE_H
 #include <locale.h>
 #endif
-
 #if HAVE_LANGINFO_H
 #include <langinfo.h>
 #endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 
 #if HAVE_OPENSSL_SSL_H
 #include <openssl/bio.h>
@@ -25,15 +38,12 @@
 #include <openssl/err.h>
 #endif
 
-#include <time.h>
-#include <ctype.h>
-
 #ifdef WIN32
+#include <sys/stat.h>
 #include <io.h>
+#include <windows.h>
 #define S_ISREG(x) (x & _S_IFREG)
 #define S_ISDIR(x) (x & _S_IFDIR)
-#else
-#include <unistd.h>
 #endif
 
 #include <yaz/yaz-util.h>
@@ -62,7 +72,6 @@
 #include <readline/history.h>
 #endif
 
-#include <sys/stat.h>
 
 #include "admin.h"
 #include "tabcomplete.h"
@@ -377,14 +386,18 @@ static int process_initResponse(Z_InitResponse *res)
 	    render_initUserInfo(uif->u.userInfo1);
 	} else {
 	    printf("UserInformationfield:\n");
-	    if (!z_External(print, (Z_External**)&uif, 0, 0)) {
+	    if (!z_External(print, (Z_External**)&uif, 0, 0))
+	    {
 		odr_perror(print, "Printing userinfo\n");
 		odr_reset(print);
 	    }
 	    if (uif->which == Z_External_octet) {
 		printf("Guessing visiblestring:\n");
-		printf("'%s'\n", uif->u. octet_aligned->buf);
-	    } else if (uif->which == Z_External_single) {
+		printf("'%.*s'\n", uif->u.octet_aligned->len,
+		       uif->u.octet_aligned->buf);
+	    }
+	    else if (uif->which == Z_External_single) 
+	    {
 		Odr_any *sat = uif->u.single_ASN1_type;
 		oident *oid = oid_getentbyoid(uif->direct_reference);
 		if (oid->value == VAL_OCLCUI) {
@@ -402,7 +415,8 @@ static int process_initResponse(Z_InitResponse *res)
 		else
 		{
 		    /* Peek at any private Init-diagnostic APDUs */
-		    printf("### NAUGHTY: External is '%.*s'\n", sat->len, sat->buf);
+		    printf("### NAUGHTY: External is '%.*s'\n",
+			   sat->len, sat->buf);
 		}
 	    }
 	    odr_reset (print);
@@ -456,11 +470,20 @@ static void render_initUserInfo(Z_OtherInformation *ui1) {
 	Z_OtherInformationUnit *unit = ui1->list[i];
 	printf("  %d: otherInfo unit contains ", i+1);
 	if (unit->which == Z_OtherInfo_externallyDefinedInfo &&
+	    unit->information.externallyDefinedInfo &&
 	    unit->information.externallyDefinedInfo->which ==
 	    Z_External_diag1) {
 	    render_diag(unit->information.externallyDefinedInfo->u.diag1);
-	} else {
-	    printf("unsupported otherInfo unit type %d\n", unit->which);
+	} 
+	else if (unit->which != Z_OtherInfo_externallyDefinedInfo)
+	{
+	    printf("unsupported otherInfo unit->which = %d\n", unit->which);
+	}
+	else 
+	{
+	    printf("unsupported otherInfo unit external %d\n",
+		   unit->information.externallyDefinedInfo ? 
+		   unit->information.externallyDefinedInfo->which : -2);
 	}
     }
 }