Changeset 27bdfa5 in mainline for uspace/srv/devman

Timestamp:

2011-03-30T17:34:59Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

48d4231, 87b52c9, 98169ab, e353e85

Parents:

51e5608 (diff), 917a8c8 (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

Location:

uspace/srv/devman

Files:

• devman.c (modified) (3 diffs)
• main.c (modified) (1 diff)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

uspace/srv/devman/devman.c

@@ -274 +274 @@
         }
         
-        if (read(fd, buf, len) <= 0) {
+        ssize_t read_bytes = safe_read(fd, buf, len);
+        if (read_bytes <= 0) {
                 printf(NAME ": unable to read file '%s'.\n", conf_path);
                 goto cleanup;
         }
-        buf[len] = 0;
+        buf[read_bytes] = 0;
         
         suc = parse_match_ids(buf, ids);
@@ -1131 +1132 @@
 fun_node_t *find_fun_node_by_path(dev_tree_t *tree, char *path)
 {
+        assert(path != NULL);
+
+        bool is_absolute = path[0] == '/';
+        if (!is_absolute) {
+                return NULL;
+        }
+
         fibril_rwlock_read_lock(&tree->rwlock);
         
@@ -1140 +1148 @@
         char *rel_path = path;
         char *next_path_elem = NULL;
-        bool cont = (rel_path[0] == '/');
+        bool cont = true;
         
         while (cont && fun != NULL) {

uspace/srv/devman/main.c

@@ -477 +477 @@
                 dev = fun->dev;
 
-        if (fun == NULL && dev == NULL) {
+        /*
+         * For a valid function to connect to we need a device. The root
+         * function, for example, has no device and cannot be connected to.
+         * This means @c dev needs to be valid regardless whether we are
+         * connecting to a device or to a function.
+         */
+        if (dev == NULL) {
                 printf(NAME ": devman_forward error - no device or function with "
                     "handle %" PRIun " was found.\n", handle);

uspace/srv/devman/util.c

@@ -111 +111 @@
 }
 
+ssize_t safe_read(int fd, void *buffer, size_t size)
+{
+        if (size == 0) {
+                return 0;
+        }
+
+        uint8_t *buf_ptr = (uint8_t *) buffer;
+
+        size_t total_read = 0;
+        while (total_read < size) {
+                ssize_t bytes_read = read(fd, buf_ptr, size - total_read);
+                if (bytes_read < 0) {
+                        /* Error. */
+                        return bytes_read;
+                } else if (bytes_read == 0) {
+                        /* Possibly end of file. */
+                        break;
+                } else {
+                        /* Read at least something. */
+                        buf_ptr += bytes_read;
+                        total_read += bytes_read;
+                }
+        }
+
+        return (ssize_t) total_read;
+}
+
 /** @}
  */

uspace/srv/devman/util.h

@@ -47 +47 @@
 extern void replace_char(char *, char, char);
 
+extern ssize_t safe_read(int, void *, size_t);
+
 #endif