X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fadmin.c;h=b80591f71c530f23a844210f061a8583298aacac;hb=62b57dd7f9c0ee57788bbcfb1f81697900587027;hp=eaca6ecf410667b9e12b31778f9b7a89ebcebbcf;hpb=7a4064cd15f6c6b34c1180e1bc51f0d0e90da320;p=yaz-moved-to-github.git

diff --git a/client/admin.c b/client/admin.c
index eaca6ec..b80591f 100644
--- a/client/admin.c
+++ b/client/admin.c
@@ -1,9 +1,10 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 Index Data
  * See the file LICENSE for details.
- *
- * $Id: admin.c,v 1.24 2007-04-12 13:52:57 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -38,7 +39,7 @@ ODR getODROutputStream(void);
 extern char *databaseNames[];
 extern int num_databaseNames;
 
-int sendAdminES(int type, char* param1)
+static int sendAdminES(int type, char* param1)
 {
     ODR out = getODROutputStream();
     char *dbname = odr_strdup (out, databaseNames[0]);
@@ -47,17 +48,13 @@ int sendAdminES(int type, char* param1)
     Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest );
     Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
     Z_External *r;
-    int *oid;
+    Odr_oid *oid;
     Z_ESAdminOriginPartToKeep  *toKeep;
     Z_ESAdminOriginPartNotToKeep  *notToKeep;
     printf ("Admin request\n");
     fflush(stdout);
 
-    oid = yaz_string_to_oid_odr(yaz_oid_std(),
-                                CLASS_EXTSERV,
-                                OID_STR_ADMIN,
-                                out);
-
+    oid = odr_oiddup(out, yaz_oid_extserv_admin);
 
     req->packageType = oid;
     req->packageName = "1.Extendedserveq";
@@ -242,8 +239,14 @@ int cmd_adm_import(const char *arg)
                 
                 oct->len = oct->size = status.st_size;
                 oct->buf = (unsigned char *) odr_malloc (out, oct->size);
-                fread (oct->buf, 1, oct->size, inf);
-                fclose (inf);
+                if (fread(oct->buf, 1, oct->size, inf) != (size_t) oct->size)
+                {
+                    printf("Incomplete read of file %s\n", fname);
+                }
+                if (fclose(inf))
+                {
+                    printf("Close failed for file %s\n", fname);
+                }
                 
                 segment->segmentRecords[segment->num_segmentRecords++] = rec;
 
@@ -305,6 +308,7 @@ int cmd_adm_startup(const char *arg)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab