Changeset 1484

Timestamp:

01/11/12 03:10:11 (4 months ago)

Author:

hailfinger

Message:

Postpone layout file reading

Layout file reading should happen after option parsing like all other
file accesses.
Guard against multiple --layout parameters.

Followup fix for r1483: Remove -m short option from getopt.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>
Acked-by: Stefan Tauner <stefan.tauner@…>

File:

• trunk/cli_classic.c (modified) (5 diffs)

trunk/cli_classic.c

@@ -178 +178 @@
         int ret = 0;
 
-        static const char optstring[] = "r:Rw:v:nVEfc:m:l:i:p:Lzh";
+        static const char optstring[] = "r:Rw:v:nVEfc:l:i:p:Lzh";
         static const struct option long_options[] = {
                 {"read",                1, NULL, 'r'},
@@ -199 +199 @@
 
         char *filename = NULL;
+        char *layoutfile = NULL;
         char *tempstr = NULL;
         char *pparam = NULL;
@@ -274 +275 @@
                         break;
                 case 'l':
-                        tempstr = strdup(optarg);
-                        if (read_romlayout(tempstr))
-                                cli_classic_abort_usage();
+                        if (layoutfile) {
+                                fprintf(stderr, "Error: --layout specified "
+                                        "more than once. Aborting.\n");
+                                cli_classic_abort_usage();
+                        }
+                        layoutfile = strdup(optarg);
                         break;
                 case 'i':
@@ -374 +378 @@
         }
 
-        if (process_include_args())
-                cli_classic_abort_usage();
-
         /* FIXME: Print the actions flashrom will take. */
 
@@ -390 +391 @@
         }
 #endif
+
+        if (layoutfile && read_romlayout(layoutfile))
+                cli_classic_abort_usage();
+        if (process_include_args())
+                cli_classic_abort_usage();
 
         /* Does a chip with the requested name exist in the flashchips array? */