From f0b99c917949223fa6ad29adaa36036d55767bfa Mon Sep 17 00:00:00 2001
From: Kevin Chabowski <kevin@kch42.de>
Date: Wed, 6 Oct 2010 20:40:54 +0200
Subject: [PATCH] himddump now uses getopt for option parsing.

- Replaced old option parsing mechanism with getopt.
- Updated usage message to be "compatible" to the new option parsing
  mechanism.

TODO:
- Test if this will compile on non-gnu compilers / modify makefiles
  if necessary. On my Linux machine with gcc it works great :-).
---
 himddump/himddump.c |  182 +++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 134 insertions(+), 48 deletions(-)

diff --git a/himddump/himddump.c b/himddump/himddump.c
index 48d5829..29cce74 100644
--- a/himddump/himddump.c
+++ b/himddump/himddump.c
@@ -6,22 +6,23 @@
 #include <glib.h>
 #include <locale.h>
 #include <string.h>
+#include <getopt.h>
 
 #include "himd.h"
 #include "sony_oma.h"
 
 void usage(char * cmdname)
 {
-  printf("Usage: %s <HiMD path> <command>, where <command> is either of:\n\n\
-          strings          - dumps all strings found in the tracklist file\n\
-          tracks           - lists all tracks on disc\n\
-          tracks verbose   - lists details of all tracks on disc\n\
-          discid           - reads the disc id of the inserted medium\n\
-          holes            - lists all holes on disc\n\
-          mp3key <TRK>     - show the MP3 encryption key for track <TRK>\n\
-          dumptrack <TRK>  - dump track <TRK>\n\
-          dumpmp3 <TRK>    - dump MP3 track <TRK>\n\
-          dumpnonmp3 <TRK> - dump non-MP3 tracl <TRK>\n", cmdname);
+  printf("Usage: %s <option> <HiMD path>, where <option> is either of:\n\n\
+          --strings          - dumps all strings found in the tracklist file\n\
+          --tracks           - lists all tracks on disc\n\
+          --tracks-verbose   - lists details of all tracks on disc\n\
+          --discid           - reads the disc id of the inserted medium\n\
+          --holes            - lists all holes on disc\n\
+          --mp3key <TRK>     - show the MP3 encryption key for track <TRK>\n\
+          --dumptrack <TRK>  - dump track <TRK>\n\
+          --dumpmp3 <TRK>    - dump MP3 track <TRK>\n\
+          --dumpnonmp3 <TRK> - dump non-MP3 track <TRK>\n", cmdname);
 }
 
 static const char * hexdump(unsigned char * input, int len)
@@ -326,62 +327,147 @@ void himd_dumpholes(struct himd * h)
         printf("%d: %05u-%05u\n", i, holes.holes[i].firstblock, holes.holes[i].lastblock);
 }
 
+int argument_parse(char * parse_me)
+{
+    int new_flag = 1;
+    if(parse_me)
+    {
+        sscanf(parse_me, "%d", &new_flag);
+        /* new_flag must be greater than zero! */
+        if(new_flag < 1)
+            new_flag = 1;
+    }
+    return new_flag;
+}
+
+#define id_mp3key     11
+#define id_dumptrack  12
+#define id_dumpmp3    13
+#define id_dumpnonmp3 14
+
 int main(int argc, char ** argv)
 {
-    int idx;
     struct himd h;
     struct himderrinfo status;
     setlocale(LC_ALL,"");
 
-    if (argc == 2 && (strcmp (argv[1], "help") == 0)) {
-      usage(argv[0]);
-      return 0;
+    /* Flags for the "subcommands". */
+    static int flag_strings        = 0;
+    static int flag_tracks         = 0;
+    static int flag_discid         = 0;
+    static int flag_holes          = 0;
+    static int flag_mp3key         = 0;
+    static int flag_dumptrack      = 0;
+    static int flag_dumpmp3        = 0;
+    static int flag_dumpnonmp3     = 0;
+    
+    int getopt_c      = 0;
+    int option_index = 0;
+    char any_flag_set = 0;
+    
+    while(1)
+    {
+        static struct option long_options[] =
+        {
+            {"help",           no_argument,       0,             'h'          },
+            {"strings",        no_argument,       &flag_strings, 1            },
+            {"tracks",         no_argument,       &flag_tracks,  1            },
+            {"tracks-verbose", no_argument,       &flag_tracks,  2            },
+            {"discid",         no_argument,       &flag_discid,  1            },
+            {"holes",          no_argument,       &flag_holes,   1            },
+            {"mp3key",         required_argument, 0,             id_mp3key    },
+            {"dumptrack",      required_argument, 0,             id_dumptrack },
+            {"dumpmp3",        required_argument, 0,             id_dumpmp3   },
+            {"dumpnonmp3",     required_argument, 0,             id_dumpnonmp3},
+        
+            {0,            0,                 0,             0            }
+        };
+        
+        getopt_c = getopt_long(argc, argv, "h", long_options, &option_index);
+        
+        if(getopt_c == -1)
+            break;
+        
+        switch(getopt_c)
+        {
+            case 0:
+                any_flag_set = 1;
+                break;
+            
+            case 'h':
+                usage(argv[0]);
+                any_flag_set = 1;
+                return 0;
+                break;
+            
+            case id_mp3key:
+                flag_mp3key = argument_parse(optarg);
+                any_flag_set = 1;
+                break;
+            
+            case id_dumptrack:
+                flag_dumptrack = argument_parse(optarg);
+                any_flag_set = 1;
+                break;
+            
+            case id_dumpmp3:
+                flag_dumpmp3 = argument_parse(optarg);
+                any_flag_set = 1;
+                break;
+            
+            case id_dumpnonmp3:
+                flag_dumpnonmp3 = argument_parse(optarg);
+                any_flag_set = 1;
+                break;
+            
+            default:
+                return 1;
+                break;
+        }
     }
-
-    if (argc < 2) {
-      printf("Please specify HiMD path and command to be sent. Use \"%s help\" to display a help.\n", argv[0]);
-      return 0;
+    
+    if(!any_flag_set)
+    {
+         printf("You must pass an option. Try \"%s --help\" for more \
+information.\n", argv[0]);
+        return 1;
     }
-
-    if(himd_open(&h,argv[1], &status) < 0)
+    
+    if(optind < argc)
+    {
+        if(himd_open(&h,argv[optind], &status) < 0)
+        {
+            puts(status.statusmsg);
+            return 1;
+        }
+    }
+    else
     {
-        puts(status.statusmsg);
+        printf("Please specify HiMD path. Try \"%s --help\" for more \
+information.\n", argv[0]);
         return 1;
     }
-    if(argc == 2 || strcmp(argv[2],"tracks") == 0)
-        himd_trackdump(&h, argc > 3);
-    else if(strcmp(argv[2],"strings") == 0)
+    
+    if(flag_strings)
         himd_stringdump(&h);
-    else if(strcmp(argv[2],"discid") == 0)
+    else if(flag_tracks)
+        himd_trackdump(&h, flag_tracks == 2);
+    else if(flag_discid)
         himd_dumpdiscid(&h);
-    else if(strcmp(argv[2],"holes") == 0)
+    else if(flag_holes)
         himd_dumpholes(&h);
-    else if(strcmp(argv[2],"mp3key") == 0 && argc > 3)
+    else if(flag_mp3key)
     {
         mp3key k;
-        idx = 1;
-        sscanf(argv[3], "%d", &idx);
-        himd_obtain_mp3key(&h, idx, &k, NULL);
+        himd_obtain_mp3key(&h, flag_mp3key, &k, NULL);
         printf("Track key: %02x%02x%02x%02x\n", k[0], k[1], k[2], k[3]);
     }
-    else if(strcmp(argv[2],"dumptrack") == 0 && argc > 3)
-    {
-        idx = 1;
-        sscanf(argv[3], "%d", &idx);
-        himd_dumptrack(&h, idx);
-    }
-    else if(strcmp(argv[2],"dumpmp3") == 0 && argc > 3)
-    {
-        idx = 1;
-        sscanf(argv[3], "%d", &idx);
-        himd_dumpmp3(&h, idx);
-    }
-    else if(strcmp(argv[2],"dumpnonmp3") == 0 && argc > 3)
-    {
-        idx = 1;
-        sscanf(argv[3], "%d", &idx);
-        himd_dumpnonmp3(&h, idx);
-    }
+    else if(flag_dumptrack)
+        himd_dumptrack(&h, flag_dumptrack);
+    else if(flag_dumpmp3)
+        himd_dumpmp3(&h, flag_dumpmp3);
+    else if(flag_dumpnonmp3)
+        himd_dumpnonmp3(&h, flag_dumpnonmp3);
 
     himd_close(&h);
     return 0;
-- 
1.7.2.3