Changeset ca4c6ec1 in mainline

Timestamp:

2012-08-31T10:18:53Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f8cbe2c3

Parents:

a3da2b2

Message:

libposix: replace macro with function (open())

Location:

uspace/lib/posix

Files:

• include/posix/fcntl.h (modified) (1 diff)
• source/fcntl.c (modified) (1 diff)

uspace/lib/posix/include/posix/fcntl.h

@@ -72 +72 @@
 #define FD_CLOEXEC         1 /* Close on exec. */
 
-#undef open
-#define open(path, ...) \
-        ({ \
-                int rc = open(path, ##__VA_ARGS__); \
-                if (rc < 0) { \
-                        errno = -rc; \
-                        rc = -1; \
-                } \
-                rc; \
-        })
-
+extern int posix_open(const char *pathname, int flags, ...);
 extern int posix_fcntl(int fd, int cmd, ...);
 
 #ifndef LIBPOSIX_INTERNAL
         #define fcntl posix_fcntl
+        #define open posix_open
 #endif
 

uspace/lib/posix/source/fcntl.c

@@ -95 +95 @@
 }
 
+/**
+ * Open, possibly create, a file.
+ *
+ * @param pathname Path to the file.
+ * @param flags Access mode flags.
+ */
+int posix_open(const char *pathname, int flags, ...)
+{
+        mode_t mode = 0;
+        if ((flags & O_CREAT) > 0) {
+                va_list args;
+                va_start(args, flags);
+                mode = va_arg(args, mode_t);
+                va_end(args);
+        }
+
+        int rc = open(pathname, flags, mode);
+        if (rc < 0) {
+                errno = -rc;
+                rc = -1;
+        }
+
+        return rc;
+}
+
 /** @}
  */