CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-20 18:56:39 +02:00
Code Issues Projects Releases Wiki Activity

maint: refactor ls QUOTING_STYLE env var handling

Browse Source 
* src/ls.c (main): As per the FIXME comment, move the
QUOTING_STYLE handling to a separate function.
This commit is contained in:
Yurij Goncharuk
2014-08-21 23:44:56 +01:00
committed by Pádraig Brady
parent 837bf406df
commit 00d0c41d85
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/ls.c
View File

@@ -284,6 +284,8 @@ static void queue_directory (char const *name, char const *realname,
static void sort_files (void);
static void parse_ls_color (void);
static void getenv_quoting_style (void);
/* Initial size of hash table.
Most hierarchies are likely to be shallower than this. */
#define INITIAL_TABLE_SIZE 30
@@ -1577,20 +1579,7 @@ decode_switches (int argc, char **argv)
hide_patterns = NULL;
print_scontext = false;
/* FIXME: put this in a function. */
{
char const *q_style = getenv ("QUOTING_STYLE");
if (q_style)
{
int i = ARGMATCH (q_style, quoting_style_args, quoting_style_vals);
if (0 <= i)
set_quoting_style (NULL, quoting_style_vals[i]);
else
error (0, 0,
_("ignoring invalid value of environment variable QUOTING_STYLE: %s"),
quotearg (q_style));
}
}
getenv_quoting_style ();
line_length = 80;
{
@@ -2493,6 +2482,25 @@ parse_ls_color (void)
color_symlink_as_referent = true;
}
/* Set the quoting style default if the environment variable
QUOTING_STYLE is set. */
static void
getenv_quoting_style (void)
{
char const *q_style = getenv ("QUOTING_STYLE");
if (q_style)
{
int i = ARGMATCH (q_style, quoting_style_args, quoting_style_vals);
if (0 <= i)
set_quoting_style (NULL, quoting_style_vals[i]);
else
error (0, 0,
_("ignoring invalid value of environment variable QUOTING_STYLE: %s"),
quotearg (q_style));
}
}
/* Set the exit status to report a failure. If SERIOUS, it is a
serious failure; otherwise, it is merely a minor problem. */