Changeset ff381a7 in mainline for uspace/lib/c/generic/loader.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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/lib/c/generic/loader.c (modified) (3 diffs)

uspace/lib/c/generic/loader.c

@@ -69 +69 @@
         
         async_sess_t *sess =
-            service_connect_blocking(EXCHANGE_SERIALIZE, SERVICE_LOAD, 0, 0);
+            service_connect_blocking(SERVICE_LOADER, INTERFACE_LOADER, 0);
         if (sess == NULL) {
                 free(ldr);
@@ -124 +124 @@
                 return ENOMEM;
         
-        if (!getcwd(cwd, MAX_PATH_LEN + 1))
+        if (getcwd(cwd, MAX_PATH_LEN + 1) == NULL)
                 str_cpy(cwd, MAX_PATH_LEN + 1, "/");
         
@@ -162 +162 @@
 {
         size_t pa_len;
-        char *pa = absolutize(path, &pa_len);
+        char *pa = vfs_absolutize(path, &pa_len);
         if (!pa)
                 return ENOMEM;