Merge tag 'configfs-5.14' of git://git.infradead.org/users/hch/configfs

[linux-2.6-microblaze.git] / tools / bootconfig / main.c

diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
index 6cd6080..f45fa99 100644 (file)
--- a/tools/bootconfig/main.c
+++ b/tools/bootconfig/main.c
@@ -27,7 +27,7 @@ static int xbc_show_value(struct xbc_node *node, bool semicolon)
                        q = '\'';
                else
                        q = '"';
-               printf("%c%s%c%s", q, val, q, node->next ? ", " : eol);
+               printf("%c%s%c%s", q, val, q, xbc_node_is_array(node) ? ", " : eol);
                i++;
        }
        return i;
@@ -35,30 +35,55 @@ static int xbc_show_value(struct xbc_node *node, bool semicolon)
 
 static void xbc_show_compact_tree(void)
 {
-       struct xbc_node *node, *cnode;
+       struct xbc_node *node, *cnode = NULL, *vnode;
        int depth = 0, i;
 
        node = xbc_root_node();
        while (node && xbc_node_is_key(node)) {
                for (i = 0; i < depth; i++)
                        printf("\t");
-               cnode = xbc_node_get_child(node);
+               if (!cnode)
+                       cnode = xbc_node_get_child(node);
                while (cnode && xbc_node_is_key(cnode) && !cnode->next) {
+                       vnode = xbc_node_get_child(cnode);
+                       /*
+                        * If @cnode has value and subkeys, this
+                        * should show it as below.
+                        *
+                        * key(@node) {
+                        *      key(@cnode) = value;
+                        *      key(@cnode) {
+                        *          subkeys;
+                        *      }
+                        * }
+                        */
+                       if (vnode && xbc_node_is_value(vnode) && vnode->next)
+                               break;
                        printf("%s.", xbc_node_get_data(node));
                        node = cnode;
-                       cnode = xbc_node_get_child(node);
+                       cnode = vnode;
                }
                if (cnode && xbc_node_is_key(cnode)) {
                        printf("%s {\n", xbc_node_get_data(node));
                        depth++;
                        node = cnode;
+                       cnode = NULL;
                        continue;
                } else if (cnode && xbc_node_is_value(cnode)) {
                        printf("%s = ", xbc_node_get_data(node));
                        xbc_show_value(cnode, true);
+                       /*
+                        * If @node has value and subkeys, continue
+                        * looping on subkeys with same node.
+                        */
+                       if (cnode->next) {
+                               cnode = xbc_node_get_next(cnode);
+                               continue;
+                       }
                } else {
                        printf("%s;\n", xbc_node_get_data(node));
                }
+               cnode = NULL;
 
                if (node->next) {
                        node = xbc_node_get_next(node);
@@ -70,10 +95,12 @@ static void xbc_show_compact_tree(void)
                                return;
                        if (!xbc_node_get_child(node)->next)
                                continue;
-                       depth--;
-                       for (i = 0; i < depth; i++)
-                               printf("\t");
-                       printf("}\n");
+                       if (depth) {
+                               depth--;
+                               for (i = 0; i < depth; i++)
+                                       printf("\t");
+                               printf("}\n");
+                       }
                }
                node = xbc_node_get_next(node);
        }
@@ -84,12 +111,12 @@ static void xbc_show_list(void)
        char key[XBC_KEYLEN_MAX];
        struct xbc_node *leaf;
        const char *val;
-       int ret = 0;
 
        xbc_for_each_key_value(leaf, val) {
-               ret = xbc_node_compose_key(leaf, key, XBC_KEYLEN_MAX);
-               if (ret < 0)
+               if (xbc_node_compose_key(leaf, key, XBC_KEYLEN_MAX) < 0) {
+                       fprintf(stderr, "Failed to compose key %d\n", ret);
                        break;
+               }
                printf("%s = ", key);
                if (!val || val[0] == '\0') {
                        printf("\"\"\n");
@@ -99,17 +126,6 @@ static void xbc_show_list(void)
        }
 }
 
-/* Simple real checksum */
-static int checksum(unsigned char *buf, int len)
-{
-       int i, sum = 0;
-
-       for (i = 0; i < len; i++)
-               sum += buf[i];
-
-       return sum;
-}
-
 #define PAGE_SIZE      4096
 
 static int load_xbc_fd(int fd, char **buf, int size)
@@ -205,7 +221,7 @@ static int load_xbc_from_initrd(int fd, char **buf)
                return ret;
 
        /* Wrong Checksum */
-       rcsum = checksum((unsigned char *)*buf, size);
+       rcsum = xbc_calc_checksum(*buf, size);
        if (csum != rcsum) {
                pr_err("checksum error: %d != %d\n", csum, rcsum);
                return -EINVAL;
@@ -354,7 +370,7 @@ static int apply_xbc(const char *path, const char *xbc_path)
                return ret;
        }
        size = strlen(buf) + 1;
-       csum = checksum((unsigned char *)buf, size);
+       csum = xbc_calc_checksum(buf, size);
 
        /* Backup the bootconfig data */
        data = calloc(size + BOOTCONFIG_ALIGN +