cmd: gpt: remove bogus code leftover from merge conflict resolution

[karo-tx-uboot.git] / common / cmd_gpt.c

diff --git a/common/cmd_gpt.c b/common/cmd_gpt.c
index 1f12e6deb63f0d34bf5083a1df744ae55d74bcbd..f401209f7ffcfa30c87be97527458cd8ae2b5869 100644 (file)
--- a/common/cmd_gpt.c
+++ b/common/cmd_gpt.c
@@ -29,30 +29,53 @@
  *
  * @return - zero on successful expand and env is set
  */
  *
  * @return - zero on successful expand and env is set
  */

-static char extract_env(const char *str, char **env)
+static int extract_env(const char *str, char **env)

 {
 {

+       int ret = -1;

        char *e, *s;
        char *e, *s;

+#ifdef CONFIG_RANDOM_UUID
+       char uuid_str[UUID_STR_LEN + 1];
+#endif

 
        if (!str || strlen(str) < 4)
                return -1;
 
 
        if (!str || strlen(str) < 4)
                return -1;
 

-       if ((strncmp(str, "${", 2) == 0) && (str[strlen(str) - 1] == '}')) {
-               s = strdup(str);
-               if (s == NULL)
-                       return -1;
-               memset(s + strlen(s) - 1, '\0', 1);
-               memmove(s, s + 2, strlen(s) - 1);
+       if (!((strncmp(str, "${", 2) == 0) && (str[strlen(str) - 1] == '}')))
+               return -1;
+
+       s = strdup(str);
+       if (s == NULL)
+               return -1;
+
+       memset(s + strlen(s) - 1, '\0', 1);
+       memmove(s, s + 2, strlen(s) - 1);
+
+       e = getenv(s);
+       if (e == NULL) {
+#ifdef CONFIG_RANDOM_UUID
+               debug("%s unset. ", str);
+               gen_rand_uuid_str(uuid_str, UUID_STR_FORMAT_STD);
+               setenv(s, uuid_str);
+

                e = getenv(s);
                e = getenv(s);

-               free(s);
-               if (e == NULL) {
-                       printf("Environmental '%s' not set\n", str);
-                       return -1; /* env not set */
+               if (e) {
+                       debug("Set to random.\n");
+                       ret = 0;
+               } else {
+                       debug("Can't get random UUID.\n");

                }
                }

-               *env = e;
-               return 0;
+#else
+               debug("%s unset.\n", str);
+#endif
+       } else {
+               debug("%s get from environment.\n", str);
+               ret = 0;

        }
 
        }
 

-       return -1;
+       *env = e;
+       free(s);
+
+       return ret;

 }
 
 /**
 }
 
 /**


@@ -131,17 +154,26 @@ static int set_gpt_info(block_dev_desc_t *dev_desc,
 
        /* extract disk guid */
        s = str;
 
        /* extract disk guid */
        s = str;

-       tok = strsep(&s, ";");
-       val = extract_val(tok, "uuid_disk");
+       val = extract_val(str, "uuid_disk");

        if (!val) {
        if (!val) {

+#ifdef CONFIG_RANDOM_UUID
+               *str_disk_guid = malloc(UUID_STR_LEN + 1);
+               gen_rand_uuid_str(*str_disk_guid, UUID_STR_FORMAT_STD);
+#else

                free(str);
                return -2;
                free(str);
                return -2;

-       }
-       if (extract_env(val, &p))
-               p = val;
-       *str_disk_guid = strdup(p);
-       free(val);
+#endif
+       } else {
+               char *v = val;

 
 

+               v = strsep(&v, ";");
+               if (extract_env(v, &p))
+                       p = v;
+               *str_disk_guid = strdup(p);
+               free(val);
+               /* Move s to first partition */
+               strsep(&s, ";");
+       }

        if (strlen(s) == 0)
                return -3;
 
        if (strlen(s) == 0)
                return -3;
 


@@ -169,20 +201,25 @@ static int set_gpt_info(block_dev_desc_t *dev_desc,
 
                /* uuid */
                val = extract_val(tok, "uuid");
 
                /* uuid */
                val = extract_val(tok, "uuid");

-               if (!val) { /* 'uuid' is mandatory */
-                       errno = -4;
-                       goto err;
-               }
-               if (extract_env(val, &p))
-                       p = val;
-               if (strlen(p) >= sizeof(parts[i].uuid)) {
-                       printf("Wrong uuid format for partition %d\n", i);
+               if (!val) {
+                       /* 'uuid' is optional if random uuid's are enabled */
+#ifdef CONFIG_RANDOM_UUID
+                       gen_rand_uuid_str(parts[i].uuid, UUID_STR_FORMAT_STD);
+#else

                        errno = -4;
                        goto err;
                        errno = -4;
                        goto err;

+#endif
+               } else {
+                       if (extract_env(val, &p))
+                               p = val;
+                       if (strlen(p) >= sizeof(parts[i].uuid)) {
+                               printf("Wrong uuid format for partition %d\n", i);
+                               errno = -4;
+                               goto err;
+                       }
+                       strcpy((char *)parts[i].uuid, p);
+                       free(val);

                }
                }

-               strcpy((char *)parts[i].uuid, p);
-               free(val);
-

                /* name */
                val = extract_val(tok, "name");
                if (!val) { /* name is mandatory */
                /* name */
                val = extract_val(tok, "name");
                if (!val) { /* name is mandatory */


@@ -226,11 +263,15 @@ static int set_gpt_info(block_dev_desc_t *dev_desc,
        free(str);
 
        return 0;
        free(str);
 
        return 0;

+

 err:
 err:

-       free(str);

        free(*str_disk_guid);
        free(parts);
        free(*str_disk_guid);
        free(parts);

+       free(str);

 
 

+       *str_disk_guid = NULL;
+       *parts_count = 0;
+       *partitions = NULL;

        return errno;
 }
 
        return errno;
 }
 


@@ -258,11 +299,11 @@ static int gpt_default(block_dev_desc_t *blk_dev_desc, const char *str_part)
        }
 
        /* save partitions layout to disk */
        }
 
        /* save partitions layout to disk */

-       gpt_restore(blk_dev_desc, str_disk_guid, partitions, part_count);
+       ret = gpt_restore(blk_dev_desc, str_disk_guid, partitions, part_count);

        free(str_disk_guid);
        free(partitions);
 
        free(str_disk_guid);
        free(partitions);
 

-       return 0;
+       return ret;

 }
 
 /**
 }
 
 /**


@@ -299,8 +340,16 @@ static int do_gpt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        return CMD_RET_FAILURE;
                }
 
                        return CMD_RET_FAILURE;
                }
 

-               if (gpt_default(blk_dev_desc, argv[4]))
+               puts("Writing GPT: ");
+
+               ret = gpt_default(blk_dev_desc, argv[4]);
+               if (!ret) {
+                       puts("success!\n");
+                       return CMD_RET_SUCCESS;
+               } else {
+                       puts("error!\n");

                        return CMD_RET_FAILURE;
                        return CMD_RET_FAILURE;

+               }

        } else {
                return CMD_RET_USAGE;
        }
        } else {
                return CMD_RET_USAGE;
        }