*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-/* BB_AUDIT: not yet SUSV3 compliant; FIXME: add -bN{k,m}
+/* BB_AUDIT: SUSv3 compliant
* SUSv3 requirements:
* http://www.opengroup.org/onlinepubs/009695399/utilities/split.html
*/
#include "busybox.h"
-static unsigned suffix_len = 2;
+
static const struct suffix_mult split_suffices[] = {
#if ENABLE_FEATURE_SPLIT_FANCY
{ "b", 512 },
};
/* Increment the suffix part of the filename.
- * Returns 0 on success and 1 on error (if we are out of files)
+ * Returns NULL if we are out of filenames.
*/
-static bool next_file(char **old)
+static char *next_file(char *old, unsigned suffix_len)
{
- size_t end = strlen(*old);
+ size_t end = strlen(old);
unsigned i = 1;
char *curr;
do {
- curr = *old + end - i;
+ curr = old + end - i;
if (*curr < 'z') {
*curr += 1;
break;
}
- *curr = 'a';
i++;
- } while (i <= suffix_len);
- if ((*curr == 'z') && (i == suffix_len))
- return 1;
- return 0;
+ if (i > suffix_len) {
+ return NULL;
+ }
+ *curr = 'a';
+ } while (1);
+
+ return old;
}
+
+#define read_buffer bb_common_bufsiz1
+enum { READ_BUFFER_SIZE = sizeof(bb_common_bufsiz1) - 1 };
+
#define SPLIT_OPT_l (1<<0)
#define SPLIT_OPT_b (1<<1)
#define SPLIT_OPT_a (1<<2)
int split_main(int argc, char **argv);
int split_main(int argc, char **argv)
{
+ unsigned suffix_len = 2;
char *pfx;
char *count_p;
- char *sfx_len;
- unsigned cnt = 1000;
- char *input_file;
+ const char *sfx;
+ off_t cnt = 1000;
+ off_t remaining = 0;
+ unsigned opt;
+ ssize_t bytes_read, to_write;
+ char *src;
-//XXX: FIXME opt_complementary = "+2"; /* at most 2 non-option arguments */
- getopt32(argc, argv, "l:b:a:", &count_p, &count_p, &sfx_len);
- argv += optind;
+ opt_complementary = "?2";
+ opt = getopt32(argc, argv, "l:b:a:", &count_p, &count_p, &sfx);
- if (option_mask32 & (SPLIT_OPT_l|SPLIT_OPT_b))
- cnt = xatoi(count_p);
- if (option_mask32 & SPLIT_OPT_a)
- suffix_len = xatoul(sfx_len);
+ if (opt & SPLIT_OPT_l)
+ cnt = xatoul(count_p);
+ if (opt & SPLIT_OPT_b)
+ cnt = xatoul_sfx(count_p, split_suffices);
+ if (opt & SPLIT_OPT_a)
+ suffix_len = xatou(sfx);
+ sfx = "x";
- if (!*argv)
- *--argv = (char*) "-";
- input_file = *argv;
- if (NAME_MAX < strlen(*argv) + suffix_len)
- bb_error_msg_and_die("Suffix too long");
+ argv += optind;
+ if (argv[0]) {
+ if (argv[1])
+ sfx = argv[1];
+ xmove_fd(xopen(argv[0], O_RDONLY), 0);
+ } else {
+ argv[0] = (char *) bb_msg_standard_input;
+ }
+
+ if (NAME_MAX < strlen(sfx) + suffix_len)
+ bb_error_msg_and_die("suffix too long");
{
- char *char_p = xzalloc(suffix_len);
+ char *char_p = xzalloc(suffix_len + 1);
memset(char_p, 'a', suffix_len);
- pfx = xasprintf("%s%s", (argc > optind + 1) ? *++argv : "x", char_p);
+ pfx = xasprintf("%s%s", sfx, char_p);
if (ENABLE_FEATURE_CLEAN_UP)
free(char_p);
}
-//XXX:FIXME: unify those two file-handling schemata below (FILE vs fd) !
- if (option_mask32 & SPLIT_OPT_b) {
- char *buf;
- ssize_t i;
- ssize_t bytes = 0;
- int inp = xopen(input_file, O_RDONLY);
- int flags = O_WRONLY | O_CREAT | O_TRUNC;
- do {
- int out = xopen(pfx, flags);
- buf = xzalloc(cnt);
- lseek(inp, bytes, SEEK_SET);
- bytes += i = full_read(inp, buf, cnt);
- xwrite(out, buf, i);
- close(out);
- free(buf);
- if (next_file(&pfx))
- flags = O_WRONLY | O_APPEND;
- } while(i > 0);
- } else { /* -l */
- FILE *fp = fopen_or_warn_stdin(input_file);
- char *buf;
+
+ while (1) {
+ bytes_read = safe_read(0, read_buffer, READ_BUFFER_SIZE);
+ if (!bytes_read)
+ break;
+ if (bytes_read < 0)
+ bb_perror_msg_and_die("%s", argv[0]);
+ src = read_buffer;
do {
- unsigned i = cnt;
- int flags = O_WRONLY | O_CREAT | O_TRUNC;
- int out = xopen(pfx, flags);
- buf = NULL;
- while (i--) {
- buf = xmalloc_fgets(fp);
- if (buf == NULL)
- break;
- xwrite(out, buf, buf ? strlen(buf) : 0);
- free(buf);
- };
- close(out);
+ if (!remaining) {
+ if (!pfx)
+ bb_error_msg_and_die("suffixes exhausted");
+ xmove_fd(xopen(pfx, O_WRONLY | O_CREAT | O_TRUNC), 1);
+ pfx = next_file(pfx, suffix_len);
+ remaining = cnt;
+ }
- if (next_file(&pfx))
- flags = O_WRONLY | O_APPEND;
- } while (buf);
- if (ENABLE_FEATURE_CLEAN_UP)
- fclose_if_not_stdin(fp);
- }
+ if (opt & SPLIT_OPT_b) {
+ /* split by bytes */
+ to_write = (bytes_read < remaining) ? bytes_read : remaining;
+ remaining -= to_write;
+ } else {
+ /* split by lines */
+ /* can be sped up by using _memrchr_
+ * and writing many lines at once... */
+ char *end = memchr(src, '\n', bytes_read);
+ if (end) {
+ --remaining;
+ to_write = end - src + 1;
+ } else {
+ to_write = bytes_read;
+ }
+ }
- if (ENABLE_FEATURE_CLEAN_UP) {
- free(pfx);
+ xwrite(1, src, to_write);
+ bytes_read -= to_write;
+ src += to_write;
+ } while (bytes_read);
}
- return EXIT_SUCCESS;
+ return 0;
}
projects / oweals / busybox.git / blobdiff