--- distcc-3.1.orig/source/src/arg.c
+++ distcc-3.1/source/src/arg.c
@@ -515,6 +515,8 @@
             }
             free(argv);
             *argv_ptr = argv = new_argv;
+            i += extra_args - 1;
+            argc += extra_args - 1;
         }
     }
     return 0;