[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/icecream-make-it-cool/daemon
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-08-31 21:51:30
Message-ID: 1157061090.924547.3852.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 579357 by mueller:

cleanup


 M  +4 -7      workit.cpp  


--- branches/work/icecream-make-it-cool/daemon/workit.cpp #579356:579357
@@ -256,7 +256,7 @@
         dup2( sock_err[1], STDERR_FILENO );
         close(sock_err[1]);
 
-        for(int f = 3; f < 4096; ++f) {
+        for(int f = STDERR_FILENO+1; f < 4096; ++f) {
            long flags;
            assert((flags = fcntl(f, F_GETFD, 0)) < 0 || (flags & FD_CLOEXEC));
         }
@@ -274,8 +274,6 @@
         struct timeval starttv;
         gettimeofday(&starttv, 0 );
  
-        {
-        log_block p_write("forwarding source");
         for (;;) {
             Msg* msg  = client->get_msg(60);
 
@@ -319,8 +317,9 @@
             delete msg;
             msg = 0;
         }
-        close (sock_in[1]);
-        }
+        close( sock_in[1] );
+        close( sock_out[1] );
+        close( sock_err[1] );
 
         log_block parent_wait("parent, waiting");
         // idea borrowed from kprocess
@@ -394,9 +393,7 @@
                 if (wait4(pid, &status, must_reap ? WUNTRACED : WNOHANG, &ru) != 0) \
// error finishes, too  {
                     close( sock_err[0] );
-                    close( sock_err[1] );
                     close( sock_out[0] );
-                    close( sock_out[1] );
 
                     if ( !WIFEXITED(status) || WEXITSTATUS(status) ) {
                         unsigned long int mem_used = ( ru.ru_minflt + ru.ru_majflt ) \
* getpagesize() / 1024;


[prev in list] [next in list] [prev in thread] [next in thread]