embed: Avoid redefining open() and close() to prevent conflicts with others.

Author: Maxwell175

Include/np_embed.h

@@ -136,84 +136,18 @@ NP_DECL(int) np_ftrylockfile(void *e);
 
 #ifndef NUITKAPYTHON_EMBED_BUILD
 
-/* Using a bunch of macros from
- * https://github.com/pfultz2/Cloak/wiki/C-Preprocessor-tricks,-tips,-and-idioms
- */
-
-#define CAT(a, ...) PRIMITIVE_CAT(a, __VA_ARGS__)
-#define PRIMITIVE_CAT(a, ...) a ## __VA_ARGS__
-
-#define IIF(c) PRIMITIVE_CAT(IIF_, c)
-#define IIF_0(t, ...) __VA_ARGS__
-#define IIF_1(t, ...) t
-
-#define COMPL(b) PRIMITIVE_CAT(COMPL_, b)
-#define COMPL_0 1
-#define COMPL_1 0
-
-#define DEC(x) PRIMITIVE_CAT(DEC_, x)
-#define DEC_0 0
-#define DEC_1 0
-#define DEC_2 1
-#define DEC_3 2
-#define DEC_4 3
-#define DEC_5 4
-#define DEC_6 5
-#define DEC_7 6
-#define DEC_8 7
-#define DEC_9 8
-#define DEC_10 9
-#define DEC_11 10
-#define DEC_12 11
-#define DEC_13 12
-#define DEC_14 13
-#define DEC_15 14
-#define DEC_16 15
-#define DEC_17 16
-#define DEC_18 17
-#define DEC_19 18
-#define DEC_20 19
-
-#define CHECK_N(x, n, ...) n
-#define CHECK(...) CHECK_N(__VA_ARGS__, 0,)
-#define PROBE(x) x, 1,
-
-#define IS_PAREN(x) CHECK(IS_PAREN_PROBE x)
-#define IS_PAREN_PROBE(...) PROBE(~)
-
-#define NOT(x) CHECK(PRIMITIVE_CAT(NOT_, x))
-#define NOT_0 PROBE(~)
-
-#define BOOL(x) COMPL(NOT(x))
-#define IF(c) IIF(BOOL(c))
-
-#define EAT(...)
-#define EXPAND(...) __VA_ARGS__
-#define WHEN(c) IF(c)(EXPAND, EAT)
-
-#define EXPAND(...) __VA_ARGS__
-
-#define NUM_ARGS1(_20,_19,_18,_17,_16,_15,_14,_13,_12,_11,_10,_9,_8,_7,_6,_5,_4,_3,_2,_1, n, ...) n
-#define NUM_ARGS0(...) NUM_ARGS1(__VA_ARGS__,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0)
-#define NUM_ARGS(...) IF(DEC(NUM_ARGS0(__VA_ARGS__)))(NUM_ARGS0(__VA_ARGS__),IF(IS_PAREN(__VA_ARGS__ ()))(0,1))
-
 // Preprocessor Translation
 #define FILE EFILE
 /* File Opening and Closing */
 #define fopen np_fopen
 #define _fopen np_fopen
-// Basically this very complicated macro overrides only calls to open() functions that have 2 or more arguments to avoid compatibility issues.
-#define open(...) WHEN(DEC(NUM_ARGS( __VA_ARGS__ )))(np_open(__VA_ARGS__))WHEN(NOT(DEC(NUM_ARGS( __VA_ARGS__ ))))(open(__VA_ARGS__))
 #define _open np_open
 #define fdopen np_fdopen
 #define _fdopen np_fdopen
 #define freopen np_freopen
 #define _freopen np_freopen
 #define fclose np_fclose
 #define _fclose np_fclose
-#ifndef _WIN32
-#define close np_close
-#endif
 #define _close np_close
 #ifdef _WIN32
 #define wopen np_wopen

Modules/_io/fileio.c

@@ -114,7 +114,7 @@ internal_close(fileio *self)
         /* fd is accessible and someone else may have closed it */
         Py_BEGIN_ALLOW_THREADS
         _Py_BEGIN_SUPPRESS_IPH
-        err = close(fd);
+        err = _close(fd);
         if (err < 0)
             save_errno = errno;
         _Py_END_SUPPRESS_IPH
@@ -381,7 +381,7 @@ _Py_COMP_DIAG_POP
 #ifdef MS_WINDOWS
                 self->fd = _wopen(widename, flags, 0666);
 #else
-                self->fd = open(name, flags, 0666);
+                self->fd = _open(name, flags, 0666);
 #endif
                 Py_END_ALLOW_THREADS
             } while (self->fd < 0 && errno == EINTR &&

Modules/_io/winconsoleio.c

@@ -187,7 +187,7 @@ internal_close(winconsoleio *self)
     if (self->fd != -1) {
         if (self->closefd) {
             _Py_BEGIN_SUPPRESS_IPH
-            close(self->fd);
+            _close(self->fd);
             _Py_END_SUPPRESS_IPH
         }
         self->fd = -1;

Modules/_posixsubprocess.c

@@ -350,11 +350,11 @@ _close_open_fds_safe(int start_fd, int *fds_to_keep, Py_ssize_t fds_to_keep_len)
                 if (fd != fd_dir_fd && fd >= start_fd &&
                     !_is_fd_in_sorted_fd_sequence(fd, fds_to_keep,
                                                   fds_to_keep_len)) {
-                    close(fd);
+                    _close(fd);
                 }
             }
         }
-        close(fd_dir_fd);
+        _close(fd_dir_fd);
     }
 }
 
@@ -396,7 +396,7 @@ _close_open_fds_maybe_unsafe(int start_fd, int *fds_to_keep,
      * reuse that fd otherwise we might close opendir's file descriptor in
      * our loop.  This trick assumes that fd's are allocated on a lowest
      * available basis. */
-    close(start_fd);
+    _close(start_fd);
     ++start_fd;
 #endif
 
@@ -425,7 +425,7 @@ _close_open_fds_maybe_unsafe(int start_fd, int *fds_to_keep,
             if (fd != fd_used_by_opendir && fd >= start_fd &&
                 !_is_fd_in_sorted_fd_sequence(fd, fds_to_keep,
                                               fds_to_keep_len)) {
-                close(fd);
+                _close(fd);
             }
             errno = 0;
         }

Modules/expat/xmlparse.c

@@ -844,7 +844,7 @@ writeRandomBytes_dev_urandom(void *target, size_t count) {
     }
   } while (! success && (errno == EINTR));
 
-  close(fd);
+  _close(fd);
   return success;
 }
 

Modules/mmapmodule.c

@@ -161,7 +161,7 @@ mmap_object_dealloc(mmap_object *m_obj)
 #ifdef UNIX
     Py_BEGIN_ALLOW_THREADS
     if (m_obj->fd >= 0)
-        (void) close(m_obj->fd);
+        (void) _close(m_obj->fd);
     if (m_obj->data!=NULL) {
         munmap(m_obj->data, m_obj->size);
     }
@@ -217,7 +217,7 @@ mmap_close_method(mmap_object *self, PyObject *unused)
     self->data = NULL;
     Py_BEGIN_ALLOW_THREADS
     if (0 <= fd)
-        (void) close(fd);
+        (void) _close(fd);
     if (data != NULL) {
         munmap(data, self->size);
     }

Modules/posixmodule.c

@@ -4211,7 +4211,7 @@ _posix_listdir(path_t *path, PyObject *list)
 #ifdef HAVE_FDOPENDIR
         if (fd != -1) {
             Py_BEGIN_ALLOW_THREADS
-            close(fd);
+            _close(fd);
             Py_END_ALLOW_THREADS
         }
 #endif
@@ -7497,9 +7497,9 @@ os_openpty_impl(PyObject *module)
     posix_error();
 error:
     if (master_fd != -1)
-        close(master_fd);
+        _close(master_fd);
     if (slave_fd != -1)
-        close(slave_fd);
+        _close(slave_fd);
     return NULL;
 }
 #endif /* defined(HAVE_OPENPTY) || defined(HAVE__GETPTY) || defined(HAVE_DEV_PTMX) */
@@ -7547,7 +7547,7 @@ os_login_tty_impl(PyObject *module, int fd)
         return posix_error();
     }
     if (fd > 2) {
-        close(fd);
+        _close(fd);
     }
 #endif /* HAVE_LOGIN_TTY */
     Py_RETURN_NONE;
@@ -9377,7 +9377,7 @@ os_open_impl(PyObject *module, path_t *path, int flags, int mode, int dir_fd)
             }
         } else
 #endif /* HAVE_OPENAT */
-            fd = open(path->narrow, flags, mode);
+            fd = _open(path->narrow, flags, mode);
 #endif /* !MS_WINDOWS */
         Py_END_ALLOW_THREADS
     } while (fd < 0 && errno == EINTR && !(async_err = PyErr_CheckSignals()));
@@ -9398,7 +9398,7 @@ os_open_impl(PyObject *module, path_t *path, int flags, int mode, int dir_fd)
 
 #ifndef MS_WINDOWS
     if (_Py_set_inheritable(fd, 0, atomic_flag_works) < 0) {
-        close(fd);
+        _close(fd);
         return -1;
     }
 #endif
@@ -9426,7 +9426,7 @@ os_close_impl(PyObject *module, int fd)
      */
     Py_BEGIN_ALLOW_THREADS
     _Py_BEGIN_SUPPRESS_IPH
-    res = close(fd);
+    res = _close(fd);
     _Py_END_SUPPRESS_IPH
     Py_END_ALLOW_THREADS
     if (res < 0)
@@ -9512,7 +9512,7 @@ os_dup2_impl(PyObject *module, int fd, int fd2, int inheritable)
 
     /* Character files like console cannot be make non-inheritable */
     if (!inheritable && _Py_set_inheritable(fd2, 0, NULL) < 0) {
-        close(fd2);
+        _close(fd2);
         return -1;
     }
 
@@ -9557,7 +9557,7 @@ os_dup2_impl(PyObject *module, int fd, int fd2, int inheritable)
         }
 
         if (!inheritable && _Py_set_inheritable(fd2, 0, NULL) < 0) {
-            close(fd2);
+            _close(fd2);
             return -1;
         }
 #ifdef HAVE_DUP3
@@ -10373,13 +10373,13 @@ os_pipe_impl(PyObject *module)
 
         if (res == 0) {
             if (_Py_set_inheritable(fds[0], 0, NULL) < 0) {
-                close(fds[0]);
-                close(fds[1]);
+                _close(fds[0]);
+                _close(fds[1]);
                 return NULL;
             }
             if (_Py_set_inheritable(fds[1], 0, NULL) < 0) {
-                close(fds[0]);
-                close(fds[1]);
+                _close(fds[0]);
+                _close(fds[1]);
                 return NULL;
             }
         }
@@ -11014,7 +11014,7 @@ os_truncate_impl(PyObject *module, path_t *path, Py_off_t length)
         result = -1;
     else {
         result = _chsize_s(fd, length);
-        close(fd);
+        _close(fd);
         if (result < 0)
             errno = result;
     }
@@ -14648,7 +14648,7 @@ os_scandir_impl(PyObject *module, path_t *path)
 #ifdef HAVE_FDOPENDIR
         if (fd != -1) {
             Py_BEGIN_ALLOW_THREADS
-            close(fd);
+            _close(fd);
             Py_END_ALLOW_THREADS
         }
 #endif

Modules/selectmodule.c

@@ -1029,7 +1029,7 @@ devpoll_internal_close(devpollObject *self)
         int fd = self->fd_devpoll;
         self->fd_devpoll = -1;
         Py_BEGIN_ALLOW_THREADS
-        if (close(fd) < 0)
+        if (_close(fd) < 0)
             save_errno = errno;
         Py_END_ALLOW_THREADS
     }

Python/dup2.c

@@ -25,7 +25,7 @@ dup2(int fd1, int fd2)
         if (fcntl(fd1, F_GETFL) < 0)
             return BADEXIT;
         if (fcntl(fd2, F_GETFL) >= 0)
-            close(fd2);
+            _close(fd2);
         if (fcntl(fd1, F_DUPFD, fd2) < 0)
             return BADEXIT;
 #else

Python/fileutils.c

@@ -1552,7 +1552,7 @@ _Py_open_impl(const char *pathname, int flags, int gil_held)
 
 #ifndef MS_WINDOWS
     if (set_inheritable(fd, 0, gil_held, atomic_flag_works) < 0) {
-        close(fd);
+        _close(fd);
         return -1;
     }
 #endif
@@ -2384,7 +2384,7 @@ _Py_dup(int fd)
 
     if (_Py_set_inheritable(fd, 0, NULL) < 0) {
         _Py_BEGIN_SUPPRESS_IPH
-        close(fd);
+        _close(fd);
         _Py_END_SUPPRESS_IPH
         return -1;
     }
@@ -2412,7 +2412,7 @@ _Py_dup(int fd)
 
     if (_Py_set_inheritable(fd, 0, NULL) < 0) {
         _Py_BEGIN_SUPPRESS_IPH
-        close(fd);
+        _close(fd);
         _Py_END_SUPPRESS_IPH
         return -1;
     }
@@ -2635,7 +2635,7 @@ _fdwalk_close_func(void *lohi, int fd)
     }
     else if (fd >= lo) {
         /* Ignore errors */
-        (void)close(fd);
+        (void)_close(fd);
     }
     return 0;
 }
@@ -2674,7 +2674,7 @@ _Py_closerange(int first, int last)
     {
         for (int i = first; i <= last; i++) {
             /* Ignore errors */
-            (void)close(i);
+            (void)_close(i);
         }
     }
 #endif /* USE_FDWALK */