Changeset dda2602 in mainline for uspace/srv/sysman/util.c

Timestamp:

2019-08-03T09:41:07Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

dd5c623

Parents:

c0e4fc50

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-05-08 11:10:06)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-03 09:41:07)

Message:

sysman: Create units to start up to compositor

• add necessary units to support basic GUI (barber, vterm)
• lacking autostart is compensated with explicit dependencies
• IPC_FLAG_AUTOSTART in compositor and locsrv fix
• paths to v* binaries
• refactored job closure creation

Conflicts:

boot/Makefile.common
uspace/app/vlaunch/vlaunch.c
uspace/srv/hid/compositor/compositor.c
uspace/srv/locsrv/locsrv.c

File:

• uspace/srv/sysman/util.c (modified) (2 diffs)

uspace/srv/sysman/util.c

@@ -38 +38 @@
  * @return      NULL on error
  */
-char *compose_path(const char *dirname, const char *filename)
+char *util_compose_path(const char *dirname, const char *filename)
 {
         size_t size = str_size(dirname) + str_size(filename) + 2;
@@ -51 +51 @@
         return result;
 }
+
+/** Parse command line
+ *
+ * @param[out]  dst      pointer to command_t
+ *                       path and zeroth argument are the equal
+ *
+ * @return  true   on success
+ * @return  false  on (low memory) error
+ */
+bool util_parse_command(const char *string, void *dst, text_parse_t *parse,
+    size_t lineno)
+{
+        command_t *command = dst;
+        util_command_deinit(command);
+
+        command->buffer = str_dup(string);
+        if (!command->buffer) {
+                return false;
+        }
+
+        command->argc = 0;
+        char *to_split = command->buffer;
+        char *cur_tok;
+        bool has_path = false;
+
+        while ((cur_tok = str_tok(to_split, " ", &to_split)) &&
+            command->argc < MAX_COMMAND_ARGS) {
+                if (!has_path) {
+                        command->path = cur_tok;
+                        has_path = true;
+                }
+                command->argv[command->argc++] = cur_tok;
+        }
+        command->argv[command->argc] = NULL;
+
+
+        if (command->argc > MAX_COMMAND_ARGS) {
+                text_parse_raise_error(parse, lineno,
+                    CONFIGURATION_ELIMIT);
+                return false;
+        } else {
+                return true;
+        }
+}
+
+
+void util_command_init(command_t *command)
+{
+        memset(command, 0, sizeof(*command));
+}
+
+void util_command_deinit(command_t *command)
+{
+        free(command->buffer);
+        memset(command, 0, sizeof(*command));
+}