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

Timestamp:

2012-03-02T17:20:23Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5608deba, 98cb0495, c30a015

Parents:

3113d47

Message:

add basic support for encoding name/value properties in sysinfo

File:

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

uspace/app/sysinfo/sysinfo.c

@@ -92 +92 @@
 }
 
+static int print_item_property(char *ipath, char *iprop)
+{
+        size_t size;
+        void *data = sysinfo_get_property(ipath, iprop, &size);
+        if (data == NULL) {
+                printf("Error reading property '%s' of item '%s'.\n", iprop,
+                    ipath);
+                return -1;
+        }
+        
+        printf("%s property %s -> ", ipath, iprop);
+        dump_bytes_hex(data, size);
+        fputs(" ('", stdout);
+        dump_bytes_text(data, size);
+        fputs("')\n", stdout);
+        
+        return EOK;
+}
+
 static void print_spaces(size_t spaces)
 {
@@ -143 +162 @@
 int main(int argc, char *argv[])
 {
-        if (argc != 2) {
+        int rc = 0;
+        
+        if (argc < 2) {
                 /* Print keys */
                 print_keys("", 0);
-                return 0;
+                return rc;
         }
         
         char *ipath = argv[1];
-        sysinfo_item_val_type_t tag = sysinfo_get_val_type(ipath);
-        
-        /* Silence warning */
-        int rc = 0;
-        
-        switch (tag) {
-        case SYSINFO_VAL_UNDEFINED:
-                printf("Error: Sysinfo item '%s' not defined.\n", ipath);
-                rc = 2;
-                break;
-        case SYSINFO_VAL_VAL:
-                rc = print_item_val(ipath);
-                break;
-        case SYSINFO_VAL_DATA:
-                rc = print_item_data(ipath);
-                break;
-        default:
-                printf("Error: Sysinfo item '%s' with unknown value type.\n",
-                    ipath);
-                rc = 2;
-                break;
-        }
-        
+        
+        if (argc < 3) {
+                sysinfo_item_val_type_t tag = sysinfo_get_val_type(ipath);
+                
+                switch (tag) {
+                case SYSINFO_VAL_UNDEFINED:
+                        printf("Error: Sysinfo item '%s' not defined.\n", ipath);
+                        rc = 2;
+                        break;
+                case SYSINFO_VAL_VAL:
+                        rc = print_item_val(ipath);
+                        break;
+                case SYSINFO_VAL_DATA:
+                        rc = print_item_data(ipath);
+                        break;
+                default:
+                        printf("Error: Sysinfo item '%s' with unknown value type.\n",
+                            ipath);
+                        rc = 2;
+                        break;
+                }
+                
+                return rc;
+        }
+        
+        char *iprop = argv[2];
+        rc = print_item_property(ipath, iprop);
         return rc;
 }