emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
function                                             old     new   delta
cat_main                                             418     428     +10

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-14 10:47:18 +02:00
parent cc86b2ad96
commit 75e90b1548
3 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
coreutils/cat.c
View File

@ -101,26 +101,31 @@
* to achieve "cat -v" effect. The actual effect would be "users pissed off * to achieve "cat -v" effect. The actual effect would be "users pissed off
* by gratuitous incompatibility". * by gratuitous incompatibility".
*/ */
#define CATV_OPT_e (1<<0) #define CAT_OPT_e (1<<0)
#define CATV_OPT_t (1<<1) #define CAT_OPT_t (1<<1)
#define CATV_OPT_v (1<<2) #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) static int catv(unsigned opts, char **argv)
{ {
int retval = EXIT_SUCCESS; int retval = EXIT_SUCCESS;
int fd; int fd;
#if ENABLE_FEATURE_CATN
BUILD_BUG_ON(CATV_OPT_e != VISIBLE_ENDLINE); unsigned lineno = 0;
BUILD_BUG_ON(CATV_OPT_t != VISIBLE_SHOW_TABS); unsigned eol_char = (opts & (CAT_OPT_n|CAT_OPT_b)) ? '\n' : 0x100;
#if 0 /* These consts match, we can just pass "opts" to visible() */ unsigned skip_num_on = (opts & CAT_OPT_b) ? '\n' : 0x100;
if (opts & CATV_OPT_e) bool eol_seen = 1;
flags |= VISIBLE_ENDLINE;
if (opts & CATV_OPT_t)
flags |= VISIBLE_SHOW_TABS;
#endif #endif
/* Read from stdin if there's nothing else to do. */ BUILD_BUG_ON(CAT_OPT_e != VISIBLE_ENDLINE);
if (!argv[0]) BUILD_BUG_ON(CAT_OPT_t != VISIBLE_SHOW_TABS);
*--argv = (char*)"-"; #if 0 /* These consts match, we can just pass "opts" to visible() */
if (opts & CAT_OPT_e)
flags |= VISIBLE_ENDLINE;
if (opts & CAT_OPT_t)
flags |= VISIBLE_SHOW_TABS;
#endif
#define read_buf bb_common_bufsiz1 #define read_buf bb_common_bufsiz1
setup_common_bufsiz(); setup_common_bufsiz();
@ -141,6 +146,11 @@ static int catv(unsigned opts, char **argv)
for (i = 0; i < res; i++) { for (i = 0; i < res; i++) {
unsigned char c = read_buf[i]; unsigned char c = read_buf[i];
char buf[sizeof("M-^c")]; 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); visible(c, buf, opts);
fputs(buf, stdout); fputs(buf, stdout);
} }
@ -151,12 +161,13 @@ static int catv(unsigned opts, char **argv)
fflush_stdout_and_exit(retval); fflush_stdout_and_exit(retval);
} }
#undef CAT_OPT_n
#undef CAT_OPT_b
#endif #endif
int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int cat_main(int argc UNUSED_PARAM, char **argv) int cat_main(int argc UNUSED_PARAM, char **argv)
{ {
struct number_state ns;
unsigned opts; unsigned opts;
IF_FEATURE_CATV(opt_complementary = "Aetv"; /* -A == -vet */) 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"); opts = getopt32(argv, IF_FEATURE_CATV("etvA") IF_FEATURE_CATN("nb") "u");
argv += optind; argv += optind;
/* Read from stdin if there's nothing else to do. */
if (!argv[0])
*--argv = (char*)"-";
#if ENABLE_FEATURE_CATV #if ENABLE_FEATURE_CATV
if (opts & 7) if (opts & 7)
return catv(opts, argv); return catv(opts, argv);
//BUG: -v,-e,-t,-A ignore -nb
opts >>= 4; opts >>= 4;
#endif #endif
@ -175,8 +189,8 @@ int cat_main(int argc UNUSED_PARAM, char **argv)
# define CAT_OPT_n (1<<0) # define CAT_OPT_n (1<<0)
# define CAT_OPT_b (1<<1) # define CAT_OPT_b (1<<1)
if (opts & (CAT_OPT_n|CAT_OPT_b)) { /* -n or -b */ if (opts & (CAT_OPT_n|CAT_OPT_b)) { /* -n or -b */
if (!*argv) struct number_state ns;
*--argv = (char*)"-";
ns.width = 6; ns.width = 6;
ns.start = 1; ns.start = 1;
ns.inc = 1; ns.inc = 1;

20
coreutils/nl.c
View File

@ -35,26 +35,6 @@
#include "libbb.h" #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, char **argv) MAIN_EXTERNALLY_VISIBLE;
int nl_main(int argc UNUSED_PARAM, char **argv) int nl_main(int argc UNUSED_PARAM, char **argv)
{ {

1
libbb/print_numbered_lines.c
View File

@ -24,6 +24,7 @@ void FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filenam
fputs(ns->empty_str, stdout); fputs(ns->empty_str, stdout);
free(line); free(line);
} }
ns->start = N;
fclose(fp); fclose(fp);
} }