Changeset 7ab7075f in mainline for uspace/lib/c/generic/io/io.c

Timestamp:

2018-08-06T18:40:12Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1dcba91

Parents:

7afd12e5

Message:

Add support for 'x' fopen file mode modifier from C11.

File:

• uspace/lib/c/generic/io/io.c (modified) (8 diffs)

uspace/lib/c/generic/io/io.c

@@ -185 +185 @@
 }
 
-static bool parse_mode(const char *fmode, int *mode, bool *create, bool *truncate)
+static bool parse_mode(const char *fmode, int *mode, bool *create, bool *excl,
+    bool *truncate)
 {
         /* Parse mode except first character. */
         const char *mp = fmode;
-        if (*mp++ == 0) {
+
+        if (*mp++ == '\0') {
                 errno = EINVAL;
                 return false;
@@ -201 +203 @@
                 mp++;
                 plus = true;
-        } else
+        } else {
                 plus = false;
-
-        if (*mp != 0) {
+        }
+
+        bool ex;
+        if (*mp == 'x') {
+                mp++;
+                ex = true;
+        } else {
+                ex = false;
+        }
+
+        if (*mp != '\0') {
                 errno = EINVAL;
                 return false;
@@ -211 +222 @@
         *create = false;
         *truncate = false;
+        *excl = false;
 
         /* Parse first character of fmode and determine mode for vfs_open(). */
@@ -216 +228 @@
         case 'r':
                 *mode = plus ? MODE_READ | MODE_WRITE : MODE_READ;
+                if (ex) {
+                        errno = EINVAL;
+                        return false;
+                }
                 break;
         case 'w':
                 *mode = plus ? MODE_READ | MODE_WRITE : MODE_WRITE;
                 *create = true;
+                *excl = ex;
                 if (!plus)
                         *truncate = true;
@@ -227 +244 @@
                 if (plus) {
                         errno = ENOTSUP;
+                        return false;
+                }
+
+                if (ex) {
+                        errno = EINVAL;
                         return false;
                 }
@@ -307 +329 @@
  *
  * @param path Path of the file to open.
- * @param mode Mode string, (r|w|a)[b|t][+].
+ * @param mode Mode string, (r|w|a)[b|t][+][x].
  *
  */
@@ -314 +336 @@
         int mode;
         bool create;
+        bool excl;
         bool truncate;
 
-        if (!parse_mode(fmode, &mode, &create, &truncate))
+        if (!parse_mode(fmode, &mode, &create, &excl, &truncate))
                 return NULL;
 
@@ -327 +350 @@
 
         int flags = WALK_REGULAR;
-        if (create)
+        if (create && excl)
+                flags |= WALK_MUST_CREATE;
+        else if (create)
                 flags |= WALK_MAY_CREATE;
         int file;