Changeset d011038 in mainline for uspace/srv/devman/devman.c

Timestamp:

2011-03-29T20:12:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8f17503

Parents:

c4fb95d3 (diff), 93ebe4e (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.

File:

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

uspace/srv/devman/devman.c

@@ -266 +266 @@
         }
         
-        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);
@@ -1123 +1124 @@
 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);
         
@@ -1132 +1140 @@
         char *rel_path = path;
         char *next_path_elem = NULL;
-        bool cont = (rel_path[0] == '/');
+        bool cont = true;
         
         while (cont && fun != NULL) {