mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
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.
This commit is contained in:
1 parent
df3b9120b4
commit
895a56c531
2 files changed
+6
-7
No files matched your search
@@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user