ls,ptx: restrict quotearg use to file name output

* src/ls.c (getenv_quoting_style, decode_switches, parse_ls_color):
Use quote() rather than quotearg(), as the latter defaults to
outputting the input unquoted.
* src/ptx.c (main): Likewise.

diff --git a/src/ls.c b/src/ls.c
index 72e4af6c794513567b7bba408172516cb3a540e1..7c22b66fd62f5d7e7b5bde7dbdbb413f513c01a9 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -1619,7 +1619,7 @@ decode_switches (int argc, char **argv)
     if (p && *p && ! set_line_length (p))
       error (0, 0,
              _("ignoring invalid width in environment variable COLUMNS: %s"),
-             quotearg (p));
+             quote (p));
   }
 
 #ifdef TIOCGWINSZ
@@ -1647,7 +1647,7 @@ decode_switches (int argc, char **argv)
           {
             error (0, 0,
              _("ignoring invalid tab size in environment variable TABSIZE: %s"),
-                   quotearg (p));
+                   quote (p));
           }
       }
   }
@@ -2446,7 +2446,7 @@ parse_ls_color (void)
                     }
                 }
               if (state == PS_FAIL)
-                error (0, 0, _("unrecognized prefix: %s"), quotearg (label));
+                error (0, 0, _("unrecognized prefix: %s"), quote (label));
             }
           break;
 
@@ -2507,7 +2507,7 @@ getenv_quoting_style (void)
       else
         error (0, 0,
        _("ignoring invalid value of environment variable QUOTING_STYLE: %s"),
-               quotearg (q_style));
+               quote (q_style));
     }
 }
 

diff --git a/src/ptx.c b/src/ptx.c
index 3aea4cdf2672c74c9e9d75310771144d9c6e525c..2ccabb73432bebf353dc2ffc89ccd5319b575bab 100644 (file)
--- a/src/ptx.c
+++ b/src/ptx.c
@@ -28,7 +28,6 @@
 #include "error.h"
 #include "fadvise.h"
 #include "quote.h"
-#include "quotearg.h"
 #include "read-file.h"
 #include "stdio--.h"
 #include "xstrtol.h"
@@ -1949,7 +1948,7 @@ main (int argc, char **argv)
             if (xstrtoul (optarg, NULL, 0, &tmp_ulong, NULL) != LONGINT_OK
                 || ! (0 < tmp_ulong && tmp_ulong <= INT_MAX))
               error (EXIT_FAILURE, 0, _("invalid gap width: %s"),
-                     quotearg (optarg));
+                     quote (optarg));
             gap_size = tmp_ulong;
             break;
           }
@@ -1976,7 +1975,7 @@ main (int argc, char **argv)
             if (xstrtoul (optarg, NULL, 0, &tmp_ulong, NULL) != LONGINT_OK
                 || ! (0 < tmp_ulong && tmp_ulong <= INT_MAX))
               error (EXIT_FAILURE, 0, _("invalid line width: %s"),
-                     quotearg (optarg));
+                     quote (optarg));
             line_width = tmp_ulong;
             break;
           }