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

List:       kde-commits
Subject:    icecream/client
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-06-07 8:51:03
Message-ID: 1149670263.898377.5077.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 549042 by mueller:

assert sanity and make colorgcc nesting possible.


 M  +8 -2      local.cpp  


--- trunk/icecream/client/local.cpp #549041:549042
@@ -69,6 +69,7 @@
     string::size_type begin = 0;
     string::size_type end = 0;
     struct stat s;
+    bool after_selflink = false;
 
     while ( end != string::npos ) {
         end = path.find_first_of( ':', begin );
@@ -90,12 +91,17 @@
                 }
                 buffer[ret] = 0;
                 string target = find_basename( buffer );
-                if ( target == rs_program_name || target == "tbcompiler" || target \
== "distcc" || target == "colorgcc" ) { +                if ( target == \
rs_program_name  +                     || after_selflink
+                        && (target == "tbcompiler" || target == "distcc"
+                            || target == "colorgcc") ) {
                     // this is a link pointing to us, ignore it
+                    after_selflink = true;
                     continue;
                 }
             }
-            return part;
+            if(after_selflink)
+                return part;
         }
     }
     log_error() << "couldn't find any " << compiler << endl;


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