X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fmarcdump.c;h=9adc5858c365da294ae50309e1ef425ae52beb9c;hb=ee3757af27a96aa388b76c8dbcc175c02d91a50e;hp=f6cc2acf774b1ee9eb93c639e505339803004c3a;hpb=191f86396f357a0d26df67ce6b7d9ccb23f3e207;p=yaz-moved-to-github.git

diff --git a/util/marcdump.c b/util/marcdump.c
index f6cc2ac..9adc585 100644
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -1,10 +1,28 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: marcdump.c,v $
- * Revision 1.5  1997-09-24 13:29:40  adam
+ * Revision 1.11  2000-07-04 08:53:22  adam
+ * Fixed bug.
+ *
+ * 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
  * Added verbose option -v to marcdump utility.
  *
  * Revision 1.4  1995/11/01 13:55:05  quinn
@@ -21,12 +39,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
@@ -42,7 +65,7 @@ int main (int argc, char **argv)
     int verbose = 0;
     FILE *inf;
     long file_size;
-    char *buf;
+    char *buf, *p;
     char *prog = *argv;
     int count = 0;
     int no = 0;
@@ -73,22 +96,22 @@ 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));
 		exit (1);
 	    }
-	    while ((ret = marc_display_ex (buf, stdout, verbose)) > 0)
+	    for (p = buf; (ret = marc_display_ex (p, stdout, verbose)) > 0;)
 	    {
-		buf += ret;
+		p += ret;
 		count++;
 	    }
 	    fclose (inf);