← Commit list

75e90b154

Denys Vlasenko

2017-07-14

SUCCESS Duration: 141s

Subject

cat: fix "cat -An" ignoring -n; make numbering go througn all files

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

coreutils/cat.c +29 -15 coreutils/nl.c +0 -20 libbb/print_numbered_lines.c +1 -0

coreutils/cat.c+29 -15

@@ -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;

coreutils/nl.c+0 -20

@@ -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)
	{

libbb/print_numbered_lines.c+1 -0

@@ -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);
	}