Changeset efb8d15 in mainline for uspace/app/sysinfo/sysinfo.c

Timestamp:

2012-03-02T15:32:13Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

196c253

Parents:

71232af

Message:

dump sysinfo in a more compact way

File:

• uspace/app/sysinfo/sysinfo.c (modified) (4 diffs)

uspace/app/sysinfo/sysinfo.c

@@ -92 +92 @@
 }
 
-static void print_keys(const char *path)
+static void print_spaces(size_t spaces)
+{
+        for (size_t i = 0; i < spaces; i++)
+                printf(" ");
+}
+
+static void print_keys(const char *path, size_t spaces)
 {
         size_t size;
@@ -103 +109 @@
                 /* Process each key with sanity checks */
                 size_t cur_size = str_nsize(keys + pos, size - pos);
+                if (keys[pos + cur_size] != 0)
+                        break;
+                
                 size_t path_size = str_size(path) + cur_size + 2;
                 char *cur_path = (char *) malloc(path_size);
@@ -108 +117 @@
                         break;
                 
-                if (path[0] != 0)
+                size_t length;
+                
+                if (path[0] != 0) {
+                        print_spaces(spaces);
+                        printf(".%s\n", keys + pos);
+                        length = str_length(keys + pos) + 1;
+                        
                         snprintf(cur_path, path_size, "%s.%s", path, keys + pos);
-                else
+                } else {
+                        printf("%s\n", keys + pos);
+                        length = str_length(keys + pos);
+                        
                         snprintf(cur_path, path_size, "%s", keys + pos);
+                }
                 
-                printf("%s\n", cur_path);
-                print_keys(cur_path);
+                print_keys(cur_path, spaces + length);
                 
                 free(cur_path);
@@ -127 +145 @@
         if (argc != 2) {
                 /* Print keys */
-                print_keys("");
+                print_keys("", 0);
                 return 0;
         }