Changeset c47e1a8 in mainline for uspace/srv/devman/main.c

Timestamp:

2010-05-21T07:50:04Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 mainline changes (rev. 451)

File:

• uspace/srv/devman/main.c (modified) (3 diffs)

uspace/srv/devman/main.c

@@ -45 +45 @@
 #include <fibril_synch.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <dirent.h>
 #include <fcntl.h>
@@ -60 +60 @@
 static driver_list_t drivers_list;
 static dev_tree_t device_tree;
+
+/** Wrapper for receiving strings
+ *
+ * This wrapper only makes it more comfortable to use async_data_write_*
+ * functions to receive strings.
+ *
+ * @param str      Pointer to string pointer (which should be later disposed
+ *                 by free()). If the operation fails, the pointer is not
+ *                 touched.
+ * @param max_size Maximum size (in bytes) of the string to receive. 0 means
+ *                 no limit.
+ * @param received If not NULL, the size of the received data is stored here.
+ *
+ * @return Zero on success or a value from @ref errno.h on failure.
+ *
+ */
+static int async_string_receive(char **str, const size_t max_size, size_t *received)
+{
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_write_receive(&callid, &size)) {
+                ipc_answer_0(callid, EINVAL);
+                return EINVAL;
+        }
+        
+        if ((max_size > 0) && (size > max_size)) {
+                ipc_answer_0(callid, EINVAL);
+                return EINVAL;
+        }
+        
+        char *data = (char *) malloc(size + 1);
+        if (data == NULL) {
+                ipc_answer_0(callid, ENOMEM);
+                return ENOMEM;
+        }
+        
+        int rc = async_data_write_finalize(callid, data, size);
+        if (rc != EOK) {
+                free(data);
+                return rc;
+        }
+        
+        data[size] = 0;
+        *str = data;
+        if (received != NULL)
+                *received = size;
+        
+        return EOK;
+}
 
 /**
@@ -155 +204 @@
         match_id->score = IPC_GET_ARG1(call);
         
-        rc = async_string_receive(&match_id->id, DEVMAN_NAME_MAXLEN, NULL);     
+        char *match_id_str;
+        rc = async_string_receive(&match_id_str, DEVMAN_NAME_MAXLEN, NULL);     
+        match_id->id = match_id_str;
         if (EOK != rc) {
                 delete_match_id(match_id);