Changeset 76f382b in mainline for kernel/generic/src/sysinfo/sysinfo.c

Timestamp:

2012-03-02T14:50:42Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8b9a443

Parents:

560d79f

Message:

support for listing sysinfo from uspace

File:

• kernel/generic/src/sysinfo/sysinfo.c (modified) (3 diffs)

kernel/generic/src/sysinfo/sysinfo.c

@@ -678 +678 @@
                 root = &global_root;
         
-        /* Try to find the item */
-        sysinfo_item_t *item = sysinfo_find_item(name, *root, NULL,
-            dry_run);
+        sysinfo_item_t *subtree = NULL;
+        
+        if (name[0] != 0) {
+                /* Try to find the item */
+                sysinfo_item_t *item =
+                    sysinfo_find_item(name, *root, NULL, dry_run);
+                if ((item != NULL) &&
+                    (item->subtree_type == SYSINFO_SUBTREE_TABLE))
+                        subtree = item->subtree.table;
+        } else
+                subtree = *root;
         
         sysinfo_return_t ret;
         
-        if ((item != NULL) && (item->subtree_type == SYSINFO_SUBTREE_TABLE)) {
+        if (subtree != NULL) {
                 /*
-                 * Subtree found in the fixed sysinfo tree.
                  * Calculate the size of subkeys.
                  */
                 size_t size = 0;
-                for (sysinfo_item_t *cur = item->subtree.table; cur;
-                    cur = cur->next)
+                for (sysinfo_item_t *cur = subtree; cur; cur = cur->next)
                         size += str_size(cur->name) + 1;
                 
                 if (dry_run) {
-                        ret.tag = SYSINFO_VAL_FUNCTION_DATA;
+                        ret.tag = SYSINFO_VAL_DATA;
                         ret.data.data = NULL;
                         ret.data.size = size;
@@ -705 +711 @@
                         
                         size_t pos = 0;
-                        for (sysinfo_item_t *cur = item->subtree.table; cur;
-                            cur = cur->next) {
+                        for (sysinfo_item_t *cur = subtree; cur; cur = cur->next) {
                                 str_cpy(names + pos, size - pos, cur->name);
                                 pos += str_size(cur->name) + 1;
@@ -712 +717 @@
                         
                         /* Correct return value */
-                        ret.tag = SYSINFO_VAL_FUNCTION_DATA;
+                        ret.tag = SYSINFO_VAL_DATA;
                         ret.data.data = (void *) names;
                         ret.data.size = size;