projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tcpip comstack: increase max recv to 128 MB
[yaz-moved-to-github.git]
/
client
/
admin.c
diff --git
a/client/admin.c
b/client/admin.c
index
16528ba
..
b80591f
100644
(file)
--- 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.
* See the file LICENSE for details.
- *
- * $Id: admin.c,v 1.26 2007-05-08 08:22:35 adam Exp $
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-38,7
+39,7
@@
ODR getODROutputStream(void);
extern char *databaseNames[];
extern int num_databaseNames;
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]);
{
ODR out = getODROutputStream();
char *dbname = odr_strdup (out, databaseNames[0]);
@@
-238,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);
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;
segment->segmentRecords[segment->num_segmentRecords++] = rec;
@@
-301,6
+308,7
@@
int cmd_adm_startup(const char *arg)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab