Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/split.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/split.c (modified) (6 diffs)

branches/2.2.9/mindi-busybox/coreutils/split.c

@@ -2 +2 @@
 /*
  * split - split a file into pieces
- * Copyright (c) 2007 Bernhard Fischer
+ * Copyright (c) 2007 Bernhard Reutner-Fischer
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 /* BB_AUDIT: SUSv3 compliant
@@ -21 +21 @@
     { "g", 1024*1024*1024 },
 #endif
-    { }
+    { "", 0 }
 };
 
@@ -56 +56 @@
 #define SPLIT_OPT_a (1<<2)
 
-int split_main(int argc, char **argv);
-int split_main(int argc, char **argv)
+int split_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int split_main(int argc UNUSED_PARAM, char **argv)
 {
     unsigned suffix_len = 2;
@@ -69 +69 @@
     char *src;
 
-    opt_complementary = "?2";
-    opt = getopt32(argv, "l:b:a:", &count_p, &count_p, &sfx);
+    opt_complementary = "?2:a+"; /* max 2 args; -a N */
+    opt = getopt32(argv, "l:b:a:", &count_p, &count_p, &suffix_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);
+        cnt = XATOOFF(count_p);
+    if (opt & SPLIT_OPT_b) // FIXME: also needs XATOOFF
+        cnt = xatoull_sfx(count_p, split_suffices);
     sfx = "x";
 
     argv += optind;
     if (argv[0]) {
+        int fd;
         if (argv[1])
             sfx = argv[1];
-        xmove_fd(xopen(argv[0], O_RDONLY), 0);
+        fd = xopen_stdin(argv[0]);
+        xmove_fd(fd, STDIN_FILENO);
     } else {
         argv[0] = (char *) bb_msg_standard_input;
@@ -101 +101 @@
 
     while (1) {
-        bytes_read = safe_read(0, read_buffer, READ_BUFFER_SIZE);
+        bytes_read = safe_read(STDIN_FILENO, read_buffer, READ_BUFFER_SIZE);
         if (!bytes_read)
             break;
         if (bytes_read < 0)
-            bb_perror_msg_and_die("%s", argv[0]);
+            bb_simple_perror_msg_and_die(argv[0]);
         src = read_buffer;
         do {
@@ -133 +133 @@
             }
 
-            xwrite(1, src, to_write);
+            xwrite(STDOUT_FILENO, src, to_write);
             bytes_read -= to_write;
             src += to_write;
         } while (bytes_read);
     }
-    return 0;
+    return EXIT_SUCCESS;
 }