Changeset 9c5e3a5 in mainline

Timestamp:

2018-08-01T11:07:26Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1c398db2

Parents:

b79903b

git-author:

Jiri Svoboda <jiri@…> (2018-07-31 18:06:53)

git-committer:

Jiri Svoboda <jiri@…> (2018-08-01 11:07:26)

Message:

SIF node unmarshalling.

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/app/contacts/contacts.c (modified) (1 diff)
• uspace/lib/sif/src/sif.c (modified) (5 diffs)

boot/Makefile.common

@@ -241 +241 @@
         $(USPACE_PATH)/lib/label/test-liblabel \
         $(USPACE_PATH)/lib/posix/test-libposix \
+        $(USPACE_PATH)/lib/sif/test-libsif \
         $(USPACE_PATH)/lib/uri/test-liburi \
         $(USPACE_PATH)/drv/bus/usb/xhci/test-xhci \

uspace/app/contacts/contacts.c

@@ -202 +202 @@
         free(cname);
         tinput_destroy(tinput);
+        return EOK;
 error:
         if (trans != NULL)

uspace/lib/sif/src/sif.c

@@ -68 +68 @@
 
 static errno_t sif_export_node(sif_node_t *, FILE *);
+static errno_t sif_import_node(sif_node_t *, FILE *, sif_node_t **);
 
 /** Create new SIF node.
@@ -169 +170 @@
                 return ENOMEM;
 
-        root = sif_node_new(NULL);
-        if (root == NULL) {
-                rc = ENOMEM;
-                goto error;
-        }
-
-        root->ntype = str_dup("sif");
-        if (root->ntype == NULL) {
-                rc = ENOMEM;
-                goto error;
-        }
-
         f = fopen(fname, "r+");
         if (f == NULL) {
@@ -186 +175 @@
                 goto error;
         }
+
+        rc = sif_import_node(NULL, f, &root);
+        if (rc != EOK)
+                goto error;
+
+        if (str_cmp(root->ntype, "sif") != 0) {
+                rc = EIO;
+                goto error;
+        }
+
+        sess->root = root;
 
         sess->f = f;
@@ -534 +534 @@
 }
 
+/** Import string from file.
+ *
+ * Import string from file (the string in the file must be
+ * properly bracketed and escaped).
+ *
+ * @param f File
+ * @param rstr Place to store pointer to newly allocated string
+ * @return EOK on success, EIO on I/O error
+ */
+static errno_t sif_import_string(FILE *f, char **rstr)
+{
+        char *str;
+        size_t str_size;
+        size_t sidx;
+        char c;
+        errno_t rc;
+
+        str_size = 1;
+        sidx = 0;
+        str = malloc(str_size + 1);
+        if (str == NULL)
+                return ENOMEM;
+
+        c = fgetc(f);
+        if (c != '[') {
+                rc = EIO;
+                goto error;
+        }
+
+        while (true) {
+                c = fgetc(f);
+                if (c == EOF) {
+                        rc = EIO;
+                        goto error;
+                }
+
+                if (c == ']')
+                        break;
+
+                if (c == '\\') {
+                        c = fgetc(f);
+                        if (c == EOF) {
+                                rc = EIO;
+                                goto error;
+                        }
+                }
+
+                if (sidx >= str_size) {
+                        str_size *= 2;
+                        str = realloc(str, str_size + 1);
+                        if (str == NULL) {
+                                rc = ENOMEM;
+                                goto error;
+                        }
+                }
+
+                str[sidx++] = c;
+        }
+
+        str[sidx] = '\0';
+        *rstr = str;
+        return EOK;
+error:
+        free(str);
+        return rc;
+}
+
 /** Export SIF node to file.
  *
@@ -567 +634 @@
 }
 
+/** Import SIF node from file.
+ *
+ * @param parent Parent node
+ * @param f File
+ * @param rnode Place to store pointer to imported node
+ * @return EOK on success, EIO on I/O error
+ */
+static errno_t sif_import_node(sif_node_t *parent, FILE *f, sif_node_t **rnode)
+{
+        errno_t rc;
+        sif_node_t *node = NULL;
+        sif_node_t *child;
+        char *ntype;
+        char c;
+
+        node = sif_node_new(parent);
+        if (node == NULL)
+                return ENOMEM;
+
+        rc = sif_import_string(f, &ntype);
+        if (rc != EOK)
+                goto error;
+
+        node->ntype = ntype;
+
+        c = fgetc(f);
+        if (c != '{') {
+                rc = EIO;
+                goto error;
+        }
+
+        c = fgetc(f);
+        if (c == EOF) {
+                rc = EIO;
+                goto error;
+        }
+
+        while (c != '}') {
+                ungetc(c, f);
+
+                rc = sif_import_node(node, f, &child);
+                if (rc != EOK)
+                        goto error;
+
+                list_append(&child->lparent, &node->children);
+
+                c = fgetc(f);
+                if (c == EOF) {
+                        rc = EIO;
+                        goto error;
+                }
+        }
+
+        *rnode = node;
+        return EOK;
+error:
+        sif_node_delete(node);
+        return rc;
+}
+
 /** @}
  */