Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-04 22:34:37 +00:00
Code Issues Projects Releases Wiki Activity

- move additional fancy options not mandated by SUSv3 into a FANCY option

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer 2007-03-28 16:48:40 +00:00
parent 0864f4d14f
commit 0a537a0c57
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
coreutils/Config.in
View File

@ -542,7 +542,14 @@ config SPLIT
help help
split a file into pieces. split a file into pieces.
http://www.opengroup.org/onlinepubs/007904975/utilities/split.html config FEATURE_SPLIT_FANCY
bool "fancy extensions"
default n
depends on SPLIT
help
Add support for features not required by SUSv3.
Supports additional suffixes 'b' for 512 bytes,
'g' for 1GiB for the -b option.
config STAT config STAT
bool "stat" bool "stat"

15
coreutils/split.c
View File

@ -12,10 +12,14 @@
#include "busybox.h" #include "busybox.h"
static const struct suffix_mult split_suffices[] = { static const struct suffix_mult split_suffices[] = {
#if ENABLE_FEATURE_SPLIT_FANCY
{ "b", 512 }, { "b", 512 },
#endif
{ "k", 1024 }, { "k", 1024 },
{ "m", 1024*1024 }, { "m", 1024*1024 },
#if ENABLE_FEATURE_SPLIT_FANCY
{ "g", 1024*1024*1024 }, { "g", 1024*1024*1024 },
#endif
{ NULL, 0 } { NULL, 0 }
}; };
@ -58,10 +62,10 @@ int split_main(int argc, char **argv)
char *pfx; char *pfx;
char *count_p; char *count_p;
const char *sfx; const char *sfx;
unsigned long cnt = 1000; off_t cnt = 1000;
unsigned long remaining = 0; off_t remaining = 0;
unsigned opt; unsigned opt;
int bytes_read, to_write; ssize_t bytes_read, to_write;
char *src; char *src;
opt_complementary = "?2"; opt_complementary = "?2";
@ -73,8 +77,9 @@ int split_main(int argc, char **argv)
cnt = xatoul_sfx(count_p, split_suffices); cnt = xatoul_sfx(count_p, split_suffices);
if (opt & SPLIT_OPT_a) if (opt & SPLIT_OPT_a)
suffix_len = xatou(sfx); suffix_len = xatou(sfx);
argv += optind;
sfx = "x"; sfx = "x";
argv += optind;
if (argv[0]) { if (argv[0]) {
if (argv[1]) if (argv[1])
sfx = argv[1]; sfx = argv[1];
@ -104,7 +109,7 @@ int split_main(int argc, char **argv)
do { do {
if (!remaining) { if (!remaining) {
if (!pfx) if (!pfx)
bb_error_msg_and_die("suffices exhausted"); bb_error_msg_and_die("suffixes exhausted");
xmove_fd(xopen(pfx, O_WRONLY | O_CREAT | O_TRUNC), 1); xmove_fd(xopen(pfx, O_WRONLY | O_CREAT | O_TRUNC), 1);
pfx = next_file(pfx, suffix_len); pfx = next_file(pfx, suffix_len);
remaining = cnt; remaining = cnt;

2
scripts/defconfig
View File

@ -194,6 +194,7 @@ CONFIG_SHA1SUM=y
CONFIG_SLEEP=y CONFIG_SLEEP=y
CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y
CONFIG_SPLIT=y CONFIG_SPLIT=y
# CONFIG_FEATURE_SPLIT_FANCY is not set
CONFIG_SORT=y CONFIG_SORT=y
CONFIG_FEATURE_SORT_BIG=y CONFIG_FEATURE_SORT_BIG=y
CONFIG_STAT=y CONFIG_STAT=y
@ -272,6 +273,7 @@ CONFIG_READLINK=y
CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_FEATURE_READLINK_FOLLOW=y
CONFIG_RUN_PARTS=y CONFIG_RUN_PARTS=y
CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
CONFIG_FEATURE_RUN_PARTS_FANCY=y
CONFIG_START_STOP_DAEMON=y CONFIG_START_STOP_DAEMON=y
CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y