mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-17 18:02:09 +03:00
ls: rename --null to --zero (Bug#49716)
* NEWS, doc/coreutils.texi (General output formatting): * src/ls.c (usage): Document this. * src/ls.c (ZERO_OPTION): Rename from NULL_OPTION. All uses changed. (long_options): Rename --null to --zero. (dired_dump_obstack, main, print_dir): Use '\n' instead of eolbyte where eolbyte must equal '\n'. (decode_switches): Decode --zero instead of --null. --zero also implies -1, -N, --color=none, --show-control-chars. Use easier-to-decipher code to set ‘format’ and ‘dired’. Reject attempts to combine --dired and --zero. * tests/local.mk: Adjust to test script renaming. * tests/ls/zero-option.sh: Rename from tests/ls/null-option.sh, and test --zero instead of --null.
This commit is contained in:
1 parent
9e4a6101f2
commit
c75779cac3
5 files changed
+42
-35
No files matched your search
@@ -83,7 +83,7 @@ GNU coreutils NEWS -*- outline -*-
|
||||
ls now accepts the --sort=width option, to sort by file name width.
|
||||
This is useful to more compactly organize the default vertical column output.
|
||||
|
||||
ls now accepts the --null option, to terminate each output line with
|
||||
ls now accepts the --zero option, to terminate each output line with
|
||||
NUL instead of newline.
|
||||
|
||||
nl --line-increment can now take a negative number to decrement the count.
|
||||
|
||||
+8
-2
@@ -8137,8 +8137,14 @@ option. It does not affect the file size written by @option{-l}.
|
||||
List files horizontally, with as many as will fit on each line,
|
||||
separated by @samp{, } (a comma and a space).
|
||||
|
||||
@item --null
|
||||
@opindex --null
|
||||
@item --zero
|
||||
@opindex --zero
|
||||
This option is incompatible with the @option{-D} or @option{--dired} option.
|
||||
This option also implies the options
|
||||
@option{--show-control-chars},
|
||||
@option{-1} or @option{--format=single-column},
|
||||
@option{--color=none}, and
|
||||
@option{-N} or @option{--quoting-style=literal}.
|
||||
@outputNUL
|
||||
|
||||
@item -p
|
||||
|
||||
@@ -838,13 +838,13 @@ enum
|
||||
HIDE_OPTION,
|
||||
HYPERLINK_OPTION,
|
||||
INDICATOR_STYLE_OPTION,
|
||||
NULL_OPTION,
|
||||
QUOTING_STYLE_OPTION,
|
||||
SHOW_CONTROL_CHARS_OPTION,
|
||||
SI_OPTION,
|
||||
SORT_OPTION,
|
||||
TIME_OPTION,
|
||||
TIME_STYLE_OPTION
|
||||
TIME_STYLE_OPTION,
|
||||
ZERO_OPTION,
|
||||
};
|
||||
|
||||
static struct option const long_options[] =
|
||||
@@ -859,7 +859,6 @@ static struct option const long_options[] =
|
||||
{"human-readable", no_argument, NULL, 'h'},
|
||||
{"inode", no_argument, NULL, 'i'},
|
||||
{"kibibytes", no_argument, NULL, 'k'},
|
||||
{"null", no_argument, NULL, NULL_OPTION},
|
||||
{"numeric-uid-gid", no_argument, NULL, 'n'},
|
||||
{"no-group", no_argument, NULL, 'G'},
|
||||
{"hide-control-chars", no_argument, NULL, 'q'},
|
||||
@@ -888,6 +887,7 @@ static struct option const long_options[] =
|
||||
{"tabsize", required_argument, NULL, 'T'},
|
||||
{"time", required_argument, NULL, TIME_OPTION},
|
||||
{"time-style", required_argument, NULL, TIME_STYLE_OPTION},
|
||||
{"zero", no_argument, NULL, ZERO_OPTION},
|
||||
{"color", optional_argument, NULL, COLOR_OPTION},
|
||||
{"hyperlink", optional_argument, NULL, HYPERLINK_OPTION},
|
||||
{"block-size", required_argument, NULL, BLOCK_SIZE_OPTION},
|
||||
@@ -1087,7 +1087,7 @@ dired_dump_obstack (char const *prefix, struct obstack *os)
|
||||
intmax_t p = pos[i];
|
||||
printf (" %"PRIdMAX, p);
|
||||
}
|
||||
putchar (eolbyte);
|
||||
putchar ('\n');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1777,7 +1777,7 @@ main (int argc, char **argv)
|
||||
{
|
||||
print_current_files ();
|
||||
if (pending_dirs)
|
||||
dired_outbyte (eolbyte);
|
||||
dired_outbyte ('\n');
|
||||
}
|
||||
else if (n_files <= 1 && pending_dirs && pending_dirs->next == 0)
|
||||
print_dir_name = false;
|
||||
@@ -1845,9 +1845,8 @@ main (int argc, char **argv)
|
||||
/* No need to free these since we're about to exit. */
|
||||
dired_dump_obstack ("//DIRED//", &dired_obstack);
|
||||
dired_dump_obstack ("//SUBDIRED//", &subdired_obstack);
|
||||
printf ("//DIRED-OPTIONS// --quoting-style=%s%c",
|
||||
quoting_style_args[get_quoting_style (filename_quoting_options)],
|
||||
eolbyte);
|
||||
printf ("//DIRED-OPTIONS// --quoting-style=%s\n",
|
||||
quoting_style_args[get_quoting_style (filename_quoting_options)]);
|
||||
}
|
||||
|
||||
if (LOOP_DETECT)
|
||||
@@ -2188,10 +2187,6 @@ decode_switches (int argc, char **argv)
|
||||
indicator_style_types);
|
||||
break;
|
||||
|
||||
case NULL_OPTION:
|
||||
eolbyte = 0;
|
||||
break;
|
||||
|
||||
case QUOTING_STYLE_OPTION:
|
||||
quoting_style_opt = XARGMATCH ("--quoting-style", optarg,
|
||||
quoting_style_args,
|
||||
@@ -2227,6 +2222,15 @@ decode_switches (int argc, char **argv)
|
||||
print_scontext = true;
|
||||
break;
|
||||
|
||||
case ZERO_OPTION:
|
||||
eolbyte = 0;
|
||||
hide_control_chars_opt = false;
|
||||
if (format_opt != long_format)
|
||||
format_opt = one_per_line;
|
||||
print_with_color = false;
|
||||
quoting_style_opt = literal_quoting_style;
|
||||
break;
|
||||
|
||||
case_GETOPT_HELP_CHAR;
|
||||
|
||||
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
|
||||
@@ -2253,15 +2257,11 @@ decode_switches (int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static signed char const default_format[] =
|
||||
{
|
||||
[LS_LS] = -1,
|
||||
[LS_MULTI_COL] = many_per_line,
|
||||
[LS_LONG_FORMAT] = long_format,
|
||||
};
|
||||
int form = format_opt < 0 ? default_format[ls_mode] : format_opt;
|
||||
format = form < 0 ? (stdout_isatty () ? many_per_line : one_per_line) : form;
|
||||
format = (0 <= format_opt ? format_opt
|
||||
: ls_mode == LS_LS ? (stdout_isatty ()
|
||||
? many_per_line : one_per_line)
|
||||
: ls_mode == LS_MULTI_COL ? many_per_line
|
||||
: /* ls_mode == LS_LONG_FORMAT */ long_format);
|
||||
|
||||
/* If the line length was not set by a switch but is needed to determine
|
||||
output, go to the work of obtaining it from the environment. */
|
||||
@@ -2366,11 +2366,13 @@ decode_switches (int argc, char **argv)
|
||||
dirname_quoting_options = clone_quoting_options (NULL);
|
||||
set_char_quoting (dirname_quoting_options, ':', 1);
|
||||
|
||||
/* --dired is meaningful only with --format=long (-l).
|
||||
/* --dired is meaningful only with --format=long (-l) and sans --hyperlink.
|
||||
Otherwise, ignore it. FIXME: warn about this?
|
||||
Alternatively, make --dired imply --format=long? */
|
||||
if (dired && (format != long_format || print_hyperlink))
|
||||
dired = false;
|
||||
dired &= (format == long_format) & !print_hyperlink;
|
||||
|
||||
if (eolbyte < dired)
|
||||
die (LS_FAILURE, 0, _("--dired and --zero are incompatible"));
|
||||
|
||||
/* If -c or -u is specified and not -l (or any other option that implies -l),
|
||||
and no sort-type was specified, then sort by the ctime (-c) or atime (-u).
|
||||
@@ -2980,7 +2982,7 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
|
||||
if (recursive || print_dir_name)
|
||||
{
|
||||
if (!first)
|
||||
dired_outbyte (eolbyte);
|
||||
dired_outbyte ('\n');
|
||||
first = false;
|
||||
dired_indent ();
|
||||
|
||||
@@ -2997,8 +2999,7 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
|
||||
|
||||
free (absolute_name);
|
||||
|
||||
dired_outbyte (':');
|
||||
dired_outbyte (eolbyte);
|
||||
dired_outstring (":\n");
|
||||
}
|
||||
|
||||
/* Read the directory entries, and insert the subfiles into the 'cwd_file'
|
||||
@@ -5488,7 +5489,6 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\
|
||||
\n\
|
||||
"), stdout);
|
||||
fputs (_("\
|
||||
--null end each output line with NUL, not newline\n\
|
||||
-n, --numeric-uid-gid like -l, but list numeric user and group IDs\n\
|
||||
-N, --literal print entry names without quoting\n\
|
||||
-o like -l, but do not list group information\n\
|
||||
@@ -5542,6 +5542,7 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\
|
||||
-x list entries by lines instead of by columns\n\
|
||||
-X sort alphabetically by entry extension\n\
|
||||
-Z, --context print any security context of each file\n\
|
||||
--zero end each output line with NUL, not newline\n\
|
||||
-1 list one file per line. Avoid '\\n' with -q or -b\
|
||||
\n\
|
||||
"), stdout);
|
||||
|
||||
+2
-2
@@ -609,10 +609,10 @@ all_tests = \
|
||||
tests/ls/getxattr-speedup.sh \
|
||||
tests/ls/group-dirs.sh \
|
||||
tests/ls/hex-option.sh \
|
||||
tests/ls/hyperlink.sh \
|
||||
tests/ls/infloop.sh \
|
||||
tests/ls/inode.sh \
|
||||
tests/ls/m-option.sh \
|
||||
tests/ls/null-option.sh \
|
||||
tests/ls/w-option.sh \
|
||||
tests/ls/multihardlink.sh \
|
||||
tests/ls/no-arg.sh \
|
||||
@@ -635,7 +635,7 @@ all_tests = \
|
||||
tests/ls/time-style-diag.sh \
|
||||
tests/ls/sort-width-option.sh \
|
||||
tests/ls/x-option.sh \
|
||||
tests/ls/hyperlink.sh \
|
||||
tests/ls/zero-option.sh \
|
||||
tests/mkdir/p-1.sh \
|
||||
tests/mkdir/p-2.sh \
|
||||
tests/mkdir/p-3.sh \
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Verify behavior of ls --null.
|
||||
# Verify behavior of ls --zero.
|
||||
|
||||
# Copyright 2021 Free Software Foundation, Inc.
|
||||
|
||||
@@ -21,7 +21,7 @@ print_ver_ ls
|
||||
|
||||
mkdir dir && touch dir/a dir/b dir/cc || framework_failure_
|
||||
|
||||
LC_ALL=C ls --null dir >out || fail=1
|
||||
LC_ALL=C ls --zero dir >out || fail=1
|
||||
tr '\n' '\0' <<EOF >exp
|
||||
a
|
||||
b
|
||||
Reference in new issue
Block a user