[cowdancer] 02/02: Only print quotes around arguments with spaces

[James Clarke]

This is an automated email from the git hooks/post-receive script.

jrtc27-guest pushed a commit to branch master
in repository cowdancer.

commit 28b38495c1d378ef1d6eb8332b308e2b0655e8df
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Thu Sep 8 22:54:16 2016 +0100

    Only print quotes around arguments with spaces
---
 forkexec.c    | 17 ++++++++++++++---
 qemubuilder.c |  8 ++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/forkexec.c b/forkexec.c
index 35936a2..c3c9334 100644
--- a/forkexec.c
+++ b/forkexec.c
@@ -45,7 +45,10 @@ int forkexecvp (char *const argv[])
 
     for (i = 0; argv[i]; ++i)
       {
-	log_middle(log_info, " '%s'", argv[i]);
+	if (strchr(argv[i], ' '))
+	  log_middle(log_info, " '%s'", argv[i]);
+	else
+	  log_middle(log_info, " %s", argv[i]);
       }
     log_end(log_info);
   }
@@ -106,13 +109,21 @@ forkexeclp (const char *path, const char *arg0, ...)
   i = 1;
 
   log_begin(log_info);
-  log_middle(log_info, "forking: '%s'", argv[0]); /* debug message */
+  if (strchr(argv[0], ' '))
+    log_middle(log_info, "forking: '%s'", argv[0]); /* debug message */
+  else
+    log_middle(log_info, "forking: %s", argv[0]);   /* debug message */
 
   do
     {
       argv[i] = va_arg(args, const char *);
       if (argv[i])
-	log_middle(log_info, " '%s'", argv[i]);    /* debug message */
+	{
+	  if (strchr(argv[i], ' '))
+	    log_middle(log_info, " '%s'", argv[i]);    /* debug message */
+	  else
+	    log_middle(log_info, " %s", argv[i]);      /* debug message */
+	}
 
       if ( i >= 1023 )
 	{
diff --git a/qemubuilder.c b/qemubuilder.c
index e018815..4f94b35 100755
--- a/qemubuilder.c
+++ b/qemubuilder.c
@@ -641,13 +641,13 @@ static int fork_qemu(const char* hda, const char* hdb, const struct pbuilderconf
       assert(argc < MAX_ARGS);
 
       log_begin(log_info);
-      log_middle(log_info, "forking qemu: ");
+      log_middle(log_info, "forking qemu:");
       for (i=0; i<argc; ++i)
 	{
-	  if (i == 0)
-	    log_middle(log_info, "'%s'", argv[i]);
-	  else
+	  if (strchr(argv[i], ' '))
 	    log_middle(log_info, " '%s'", argv[i]);
+	  else
+	    log_middle(log_info, " %s", argv[i]);
 	}
       log_end(log_info);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/cowdancer.git