Changeset c30a015 in mainline for uspace/lib

Timestamp:

2012-03-03T10:32:47Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

7689590

Parents:

d0d7afb (diff), 0499235 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

Location:

uspace/lib/c

Files:

• generic/str.c (modified) (1 diff)
• generic/sysinfo.c (modified) (4 diffs)
• include/str.h (modified) (1 diff)
• include/sysinfo.h (modified) (1 diff)

uspace/lib/c/generic/str.c

@@ -259 +259 @@
         
         return offset;
+}
+
+/** Get size of string with size limit.
+ *
+ * Get the number of bytes which are used by the string @a str
+ * (excluding the NULL-terminator), but no more than @max_size bytes.
+ *
+ * @param str      String to consider.
+ * @param max_size Maximum number of bytes to measure.
+ *
+ * @return Number of bytes used by the string
+ *
+ */
+size_t str_nsize(const char *str, size_t max_size)
+{
+        size_t size = 0;
+        
+        while ((*str++ != 0) && (size < max_size))
+                size++;
+        
+        return size;
+}
+
+/** Get size of wide string with size limit.
+ *
+ * Get the number of bytes which are used by the wide string @a str
+ * (excluding the NULL-terminator), but no more than @max_size bytes.
+ *
+ * @param str      Wide string to consider.
+ * @param max_size Maximum number of bytes to measure.
+ *
+ * @return Number of bytes used by the wide string
+ *
+ */
+size_t wstr_nsize(const wchar_t *str, size_t max_size)
+{
+        return (wstr_nlength(str, max_size) * sizeof(wchar_t));
 }
 

uspace/lib/c/generic/sysinfo.c

@@ -40 +40 @@
 #include <bool.h>
 
+/** Get sysinfo keys size
+ *
+ * @param path  Sysinfo path.
+ * @param value Pointer to store the keys size.
+ *
+ * @return EOK if the keys were successfully read.
+ *
+ */
+static int sysinfo_get_keys_size(const char *path, size_t *size)
+{
+        return (int) __SYSCALL3(SYS_SYSINFO_GET_KEYS_SIZE, (sysarg_t) path,
+            (sysarg_t) str_size(path), (sysarg_t) size);
+}
+
+/** Get sysinfo keys
+ *
+ * @param path  Sysinfo path.
+ * @param value Pointer to store the keys size.
+ *
+ * @return Keys read from sysinfo or NULL if the
+ *         sysinfo item has no subkeys.
+ *         The returned non-NULL pointer should be
+ *         freed by free().
+ *
+ */
+char *sysinfo_get_keys(const char *path, size_t *size)
+{
+        /*
+         * The size of the keys might change during time.
+         * Unfortunatelly we cannot allocate the buffer
+         * and transfer the keys as a single atomic operation.
+         */
+        
+        /* Get the keys size */
+        int ret = sysinfo_get_keys_size(path, size);
+        if ((ret != EOK) || (size == 0)) {
+                /*
+                 * Item with no subkeys.
+                 */
+                *size = 0;
+                return NULL;
+        }
+        
+        char *data = malloc(*size);
+        if (data == NULL) {
+                *size = 0;
+                return NULL;
+        }
+        
+        /* Get the data */
+        size_t sz;
+        ret = __SYSCALL5(SYS_SYSINFO_GET_KEYS, (sysarg_t) path,
+            (sysarg_t) str_size(path), (sysarg_t) data, (sysarg_t) *size,
+            (sysarg_t) &sz);
+        if (ret == EOK) {
+                *size = sz;
+                return data;
+        }
+        
+        free(data);
+        *size = 0;
+        return NULL;
+}
+
 /** Get sysinfo item type
  *
@@ -70 +134 @@
 /** Get sysinfo binary data size
  *
- * @param path  Sysinfo path.
- * @param value Pointer to store the binary data size.
+ * @param path Sysinfo path.
+ * @param size Pointer to store the binary data size.
  *
  * @return EOK if the value was successfully read and
@@ -85 +149 @@
 /** Get sysinfo binary data
  *
- * @param path  Sysinfo path.
- * @param value Pointer to store the binary data size.
+ * @param path Sysinfo path.
+ * @param size Pointer to store the binary data size.
  *
  * @return Binary data read from sysinfo or NULL if the
@@ -134 +198 @@
 }
 
+/** Get sysinfo property
+ *
+ * @param path Sysinfo path.
+ * @param name Property name.
+ * @param size Pointer to store the binary data size.
+ *
+ * @return Property value read from sysinfo or NULL if the
+ *         sysinfo item value type is not binary data.
+ *         The returned non-NULL pointer should be
+ *         freed by free().
+ *
+ */
+void *sysinfo_get_property(const char *path, const char *name, size_t *size)
+{
+        size_t total_size;
+        void *data = sysinfo_get_data(path, &total_size);
+        if ((data == NULL) || (total_size == 0)) {
+                *size = 0;
+                return NULL;
+        }
+        
+        size_t pos = 0;
+        while (pos < total_size) {
+                /* Process each property with sanity checks */
+                size_t cur_size = str_nsize(data + pos, total_size - pos);
+                if (((char *) data)[pos + cur_size] != 0)
+                        break;
+                
+                bool found = (str_cmp(data + pos, name) == 0);
+                
+                pos += cur_size + 1;
+                if (pos >= total_size)
+                        break;
+                
+                /* Process value size */
+                size_t value_size;
+                memcpy(&value_size, data + pos, sizeof(value_size));
+                
+                pos += sizeof(value_size);
+                if ((pos >= total_size) || (pos + value_size > total_size))
+                        break;
+                
+                if (found) {
+                        void *value = malloc(value_size);
+                        if (value == NULL)
+                                break;
+                        
+                        memcpy(value, data + pos, value_size);
+                        free(data);
+                        
+                        *size = value_size;
+                        return value;
+                }
+                
+                pos += value_size;
+        }
+        
+        free(data);
+        
+        *size = 0;
+        return NULL;
+}
+
 /** @}
  */

uspace/lib/c/include/str.h

@@ -60 +60 @@
 extern size_t str_size(const char *str);
 extern size_t wstr_size(const wchar_t *str);
+
+extern size_t str_nsize(const char *str, size_t max_size);
+extern size_t wstr_nsize(const wchar_t *str, size_t max_size);
 
 extern size_t str_lsize(const char *str, size_t max_len);

uspace/lib/c/include/sysinfo.h

@@ -40 +40 @@
 #include <abi/sysinfo.h>
 
+extern char *sysinfo_get_keys(const char *, size_t *);
 extern sysinfo_item_val_type_t sysinfo_get_val_type(const char *);
 extern int sysinfo_get_value(const char *, sysarg_t *);
 extern void *sysinfo_get_data(const char *, size_t *);
+extern void *sysinfo_get_property(const char *, const char *, size_t *);
 
 #endif