Changeset 074444f in mainline for uspace/app/sbi/src/os

Timestamp:

2010-04-10T11:15:33Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1ef0fc3, 38aaacc2

Parents:

23de644

Message:

Update SBI to rev. 184.

Location:

uspace/app/sbi/src/os

Files:

• helenos.c (modified) (3 diffs)
• os.h (modified) (2 diffs)
• posix.c (modified) (4 diffs)

uspace/app/sbi/src/os/helenos.c

@@ -38 +38 @@
 #include "os.h"
 
+/** Path to executable file via which we have been invoked. */
+static char *ef_path;
+
 /*
  * Using HelenOS-specific string API.
@@ -70 +73 @@
 {
         return str_cmp(a, b);
+}
+
+/** Return number of characters in string. */
+size_t os_str_length(const char *str)
+{
+        return str_length(str);
 }
 
@@ -156 +165 @@
         return EOK;
 }
+
+/** Store the executable file path via which we were executed. */
+void os_store_ef_path(char *path)
+{
+        ef_path = path;
+}
+
+/** Return path to the Sysel library
+ *
+ * @return New string. Caller should deallocate it using @c free().
+ */
+char *os_get_lib_path(void)
+{
+        return os_str_dup("/src/sysel/lib");
+}

uspace/app/sbi/src/os/os.h

@@ -33 +33 @@
 int os_str_cmp(const char *a, const char *b);
 char *os_str_dup(const char *str);
+size_t os_str_length(const char *str);
 int os_str_get_char(const char *str, int index, int *out_char);
 void os_input_disp_help(void);
@@ -38 +39 @@
 int os_exec(char *const cmd[]);
 
+void os_store_ef_path(char *path);
+char *os_get_lib_path(void);
 
 #endif

uspace/app/sbi/src/os/posix.c

@@ -29 +29 @@
 /** @file POSIX-specific code. */
 
+#include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -39 +40 @@
 
 #include "os.h"
+
+/** Path to executable file via which we have been invoked. */
+static char *ef_path;
 
 /*
@@ -71 +75 @@
 {
         return strcmp(a, b);
+}
+
+/** Return number of characters in string. */
+size_t os_str_length(const char *str)
+{
+        return strlen(str);
 }
 
@@ -146 +156 @@
         return EOK;
 }
+
+/** Store the executable file path via which we were executed. */
+void os_store_ef_path(char *path)
+{
+        ef_path = path;
+}
+
+/** Return path to the Sysel library
+ *
+ * @return New string. Caller should deallocate it using @c free().
+ */
+char *os_get_lib_path(void)
+{
+        return os_str_acat(dirname(ef_path), "/lib");
+}