X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=util%2Fmarcdump.c;h=37c95462ca89ceade3c2676759de1329aeac1ed1;hb=ee171c36f5db3f64d42b840c247ac33f056d656d;hp=02507d4d5c66cfe51753c9a861e0939a5b97a201;hpb=62e356bd92b3ab4c97d82dfdce290ca84f0759ca;p=yaz-moved-to-github.git

diff --git a/util/marcdump.c b/util/marcdump.c
index 02507d4..37c9546 100644
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (c) 1995-1997, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: marcdump.c,v $
- * Revision 1.6  1997-12-12 06:32:33  adam
+ * Revision 1.10  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.9  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.8  1999/05/26 07:49:35  adam
+ * C++ compilation.
+ *
+ * Revision 1.7  1998/02/11 11:53:36  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.6  1997/12/12 06:32:33  adam
  * Added include of string.h.
  *
  * Revision 1.5  1997/09/24 13:29:40  adam
@@ -24,13 +36,17 @@
  *
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <marcdisp.h>
-#include <xmalloc.h>
-#include <options.h>
+#include <yaz/marcdisp.h>
+#include <yaz/xmalloc.h>
+#include <yaz/options.h>
 
 #ifndef SEEK_SET
 #define SEEK_SET 0
@@ -77,14 +93,14 @@ int main (int argc, char **argv)
 			 prog, arg, strerror (errno));
 		exit (1);
 	    }
-	    buf = xmalloc (file_size);
+	    buf = (char *)xmalloc (file_size);
 	    if (!buf)
 	    {
 		fprintf (stderr, "%s: cannot xmalloc: %s\n",
 			 prog, strerror (errno));
 		exit (1);
 	    }
-	    if (fread (buf, 1, file_size, inf) != file_size)
+	    if ((long) fread (buf, 1, file_size, inf) != file_size)
 	    {
 		fprintf (stderr, "%s: cannot read %s: %s\n",
 			 prog, arg, strerror (errno));