4 files changed, 12 insertions, 10 deletions
diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog
index 72070a25acd..3092a4de721 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog
+++ b/Build/source/texk/dvipdfmx/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* dpxfile.c (exec_spawn): Do not quote execvp() arguments.
+
 2011-06-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* dpxfile.c (exec_spawn): Exit if execvp() fails, some clean up.
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxfile.c b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxfile.c
index dbbf077989c..a13058708a6 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxfile.c
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxfile.c
@@ -210,15 +210,12 @@ static int exec_spawn (char *cmd)
       }
     }
     *pp = '\0';
-    if (strchr (buf, ' ') || strchr (buf, '\t')) {
 #ifdef WIN32
+    if (strchr (buf, ' ') || strchr (buf, '\t'))
       *qv = concat3 ("\"", buf, "\"");
-#else
-      *qv = concat3 ("'", buf, "'");
+    else
 #endif
-    } else {
       *qv = xstrdup (buf);
-    }
 /*
     fprintf(stderr,"\n%s", *qv);
 */
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL
index 322a45c1318..b2d09ee0301 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL
@@ -1,6 +1,10 @@
 ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx
 =================================================
 
+2011-06-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* dpxfile.c (exec_spawn): Do not quote execvp() arguments.
+
 2011-06-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* dpxfile.c (exec_spawn): Exit if execvp() fails, some clean up.
diff --git a/Build/source/texk/xdvipdfmx/src/dpxfile.c b/Build/source/texk/xdvipdfmx/src/dpxfile.c
index 3f718ba1d31..a171483e8b1 100644
--- a/Build/source/texk/xdvipdfmx/src/dpxfile.c
+++ b/Build/source/texk/xdvipdfmx/src/dpxfile.c
@@ -212,15 +212,12 @@ static int exec_spawn (char *cmd)
       }
     }
     *pp = '\0';
-    if (strchr (buf, ' ') || strchr (buf, '\t')) {
 #ifdef WIN32
+    if (strchr (buf, ' ') || strchr (buf, '\t'))
       *qv = concat3 ("\"", buf, "\"");
-#else
-      *qv = concat3 ("'", buf, "'");
+    else
 #endif
-    } else {
       *qv = xstrdup (buf);
-    }
 /*
     fprintf(stderr,"\n%s", *qv);
 */