Changeset 1483 for trunk/cbtable.c

Timestamp:

01/04/12 01:48:27 (5 months ago)

Author:

hailfinger

Message:

Replace --mainboard with -p internal:mainboard

--mainboard is a relic from a time before external programmers and makes
the CLI inconsistent.
Use a programmer parameter instead and free up the short option -m.

NOTE:
The --list-supported-wiki output changed to use -p internal:mainboard=
instead of -m
The --list-supported output changed the heading of the mainboard list
from

Vendor Board Status Required option
to
Vendor Board Status Required value for

-p internal:mainboard=

Fix lb_vendor_dev_from_string() not to write to the supplied string.

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

File:

• trunk/cbtable.c (modified) (1 diff)

trunk/cbtable.c

@@ -34 +34 @@
 int partvendor_from_cbtable = 0;
 
-void lb_vendor_dev_from_string(char *boardstring)
-{
+/* Parse the [<vendor>:]<board> string specified by the user as part of
+ * -p internal:mainboard=[<vendor>:]<board> and set lb_vendor and lb_part
+ * to the extracted values.
+ * Note: strtok modifies the original string, so we work on a copy and allocate
+ * memory for lb_vendor and lb_part with strdup.
+ */
+void lb_vendor_dev_from_string(const char *boardstring)
+{
+        /* strtok may modify the original string. */
+        char *tempstr = strdup(boardstring);
         char *tempstr2 = NULL;
-        strtok(boardstring, ":");
+        strtok(tempstr, ":");
         tempstr2 = strtok(NULL, ":");
         if (tempstr2) {
-                lb_vendor = boardstring;
-                lb_part = tempstr2;
+                lb_vendor = strdup(tempstr);
+                lb_part = strdup(tempstr2);
         } else {
                 lb_vendor = NULL;
-                lb_part = boardstring;
-        }
+                lb_part = strdup(tempstr);
+        }
+        free(tempstr);
 }