Changeset 1dcba91 in mainline for uspace/lib/sif/src/sif.c

Timestamp:

2018-08-08T10:08:53Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

44428bb

Parents:

7ab7075f

git-author:

Jiri Svoboda <jiri@…> (2018-08-07 17:07:59)

git-committer:

Jiri Svoboda <jiri@…> (2018-08-08 10:08:53)

Message:

Configuration repository for volume server.

File:

• uspace/lib/sif/src/sif.c (modified) (6 diffs)

uspace/lib/sif/src/sif.c

@@ -191 +191 @@
                 return ENOMEM;
 
+        sess->fname = str_dup(fname);
+        if (sess->fname == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
         root = sif_node_new(NULL);
         if (root == NULL) {
@@ -227 +233 @@
                 sif_trans_abort(trans);
         sif_node_delete(root);
+        if (sess->fname != NULL)
+                free(sess->fname);
         free(sess);
         return rc;
@@ -249 +257 @@
                 return ENOMEM;
 
-        f = fopen(fname, "r+");
+        sess->fname = str_dup(fname);
+        if (sess->fname == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        f = fopen(fname, "r");
         if (f == NULL) {
                 rc = EIO;
@@ -272 +286 @@
 error:
         sif_node_delete(root);
+        if (sess->fname != NULL)
+                free(sess->fname);
         free(sess);
         return rc;
@@ -290 +306 @@
         }
 
+        if (sess->fname != NULL)
+                free(sess->fname);
+        free(sess);
         return EOK;
 }
@@ -394 +413 @@
         errno_t rc;
 
-        rewind(trans->sess->f);
+        (void) fclose(trans->sess->f);
+
+        trans->sess->f = fopen(trans->sess->fname, "w");
+        if (trans->sess->f == NULL)
+                return EIO;
 
         rc = sif_export_node(trans->sess->root, trans->sess->f);
         if (rc != EOK)
                 return rc;
+
+        if (fputc('\n', trans->sess->f) == EOF)
+                return EIO;
+
+        if (fflush(trans->sess->f) == EOF)
+                return EIO;
 
         free(trans);