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

base32/64: implement -w COL

Browse Source 
function                                             old     new   delta
baseNUM_main                                         568     655     +87
packed_usage                                       33478   33533     +55
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 142/0)             Total: 142 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-11-27 15:25:31 +01:00
parent fc63549352
commit c8b3d9a145
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
coreutils/uudecode.c
View File

@ -181,19 +181,19 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
//config: Base64 encode and decode //config: Base64 encode and decode
//usage:#define base32_trivial_usage //usage:#define base32_trivial_usage
//usage: "[-d] [FILE]" //usage: "[-d] [-w COL] [FILE]"
//usage:#define base32_full_usage "\n\n" //usage:#define base32_full_usage "\n\n"
//usage: "Base32 encode or decode FILE to standard output" //usage: "Base32 encode or decode FILE to standard output"
//usage: "\n -d Decode data" //usage: "\n -d Decode data"
////usage: "\n -w COL Wrap lines at COL (default 76, 0 disables)" //usage: "\n -w COL Wrap lines at COL (default 76, 0 disables)"
////usage: "\n -i When decoding, ignore non-alphabet characters" ////usage: "\n -i When decoding, ignore non-alphabet characters"
//usage:#define base64_trivial_usage //usage:#define base64_trivial_usage
//usage: "[-d] [FILE]" //usage: "[-d] [-w COL] [FILE]"
//usage:#define base64_full_usage "\n\n" //usage:#define base64_full_usage "\n\n"
//usage: "Base64 encode or decode FILE to standard output" //usage: "Base64 encode or decode FILE to standard output"
//usage: "\n -d Decode data" //usage: "\n -d Decode data"
////usage: "\n -w COL Wrap lines at COL (default 76, 0 disables)" //usage: "\n -w COL Wrap lines at COL (default 76, 0 disables)"
////usage: "\n -i When decoding, ignore non-alphabet characters" ////usage: "\n -i When decoding, ignore non-alphabet characters"
// APPLET_ODDNAME:name main location suid_type help // APPLET_ODDNAME:name main location suid_type help
@ -270,41 +270,37 @@ int baseNUM_main(int argc UNUSED_PARAM, char **argv)
{ {
FILE *src_stream; FILE *src_stream;
unsigned opts; unsigned opts;
unsigned col = 76;
opts = getopt32(argv, "^" "d" "\0" "?1"/* 1 arg max*/); opts = getopt32(argv, "^" "dw:+" "\0" "?1"/* 1 arg max*/, &col);
argv += optind; argv += optind;
if (!argv[0]) if (!argv[0])
*--argv = (char*)"-"; *--argv = (char*)"-";
src_stream = xfopen_stdin(argv[0]); src_stream = xfopen_stdin(argv[0]);
if (opts) { if (opts & 1) {
int flags = (unsigned char)EOF; int flags = (unsigned char)EOF;
if (ENABLE_BASE32 && (!ENABLE_BASE64 || applet_name[4] == '3')) if (ENABLE_BASE32 && (!ENABLE_BASE64 || applet_name[4] == '3'))
flags = ((unsigned char)EOF) | BASE64_32; flags = ((unsigned char)EOF) | BASE64_32;
read_base64(src_stream, stdout, flags); read_base64(src_stream, stdout, flags);
} else { } else {
enum { enum {
SRC_BUF_SIZE = 76 / 4 * 3, /* this *MUST* be a multiple of 3 */ SRC_BUF_SIZE = 3 * 5 * 32, /* this *MUST* be a multiple of 3 and 5 */
DST_BUF_SIZE = 4 * ((SRC_BUF_SIZE + 2) / 3), DST_BUF_SIZE = 4 * ((SRC_BUF_SIZE + 2) / 3),
}; };
char src_buf[SRC_BUF_SIZE]; char src_buf[SRC_BUF_SIZE];
char dst_buf[DST_BUF_SIZE + 1]; char dst_buf[DST_BUF_SIZE + 1];
int src_fd = fileno(src_stream); int src_fd = fileno(src_stream);
while (1) { int rem = 0;
size_t size;
if (ENABLE_BASE32 && (!ENABLE_BASE64 || applet_name[4] == '3'))
size = 72 / 8 * 5;
//FIXME: wrong, default width of base32 is not 72, but 76 chars
//(not a multiple of 8 - requires adding wrapping logic)
//when this is fixed, can implement -w COL too
else
size = SRC_BUF_SIZE;
size = full_read(src_fd, src_buf, size); while (1) {
if (!size) size_t size = full_read(src_fd, src_buf, SRC_BUF_SIZE);
break;
if ((ssize_t)size < 0) if ((ssize_t)size < 0)
bb_simple_perror_msg_and_die(bb_msg_read_error); bb_simple_perror_msg_and_die(bb_msg_read_error);
if (size == 0) {
if (rem != 0) bb_putchar('\n');
break;
}
/* Encode the buffer we just read in */ /* Encode the buffer we just read in */
if (ENABLE_BASE32 && (!ENABLE_BASE64 || applet_name[4] == '3')) { if (ENABLE_BASE32 && (!ENABLE_BASE64 || applet_name[4] == '3')) {
@ -315,9 +311,25 @@ int baseNUM_main(int argc UNUSED_PARAM, char **argv)
size = 4 * ((size + 2) / 3); size = 4 * ((size + 2) / 3);
} }
xwrite(STDOUT_FILENO, dst_buf, size); if (col == 0) {
bb_putchar('\n'); fputs(dst_buf, stdout);
fflush(stdout); } else {
char *result = dst_buf;
if (rem == 0)
rem = col;
while (1) {
int out = size < rem ? size : rem;
rem -= out;
printf(rem != 0 ? "%.*s" : "%.*s\n", out, result);
if (rem != 0)
break;
size -= out;
if (size == 0)
break;
result += out;
rem = col;
}
}
} }
} }