MonetDB: Jul2017 - Typos, and port to ancient Solaris.

[Sjoerd Mullender]

Changeset: b086c290eb45 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b086c290eb45
Modified Files:
        tools/merovingian/daemon/merovingian.c
Branch: Jul2017
Log Message:

Typos, and port to ancient Solaris.


diffs (32 lines):

diff --git a/tools/merovingian/daemon/merovingian.c 
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -83,6 +83,9 @@
 #ifndef O_CLOEXEC
 #define O_CLOEXEC 0
 #endif
+#ifndef F_DUPFD_CLOEXEC
+#define F_DUPFD_CLOEXEC F_DUPFD
+#endif
 
 
 /* private structs */
@@ -667,7 +670,7 @@ main(int argc, char *argv[])
                MERO_EXIT_CLEAN(1);
        }
 #if O_CLOEXEC == 0
-       fcntl(_mero_topdp->ou, F_SETFD< FD_CLOEXEC);
+       fcntl(_mero_topdp->out, F_SETFD, FD_CLOEXEC);
 #endif
        _mero_topdp->err = _mero_topdp->out;
 
@@ -694,6 +697,9 @@ main(int argc, char *argv[])
        }
        /* before it is too late, save original stderr */
        oerr = fdopen(fcntl(2, F_DUPFD_CLOEXEC), "w");
+#if F_DUPFD_CLOEXEC == F_DUPFD
+       fcntl(fileno(oerr), F_SETFD, FD_CLOEXEC);
+#endif
        d->err = pfd[0];
        fcntl(pfd[0], F_SETFD, FD_CLOEXEC);
        dup2(pfd[1], 2);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list