X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fmarcdump.c;h=15021fe506dfbc5631cf309859ce30b8332060c5;hp=23317681ea6e42074658823fa88425dec7c1b501;hb=fa45ad3fa8a1dae7d030efd16ce6371777566813;hpb=2788a4851b551e1a3efb320a2878b809f2d8a9d7

diff --git a/util/marcdump.c b/util/marcdump.c
index 2331768..15021fe 100644
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -58,12 +58,23 @@ static char *prog;
 
 static void usage(const char *prog)
 {
-    fprintf (stderr, "Usage: %s [-c cfile] [-f from] [-t to] "
-             "[-i format] [-o format] "
-             "[-n] [-l pos=value] [-v] [-C chunk] [-s splitfname] [-p] file...\n",
+    fprintf (stderr, "Usage: %s [-i format] [-o format] [-f from] [-t to] "
+             "[-l pos=value] [-c cfile] [-s prefix] [-C size] [-n] "
+             "[-p] [-v] [-V] file...\n",
              prog);
 } 
 
+static void show_version(void)
+{
+    char vstr[20], sha1_str[41];
+
+    yaz_version(vstr, sha1_str);
+    printf("YAZ version: %s %s\n", YAZ_VERSION, YAZ_VERSION_SHA1);
+    if (strcmp(sha1_str, YAZ_VERSION_SHA1))
+        printf("YAZ DLL/SO: %s %s\n", vstr, sha1_str);
+    exit(0);
+}
+
 static int getbyte_stream(void *client_data)
 {
     FILE *f = (FILE*) client_data;
@@ -330,7 +341,7 @@ static void dump(const char *fname, const char *from, const char *to,
             }
             len_result = rlen;
             r = yaz_marc_decode_buf(mt, buf, -1, &result, &len_result);
-            if (r > 0 && result)
+            if (r > 0 && result && len_result)
             {
                 if (fwrite(result, len_result, 1, stdout) != 1)
                 {
@@ -402,7 +413,7 @@ int main (int argc, char **argv)
 #endif
 
     prog = *argv;
-    while ((r = options("i:o:C:npvc:xOeXIf:t:s:l:", argv, argc, &arg)) != -2)
+    while ((r = options("i:o:C:npc:xOeXIf:t:s:l:Vv", argv, argc, &arg)) != -2)
     {
         no++;
         switch (r)
@@ -499,6 +510,9 @@ int main (int argc, char **argv)
         case 'v':
             verbose++;
             break;
+        case 'V': 
+            show_version();
+            break;
         default:
             usage(prog);
             exit(1);
@@ -516,6 +530,7 @@ int main (int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab