X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fmarcdump.c;h=272492b04403a817b5a128f2240c830e4c18bbda;hp=023de27b651d2b3cf728079625a487badd5549ec;hb=b440dce0831a72bebe4f4821ab7771cc05e8facb;hpb=8c0d9ab51d716e170e6185dbfeb9462d91fb1a06

diff --git a/util/marcdump.c b/util/marcdump.c
index 023de27..272492b 100644
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -1,10 +1,28 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-1997, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: marcdump.c,v $
- * Revision 1.2  1995-05-15 11:56:56  quinn
+ * 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
+ * Minor adjustments
+ *
+ * Revision 1.3  1995/05/16  08:51:12  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.2  1995/05/15  11:56:56  quinn
  * Debuggng & adjustments.
  *
  * Revision 1.1  1995/04/10  10:28:47  quinn
@@ -14,9 +32,11 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <marcdisp.h>
-#include <dmalloc.h>
+#include <xmalloc.h>
+#include <options.h>
 
 #ifndef SEEK_SET
 #define SEEK_SET 0
@@ -27,50 +47,75 @@
  
 int main (int argc, char **argv)
 {
+    int ret;
+    char *arg;
+    int verbose = 0;
     FILE *inf;
     long file_size;
     char *buf;
-    int r;
+    char *prog = *argv;
+    int count = 0;
+    int no = 0;
 
-    if (argc < 2)
-    {
-        fprintf (stderr, "usage\n%s <file>\n", *argv);
-	exit (1);
-    }
-    inf = fopen (argv[1], "r");
-    if (!inf)
-    {
-        fprintf (stderr, "%s: cannot open %s:%s\n",
-		 *argv, argv[1], strerror (errno));
-        exit (1);
-    }
-    if (fseek (inf, 0L, SEEK_END))
-    {
-        fprintf (stderr, "%s: cannot seek in %s:%s\n",
-		 *argv, argv[1], strerror (errno));
-        exit (1);
-    }
-    file_size = ftell (inf);    
-    if (fseek (inf, 0L, SEEK_SET))
-    {
-        fprintf (stderr, "%s: cannot seek in %s:%s\n",
-		 *argv, argv[1], strerror (errno));
-        exit (1);
-    }
-    buf = malloc (file_size);
-    if (!buf)
+    while ((ret = options("v", argv, argc, &arg)) != -2)
     {
-        fprintf (stderr, "%s: cannot malloc: %s\n",
-		 *argv, strerror (errno));
-        exit (1);
+	no++;
+        switch (ret)
+        {
+        case 0:
+	    inf = fopen (arg, "r");
+	    if (!inf)
+	    {
+		fprintf (stderr, "%s: cannot open %s:%s\n",
+			 prog, arg, strerror (errno));
+		exit (1);
+	    }
+	    if (fseek (inf, 0L, SEEK_END))
+	    {
+		fprintf (stderr, "%s: cannot seek in %s:%s\n",
+			 prog, arg, strerror (errno));
+		exit (1);
+	    }
+	    file_size = ftell (inf);    
+	    if (fseek (inf, 0L, SEEK_SET))
+	    {
+		fprintf (stderr, "%s: cannot seek in %s:%s\n",
+			 prog, arg, strerror (errno));
+		exit (1);
+	    }
+	    buf = (char *)xmalloc (file_size);
+	    if (!buf)
+	    {
+		fprintf (stderr, "%s: cannot xmalloc: %s\n",
+			 prog, strerror (errno));
+		exit (1);
+	    }
+	    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)
+	    {
+		buf += ret;
+		count++;
+	    }
+	    fclose (inf);
+	    xfree (buf);
+            break;
+        case 'v':
+	    verbose++;
+            break;
+        default:
+            fprintf (stderr, "Usage: %s [-v] file...\n", prog);
+            exit (1);
+        }
     }
-    if (fread (buf, 1, file_size, inf) != file_size)
+    if (!no)
     {
-        fprintf (stderr, "%s: cannot read %s: %s\n",
-		 *argv, argv[1], strerror (errno));
-        exit (1);
+	fprintf (stderr, "Usage: %s [-v] file...\n", prog);
+	exit (1);
     }
-    while ((r = marc_display (buf, stdout)) > 0)
-        buf += r;
     exit (0);
 }