Revert all close-on-exec changes from earlier today

with b26cc125 these are no longer needed.

diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc
index 119f01fc6b30a3005842f246c61a78433753b60e..db1b316368e7d1b0fc3f4cb5e6ba72a48cefc33f 100644 (file)
--- a/libs/ardour/butler.cc
+++ b/libs/ardour/butler.cc
@@ -110,9 +110,6 @@ Butler::start_thread()
                return -1;
        }
 
-       fcntl(request_pipe[0], F_SETFD, fcntl(request_pipe[0], F_GETFD) | FD_CLOEXEC);
-       fcntl(request_pipe[1], F_SETFD, fcntl(request_pipe[1], F_GETFD) | FD_CLOEXEC);
-
        //pthread_detach (thread);
 
        return 0;

diff --git a/libs/ardour/rdff.c b/libs/ardour/rdff.c
index 9dbb6ddae1e582229130a94f8515b0d0f6c02d0a..ca8e1abf1fd6d07a155ea957c2cca4123188e7b6 100644 (file)
--- a/libs/ardour/rdff.c
+++ b/libs/ardour/rdff.c
@@ -74,8 +74,6 @@ rdff_open(const char* path, bool write)
                }
        }
 
-       fcntl(fileno(fd), F_SETFD, fcntl(fileno(fd), F_GETFD) | FD_CLOEXEC);
-
        RDFF ret = (RDFF)malloc(sizeof(struct _RDFF));
        ret->fd    = fd;
        ret->size  = size;

diff --git a/libs/midi++2/ipmidi_port.cc b/libs/midi++2/ipmidi_port.cc
index 543c63e343dfbe4920fa0005e610584666807fa3..c90a3dbe6fd133a2200c21cf4ce38fd9e92ed2e6 100644 (file)
--- a/libs/midi++2/ipmidi_port.cc
+++ b/libs/midi++2/ipmidi_port.cc
@@ -160,8 +160,6 @@ IPMIDIPort::open_sockets (int base_port, const string& ifname)
                return false;
        }
 
-       fcntl(sockin, F_SETFD, fcntl(sockin, F_GETFD) | FD_CLOEXEC);
-
        struct sockaddr_in addrin;
        ::memset(&addrin, 0, sizeof(addrin));
        addrin.sin_family = AF_INET;
@@ -208,8 +206,6 @@ IPMIDIPort::open_sockets (int base_port, const string& ifname)
                ::perror("socket(out)");
                return false;
        }
-
-       fcntl(sockout, F_SETFD, fcntl(sockout, F_GETFD) | FD_CLOEXEC);
        
        // Will Hall, Oct 2007
        if (!ifname.empty()) {

diff --git a/libs/pbd/crossthread.cc b/libs/pbd/crossthread.cc
index aa9d2edcd2e75a0a372ca6dc903bc92296f15973..2ffede5163aecc736372818fd82ddb934b2d8d42 100644 (file)
--- a/libs/pbd/crossthread.cc
+++ b/libs/pbd/crossthread.cc
@@ -52,8 +52,6 @@ CrossThreadChannel::CrossThreadChannel (bool non_blocking)
                        return;
                }
        }
-       fcntl(fds[0], F_SETFD, fcntl(fds[0], F_GETFD) | FD_CLOEXEC);
-       fcntl(fds[1], F_SETFD, fcntl(fds[1], F_GETFD) | FD_CLOEXEC);
 }
 
 CrossThreadChannel::~CrossThreadChannel ()

diff --git a/libs/pbd/file_manager.cc b/libs/pbd/file_manager.cc
index fb3227a92298c8e63310dc65cf6075e3ae4b7319..a71ffca190259be5c24c66706d95bd6da7694e19 100644 (file)
--- a/libs/pbd/file_manager.cc
+++ b/libs/pbd/file_manager.cc
@@ -289,9 +289,6 @@ StdioFileDescriptor::open ()
        /* we must have a lock on the FileManager's mutex */
        
        _file = fopen (_path.c_str(), _mode.c_str());
-       if (_file) {
-               fcntl(fileno(_file), F_SETFD, fcntl(fileno(_file), F_GETFD) | FD_CLOEXEC);
-       }
        return (_file == 0);
 }
 

diff --git a/libs/pbd/sndfile_manager.cc b/libs/pbd/sndfile_manager.cc
index c53778ac0d33daeca392c85b6dbbe7cd46fd0b6f..d1dcd0525657a38b875752d0428464d450889dd6 100644 (file)
--- a/libs/pbd/sndfile_manager.cc
+++ b/libs/pbd/sndfile_manager.cc
@@ -31,16 +31,6 @@
 #include "pbd/sndfile_manager.h"
 #include "pbd/debug.h"
 
-/*
- * Neat solution to the Win32/OS2 binary file flage requirement.
- * If O_BINARY isn't already defined by the inclusion of the system
- * headers, set it to zero.
- */
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-
 using namespace std;
 using namespace PBD;
 
@@ -99,32 +89,8 @@ bool
 SndFileDescriptor::open ()
 {
        /* we must have a lock on the FileManager's mutex */
-
-       int fd, oflag, mode ;
-
-       if (_writeable) {
-               oflag = O_RDWR | O_CREAT | O_BINARY ;
-               mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH ;
-       } else {
-               oflag = O_RDONLY | O_BINARY ;
-               mode = 0 ;
-       }
-
-       if (mode == 0) {
-               fd = ::open (_path.c_str(), oflag) ;
-       } else {
-               fd = ::open (_path.c_str(), oflag, mode) ;
-       }
-
-       if (fd == -1) return false;
-       fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
-
-       _sndfile = sf_open_fd (fd, _writeable ? SFM_RDWR : SFM_READ, _info, 1);
-
-       if (_sndfile == 0) {
-               ::close(fd);
-       }
-
+       
+       _sndfile = sf_open (_path.c_str(), _writeable ? SFM_RDWR : SFM_READ, _info);
        return (_sndfile == 0);
 }
 

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index d02626f4af7e32d59917c65b1c128917d2cabcb6..0c7c8455a471c5debd5778efe3535db154e44425 100644 (file)
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -170,9 +170,6 @@ OSC::start ()
        if (!_osc_server) {
                return 1;
        }
-
-       int fd = lo_server_get_socket_fd (_osc_server);
-       fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
        
 #ifdef ARDOUR_OSC_UNIX_SERVER
        
@@ -181,7 +178,7 @@ OSC::start ()
        // attempt to create unix socket server too
        
        snprintf(tmpstr, sizeof(tmpstr), "/tmp/sooperlooper_XXXXXX");
-       fd = mkstemp(tmpstr);
+       int fd = mkstemp(tmpstr);
        
        if (fd >= 0 ) {
                unlink (tmpstr);
@@ -191,8 +188,6 @@ OSC::start ()
                
                if (_osc_unix_server) {
                        _osc_unix_socket_path = tmpstr;
-                       fd = lo_server_get_socket_fd (_osc_unix_server)
-                       fcntl(fdx, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
                }
        }
 #endif
@@ -232,23 +227,19 @@ OSC::thread_init ()
        pthread_set_name (X_("OSC"));
 
        if (_osc_unix_server) {
-               const int fd = lo_server_get_socket_fd (_osc_unix_server);
                Glib::RefPtr<IOSource> src = IOSource::create (lo_server_get_socket_fd (_osc_unix_server), IO_IN|IO_HUP|IO_ERR);
                src->connect (sigc::bind (sigc::mem_fun (*this, &OSC::osc_input_handler), _osc_unix_server));
                src->attach (_main_loop->get_context());
                local_server = src->gobj();
                g_source_ref (local_server);
-               fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
        }
 
        if (_osc_server) {
-               const int fd = lo_server_get_socket_fd (_osc_server);
-               Glib::RefPtr<IOSource> src  = IOSource::create (fd, IO_IN|IO_HUP|IO_ERR);
+               Glib::RefPtr<IOSource> src  = IOSource::create (lo_server_get_socket_fd (_osc_server), IO_IN|IO_HUP|IO_ERR);
                src->connect (sigc::bind (sigc::mem_fun (*this, &OSC::osc_input_handler), _osc_server));
                src->attach (_main_loop->get_context());
                remote_server = src->gobj();
                g_source_ref (remote_server);
-               fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
        }
 
        PBD::notify_gui_about_thread_creation (X_("gui"), pthread_self(), X_("OSC"), 2048);