[thdat] Detect for -l

Author: DankRank

thdat/thdat.1

@@ -33,7 +33,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl V
-.Op Oo Fl c | l | x Oc Ar version
+.Op Oo Fl c | l | x Oc Oo Li d | Ar version Oc
 .Op Ar archive Op Ar
 .Sh DESCRIPTION
 The
@@ -43,20 +43,21 @@ The following commands are available:
 .Bl -tag -width Ds
 .It Nm Fl c Ar version Ar archive Ar file Op Ar
 Archives the specified files.
-.It Nm Fl l Ar version Ar archive
+.It Nm Fl l Oo Li d | Ar version Oc Ar archive
 Lists the contents of the archive.
 .It Nm Fl x Oo Li d | Ar version Oc Ar archive Op Ar
 Extracts files.
 If no files are specified, all files are extracted.
+.El
+.Pp
+The version specifies which archive format to use.
+Running the program without a command will list the supported formats.
 .No If Li d is specified instead of Ar version ,
 .Nm
 automatically detects the file format.
 .It Nm Fl V
 Displays the program version.
-.El
-.Pp
-The version specifies which archive format to use.
-Running the program without a command will list the supported formats.
+
 .Sh ENVIRONMENT
 .Bl -tag -width OMP_NUM_THREADS
 .It Ev OMP_NUM_THREADS

thdat/thdat.c

@@ -47,7 +47,7 @@ print_usage(
            "  -V  display version information and exit\n"
            "VERSION can be:\n"
            "  1, 2, 3, 4, 5, 6, 7, 8, 9, 95, 10, 103 (for Uwabami Breakers), 105, 11, 12, 123, 125, 128, 13, 14, 143, 15, or 16\n"
-	   "For extraction mode, VERSION can also be set to 'd' to enable automatic file detection\n\n"
+	   "Specify 'd' as VERSION to automatically detect archive format. (-l and -x only)\n\n"
            "Report bugs to <" PACKAGE_BUGREPORT ">.\n", argv0);
 }
 
@@ -345,7 +345,7 @@ main(
                 exit(1);
             }
             mode = opt;
-            if(opt == 'x' && *util_optarg == 'd') {
+            if((opt == 'x' || mode == 'l') && *util_optarg == 'd') {
                 version = ~0;
             }
             else if(opt != 'd') version = parse_version(util_optarg);
@@ -357,6 +357,40 @@ main(
     argc = ind;
     argv[argc] = NULL;
 
+    /* detect version */
+    if(argc && (mode == 'x' || mode == 'l') && version == ~0) {
+        thtk_io_t* file;
+        if(!(file = thtk_io_open_file(argv[0], "rb", &error))) {
+            print_error(error);
+            thtk_error_free(&error);
+            exit(1);
+        }
+        uint32_t out[4];
+        unsigned int heur;
+        printf("Detecting '%s'...\n",argv[0]);
+        if(-1 == thdat_detect(argv[0], file, out, &heur, &error)) {
+            thtk_io_close(file);
+            print_error(error);
+            thtk_error_free(&error);
+            exit(1);
+        }
+        if(heur == -1) {
+            const thdat_detect_entry_t* ent;
+            printf("Couldn't detect version!\nPossible versions: ");
+            while((ent = thdat_detect_iter(out))) {
+                printf("%d,",ent->alias);
+            }
+            printf("\n");
+            thtk_io_close(file);
+            exit(1);
+        }
+        else {
+            printf("Detected version %d\n",heur);
+            version = heur;
+        }
+        thtk_io_close(file);
+    }
+
     switch (mode) {
     case 'd': {
         if (argc < 1) {
@@ -425,39 +459,6 @@ main(
             exit(1);
         }
 
-        if(version == ~0) {
-            thtk_io_t* file;
-            if(!(file = thtk_io_open_file(argv[0], "rb", &error))) {
-                print_error(error);
-                thtk_error_free(&error);
-                exit(1);
-            }
-            uint32_t out[4];
-            unsigned int heur;
-            printf("Detecting '%s'...\n",argv[0]);
-            if(-1 == thdat_detect(argv[0], file, out, &heur, &error)) {
-                thtk_io_close(file);
-                print_error(error);
-                thtk_error_free(&error);
-                exit(1);
-            }
-            if(heur == -1) {
-                const thdat_detect_entry_t* ent;
-                printf("Couldn't detect version!\nPossible versions: ");
-                while((ent = thdat_detect_iter(out))) {
-                    printf("%d,",ent->alias);
-                }
-                printf("\n");
-                thtk_io_close(file);
-                exit(1);
-            }
-            else {
-                printf("Detected version %d\n",heur);
-                version = heur;
-            }
-            thtk_io_close(file);
-        }
-
         thdat_state_t* state = thdat_open_file(version, argv[0], &error);
         if (!state) {
             print_error(error);