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

List:       kde-commits
Subject:    kdenonbeta/icecream/icecream
From:       Stephan Kulow <coolo () kde ! org>
Date:       2004-09-05 10:13:04
Message-ID: 20040905101304.E48131CC2 () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

don't make up exit codes


  M +1 -1      client/local.cpp   1.21
  M +1 -0      client/remote.cpp   1.82
  M +1 -2      daemon/main.cpp   1.108
  M +1 -1      daemon/serve.cpp   1.55


--- kdenonbeta/icecream/icecream/client/local.cpp  #1.20:1.21
@@ -164,5 +164,5 @@ int build_local(CompileJob &job, struct 
         void (*old_sighup)(int) = signal( SIGHUP, handle_user_break );
 
-        int status = -1;
+        int status = 1;
         if( wait4( child, &status, 0, used ) > 0 )
             status = WEXITSTATUS(status);

--- kdenonbeta/icecream/icecream/client/remote.cpp  #1.81:1.82
@@ -477,4 +477,5 @@ maybe_build_local (MsgChannel *scheduler
             msg.sys_msec = ru.ru_stime.tv_sec * 1000 + ru.ru_stime.tv_usec / 1000;
             msg.pfaults = ru.ru_majflt + ru.ru_minflt + ru.ru_nswap ;
+            msg.exitcode = ret;
 
             if ( IS_PROTOCOL_16( cserver ) )

--- kdenonbeta/icecream/icecream/daemon/main.cpp  #1.107:1.108
@@ -683,5 +682,5 @@ int main( int argc, char ** argv )
                 }
                 if ( msg && scheduler ) {
-                    msg->exitcode = status;
+                    msg->exitcode = WEXITSTATUS( status );
                     if ( !msg->user_msec ) { // if not already set
                         msg->user_msec = ru.ru_utime.tv_sec * 1000 + ru.ru_utime.tv_usec / 1000;

--- kdenonbeta/icecream/icecream/daemon/serve.cpp  #1.54:1.55
@@ -276,5 +276,5 @@ int handle_connection( const string &bas
     }
 
-    throw myexception( 0 );
+    throw myexception( rmsg.status );
 
     } catch ( myexception e )


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