Index: libutil/xargs.c
===================================================================
RCS file: /sources/global/global/libutil/xargs.c,v
retrieving revision 1.22
diff -c -r1.22 xargs.c
*** libutil/xargs.c	22 Jun 2015 06:43:01 -0000	1.22
--- libutil/xargs.c	23 Feb 2016 06:12:42 -0000
***************
*** 27,32 ****
--- 27,33 ----
  #include <limits.h>
  #endif
  
+ #include "char.h"
  #include "checkalloc.h"
  #include "die.h"
  #include "env.h"
***************
*** 142,152 ****
  /**
   * Common processing for each XARGS_XXXX type.
   */
- #ifdef _WIN32
- #define QUOTE	'"'
- #else
- #define QUOTE	'\''
- #endif
  #define APPEND_ARGUMENT(p) {\
  	char *path = (p);\
  	length = strlen(path);\
--- 143,148 ----
***************
*** 167,175 ****
  		if (xp->verbose)\
  			xp->verbose(path + 2, xp->seqno, 0);\
  		strbuf_putc(comline, ' ');\
! 		strbuf_putc(comline, QUOTE);\
! 		strbuf_puts(comline, path);\
! 		strbuf_putc(comline, QUOTE);\
  		count++;\
  	}\
  }
--- 163,169 ----
  		if (xp->verbose)\
  			xp->verbose(path + 2, xp->seqno, 0);\
  		strbuf_putc(comline, ' ');\
! 		strbuf_puts(comline, quote_shell(path));\
  		count++;\
  	}\
  }