Changeset 3fb0fec in mainline for uspace/srv

Timestamp:

2011-07-26T18:29:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7eb0fed8

Parents:

efcebe1 (diff), aa865ee (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

Files:

• devman/devman.c (modified) (2 diffs)
• devman/util.c (modified) (2 diffs)
• devman/util.h (modified) (1 diff)
• loader/Makefile (modified) (2 diffs)
• loader/include/elf.h (deleted)
• loader/main.c (modified) (2 diffs)

uspace/srv/devman/devman.c

@@ -270 +270 @@
         }
         
-        ssize_t read_bytes = safe_read(fd, buf, len);
+        ssize_t read_bytes = read_all(fd, buf, len);
         if (read_bytes <= 0) {
-                log_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
+                log_msg(LVL_ERROR, "Unable to read file '%s' (%zd).", conf_path,
+                    read_bytes);
                 goto cleanup;
         }
@@ -421 +422 @@
         }
         
-        insert_fun_node(tree, fun, clone_string(""), NULL);
+        insert_fun_node(tree, fun, str_dup(""), NULL);
         match_id_t *id = create_match_id();
-        id->id = clone_string("root");
+        id->id = str_dup("root");
         id->score = 100;
         add_match_id(&fun->match_ids, id);

uspace/srv/devman/util.c

@@ -91 +91 @@
 }
 
-char *clone_string(const char *s)
-{
-        size_t size = str_size(s) + 1;
-        char *str;
-        
-        str = (char *) malloc(size);
-        if (str != NULL)
-                str_cpy(str, size, s);
-        return str;
-}
-
 void replace_char(char *str, char orig, char repl)
 {
@@ -111 +100 @@
 }
 
-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

@@ -44 +44 @@
 extern size_t get_nonspace_len(const char *);
 extern void free_not_null(const void *);
-extern char *clone_string(const char *);
 extern void replace_char(char *, char, char);
-
-extern ssize_t safe_read(int, void *, size_t);
 
 #endif

uspace/srv/loader/Makefile

@@ -39 +39 @@
 LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link-loader.ld
 
-EXTRA_CFLAGS = -Iinclude
-
 BINARY = loader
 STATIC_ONLY = y
@@ -46 +44 @@
 GENERIC_SOURCES = \
         main.c \
-        elf_load.c \
         interp.s
 

uspace/srv/loader/main.c

@@ -59 +59 @@
 #include <str.h>
 #include <as.h>
-#include <elf.h>
-#include <elf_load.h>
+#include <elf/elf.h>
+#include <elf/elf_load.h>
 
 #ifdef CONFIG_RTLD
@@ -348 +348 @@
 
         /* Initialize list of loaded modules */
-        list_initialize(&runtime_env->modules_head);
-        list_append(&prog_mod.modules_link, &runtime_env->modules_head);
+        list_initialize(&runtime_env->modules);
+        list_append(&prog_mod.modules_link, &runtime_env->modules);
 
         /* Pointer to program module. Used as root of the module graph. */