date: trivial fix - was reading seconds into nanoseconds field! DOH

[oweals/busybox.git] / coreutils / tac.c

diff --git a/coreutils/tac.c b/coreutils/tac.c
index 6aa0528e0494c98bf1db4f612b4742e12b28e0ee..d70e23ad41cecec81c44a02e6ce64c4c1eceefcb 100644 (file)
--- a/coreutils/tac.c
+++ b/coreutils/tac.c
@@ -20,16 +20,35 @@
 
 /* This is a NOEXEC applet. Be very careful! */
 
+struct lstring {
+       int size;
+       char buf[1];
+};
+
 int tac_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int tac_main(int argc, char **argv)
+int tac_main(int argc UNUSED_PARAM, char **argv)
 {
        char **name;
        FILE *f;
-       char *line;
+       struct lstring *line = NULL;
        llist_t *list = NULL;
        int retval = EXIT_SUCCESS;
-       
+
+#if ENABLE_DESKTOP
+/* tac from coreutils 6.9 supports:
+       -b, --before
+              attach the separator before instead of after
+       -r, --regex
+              interpret the separator as a regular expression
+       -s, --separator=STRING
+              use STRING as the separator instead of newline
+We support none, but at least we will complain or handle "--":
+*/
+       getopt32(argv, "");
+       argv += optind;
+#else
        argv++;
+#endif
        if (!*argv)
                *--argv = (char *)"-";
        /* We will read from last file to first */
@@ -38,21 +57,35 @@ int tac_main(int argc, char **argv)
                name++;
 
        do {
+               int ch, i;
+
                name--;
                f = fopen_or_warn_stdin(*name);
                if (f == NULL) {
+                       /* error message is printed by fopen_or_warn_stdin */
                        retval = EXIT_FAILURE;
                        continue;
                }
 
-               errno = 0;
-               /* FIXME: NUL bytes are mishandled. */
-               while ((line = xmalloc_fgets(f)) != NULL)
-                       llist_add_to(&list, line);      
-
-               /* xmalloc_fgets uses getc and returns NULL on error or EOF. */
-               /* It sets errno to ENOENT on EOF, but fopen_or_warn_stdin would */
-               /* catch this error so we can filter it out here. */
+               errno = i = 0;
+               do {
+                       ch = fgetc(f);
+                       if (ch != EOF) {
+                               if (!(i & 0x7f))
+                                       /* Grow on every 128th char */
+                                       line = xrealloc(line, i + 0x7f + sizeof(int) + 1);
+                               line->buf[i++] = ch;
+                       }
+                       if (ch == '\n' || (ch == EOF && i != 0)) {
+                               line = xrealloc(line, i + sizeof(int));
+                               line->size = i;
+                               llist_add_to(&list, line);
+                               line = NULL;
+                               i = 0;
+                       }
+               } while (ch != EOF);
+               /* fgetc sets errno to ENOENT on EOF, we don't want
+                * to warn on this non-error! */
                if (errno && errno != ENOENT) {
                        bb_simple_perror_msg(*name);
                        retval = EXIT_FAILURE;
@@ -60,9 +93,14 @@ int tac_main(int argc, char **argv)
        } while (name != argv);
 
        while (list) {
-               printf("%s", list->data);
-               list = list->link;
+               line = (struct lstring *)list->data;
+               xwrite(STDOUT_FILENO, line->buf, line->size);
+               if (ENABLE_FEATURE_CLEAN_UP) {
+                       free(llist_pop(&list));
+               } else {
+                       list = list->link;
+               }
        }
-       
+
        return retval;
 }