From 2665cd0cf0d1116fae397d5b598a5ae1bd055afa Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Tue, 15 Mar 2016 15:02:21 -0500 Subject: Add base64.test, and Izabera pointed out that -w0 should disable wrapping. --- toys/other/base64.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'toys/other/base64.c') diff --git a/toys/other/base64.c b/toys/other/base64.c index 234ca1c3..33155bc5 100644 --- a/toys/other/base64.c +++ b/toys/other/base64.c @@ -4,7 +4,7 @@ * * No standard -USE_BASE64(NEWTOY(base64, "diw#<1[!dw]", TOYFLAG_USR|TOYFLAG_BIN)) +USE_BASE64(NEWTOY(base64, "diw#<0=76[!dw]", TOYFLAG_USR|TOYFLAG_BIN)) config BASE64 bool "base64" @@ -16,7 +16,7 @@ config BASE64 -d decode -i ignore non-alphabetic characters - -w wrap output at COLUMNS (default 76) + -w wrap output at COLUMNS (default 76 or 0 for no wrap) */ #define FOR_base64 @@ -32,7 +32,7 @@ static void wraputchar(int c, int *x) { putchar(c); TT.total++; - if (++*x == TT.columns) { + if (TT.columns && ++*x == TT.columns) { *x = 0; xputc('\n'); }; @@ -89,8 +89,6 @@ static void do_base64(int fd, char *name) void base64_main(void) { - if (!TT.columns) TT.columns = 76; - base64_init(toybuf); loopfiles(toys.optargs, do_base64); } -- cgit v1.2.3