X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fquotearg.c;h=339bf34942854b0c59192058f24ec09576087275;hb=4f9d80b9d8004f0fcedf3525e268abaa24b8b4a9;hp=c2de86fcc265dc89f0f1b5440416914c3bacf225;hpb=05230b809c6fec84e0505ef1240f37b9d5b40356;p=gnulib.git

diff --git a/lib/quotearg.c b/lib/quotearg.c
index c2de86fcc..339bf3494 100644
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -37,23 +37,6 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-#if !HAVE_MBRTOWC
-/* Disable multibyte processing entirely.  Since MB_CUR_MAX is 1, the
-   other macros are defined only for documentation and to satisfy C
-   syntax.  */
-# undef MB_CUR_MAX
-# define MB_CUR_MAX 1
-# undef mbstate_t
-# define mbstate_t int
-# define mbrtowc(pwc, s, n, ps) ((*(pwc) = *(s)) != 0)
-# define iswprint(wc) isprint ((unsigned char) (wc))
-# undef HAVE_MBSINIT
-#endif
-
-#if !defined mbsinit && !HAVE_MBSINIT
-# define mbsinit(ps) 1
-#endif
-
 #ifndef SIZE_MAX
 # define SIZE_MAX ((size_t) -1)
 #endif
@@ -202,7 +185,7 @@ static size_t
 quotearg_buffer_restyled (char *buffer, size_t buffersize,
 			  char const *arg, size_t argsize,
 			  enum quoting_style quoting_style, int flags,
-			  unsigned int *quote_these_too)
+			  unsigned int const *quote_these_too)
 {
   size_t i;
   size_t len = 0;
@@ -337,7 +320,8 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize,
 	      break;
 
 	    case c_quoting_style:
-	      if (i + 2 < argsize && arg[i + 1] == '?')
+	      if ((flags & QA_SPLIT_TRIGRAPHS)
+		  && i + 2 < argsize && arg[i + 1] == '?')
 		switch (arg[i + 2])
 		  {
 		  case '!': case '\'':
@@ -372,7 +356,11 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize,
 	case '\r': esc = 'r'; goto c_and_shell_escape;
 	case '\t': esc = 't'; goto c_and_shell_escape;
 	case '\v': esc = 'v'; goto c_escape;
-	case '\\': esc = c; goto c_and_shell_escape;
+	case '\\': esc = c;
+	  /* No need to escape the escape if we are trying to elide
+	     outer quotes and nothing else is problematic.  */
+	  if (backslash_escapes && elide_outer_quotes && quote_string_len)
+	    goto store_c;
 
 	c_and_shell_escape:
 	  if (quoting_style == shell_always_quoting_style