summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2017-07-14 10:47:18 +0200
committerDenys Vlasenko2017-07-14 10:47:18 +0200
commit75e90b15482184db83f03c67b53d4220888c6c9d (patch)
tree8307ba71f584715fcad8beb4373f9318e1f9ec13
parentcc86b2ad965bff071185edbb77b5a6ea45023e43 (diff)
downloadbusybox-75e90b15482184db83f03c67b53d4220888c6c9d.zip
busybox-75e90b15482184db83f03c67b53d4220888c6c9d.tar.gz
cat: fix "cat -An" ignoring -n; make numbering go througn all files
function old new delta cat_main 418 428 +10 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/cat.c44
-rw-r--r--coreutils/nl.c20
-rw-r--r--libbb/print_numbered_lines.c1
3 files changed, 30 insertions, 35 deletions
diff --git a/coreutils/cat.c b/coreutils/cat.c
index 178f96b..a9ba68d 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -101,27 +101,32 @@
* to achieve "cat -v" effect. The actual effect would be "users pissed off
* by gratuitous incompatibility".
*/
-#define CATV_OPT_e (1<<0)
-#define CATV_OPT_t (1<<1)
-#define CATV_OPT_v (1<<2)
+#define CAT_OPT_e (1<<0)
+#define CAT_OPT_t (1<<1)
+#define CAT_OPT_v (1<<2)
+/* -A occupies bit (1<<3) */
+#define CAT_OPT_n ((1<<4) * ENABLE_FEATURE_CATN)
+#define CAT_OPT_b ((1<<5) * ENABLE_FEATURE_CATN)
static int catv(unsigned opts, char **argv)
{
int retval = EXIT_SUCCESS;
int fd;
+#if ENABLE_FEATURE_CATN
+ unsigned lineno = 0;
+ unsigned eol_char = (opts & (CAT_OPT_n|CAT_OPT_b)) ? '\n' : 0x100;
+ unsigned skip_num_on = (opts & CAT_OPT_b) ? '\n' : 0x100;
+ bool eol_seen = 1;
+#endif
- BUILD_BUG_ON(CATV_OPT_e != VISIBLE_ENDLINE);
- BUILD_BUG_ON(CATV_OPT_t != VISIBLE_SHOW_TABS);
+ BUILD_BUG_ON(CAT_OPT_e != VISIBLE_ENDLINE);
+ BUILD_BUG_ON(CAT_OPT_t != VISIBLE_SHOW_TABS);
#if 0 /* These consts match, we can just pass "opts" to visible() */
- if (opts & CATV_OPT_e)
+ if (opts & CAT_OPT_e)
flags |= VISIBLE_ENDLINE;
- if (opts & CATV_OPT_t)
+ if (opts & CAT_OPT_t)
flags |= VISIBLE_SHOW_TABS;
#endif
- /* Read from stdin if there's nothing else to do. */
- if (!argv[0])
- *--argv = (char*)"-";
-
#define read_buf bb_common_bufsiz1
setup_common_bufsiz();
do {
@@ -141,6 +146,11 @@ static int catv(unsigned opts, char **argv)
for (i = 0; i < res; i++) {
unsigned char c = read_buf[i];
char buf[sizeof("M-^c")];
+#if ENABLE_FEATURE_CATN
+ if (eol_seen && c != skip_num_on)
+ printf("%6u ", ++lineno);
+ eol_seen = (c == eol_char);
+#endif
visible(c, buf, opts);
fputs(buf, stdout);
}
@@ -151,12 +161,13 @@ static int catv(unsigned opts, char **argv)
fflush_stdout_and_exit(retval);
}
+#undef CAT_OPT_n
+#undef CAT_OPT_b
#endif
int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int cat_main(int argc UNUSED_PARAM, char **argv)
{
- struct number_state ns;
unsigned opts;
IF_FEATURE_CATV(opt_complementary = "Aetv"; /* -A == -vet */)
@@ -164,10 +175,13 @@ int cat_main(int argc UNUSED_PARAM, char **argv)
opts = getopt32(argv, IF_FEATURE_CATV("etvA") IF_FEATURE_CATN("nb") "u");
argv += optind;
+ /* Read from stdin if there's nothing else to do. */
+ if (!argv[0])
+ *--argv = (char*)"-";
+
#if ENABLE_FEATURE_CATV
if (opts & 7)
return catv(opts, argv);
-//BUG: -v,-e,-t,-A ignore -nb
opts >>= 4;
#endif
@@ -175,8 +189,8 @@ int cat_main(int argc UNUSED_PARAM, char **argv)
# define CAT_OPT_n (1<<0)
# define CAT_OPT_b (1<<1)
if (opts & (CAT_OPT_n|CAT_OPT_b)) { /* -n or -b */
- if (!*argv)
- *--argv = (char*)"-";
+ struct number_state ns;
+
ns.width = 6;
ns.start = 1;
ns.inc = 1;
diff --git a/coreutils/nl.c b/coreutils/nl.c
index 5c64923..dc468a9 100644
--- a/coreutils/nl.c
+++ b/coreutils/nl.c
@@ -35,26 +35,6 @@
#include "libbb.h"
-void FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filename)
-{
- FILE *fp = fopen_or_warn_stdin(filename);
- unsigned N = ns->start;
- char *line;
-
- while ((line = xmalloc_fgetline(fp)) != NULL) {
- if (ns->all
- || (ns->nonempty && line[0])
- ) {
- printf("%*u%s%s\n", ns->width, N, ns->sep, line);
- N += ns->inc;
- } else if (ns->empty_str)
- fputs(ns->empty_str, stdout);
- free(line);
- }
-
- fclose(fp);
-}
-
int nl_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int nl_main(int argc UNUSED_PARAM, char **argv)
{
diff --git a/libbb/print_numbered_lines.c b/libbb/print_numbered_lines.c
index 702aed1..9a8a514 100644
--- a/libbb/print_numbered_lines.c
+++ b/libbb/print_numbered_lines.c
@@ -24,6 +24,7 @@ void FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filenam
fputs(ns->empty_str, stdout);
free(line);
}
+ ns->start = N;
fclose(fp);
}