commit 53dc99a76e73ff086db19e7da266c3b571b3cf87
author Rob Landley <rob@landley.net> Wed Mar 02 22:10:49 2016 -0600
committer Rob Landley <rob@landley.net> Wed Mar 02 22:10:49 2016 -0600
tree bea00c81f2ddfda741781a4fe0e0ff64e7c3a667
parent 0dfa601b9fec5191269702cdd037adf25814ab19

Minor cleanup.

toys/pending/more.c

diff --git a/toys/pending/more.c b/toys/pending/more.c
index f0e7907..55bed36 100644
--- a/toys/pending/more.c
+++ b/toys/pending/more.c
@@ -2,17 +2,17 @@
  *
  * Copyright 2013 Bilal Qureshi <bilal.jmi@gmail.com>
  *
- * No Standard
+ * http://pubs.opengroup.org/onlinepubs/9699919799/utilities/more.html
 
-USE_MORE(NEWTOY(more, NULL, TOYFLAG_USR|TOYFLAG_BIN))
+USE_MORE(NEWTOY(more, 0, TOYFLAG_USR|TOYFLAG_BIN))
 
 config MORE
   bool "more"
   default n
   help
-    usage: more [FILE]...
+    usage: more [FILE...]
 
-    View FILE (or stdin) one screenful at a time.
+    View FILE(s) (or stdin) one screenful at a time.
 */
 
 #define FOR_more
@@ -62,10 +62,8 @@
 
 static void do_cat_operation(int fd, char *name)
 {
-  char *buf = NULL;
-  
   if (toys.optc > 1) show_file_header(name);
-  for (; (buf = get_line(fd)); free(buf)) printf("%s\n", buf);
+  xsendfile(0, 1);
 }
 
 void more_main()
@@ -76,7 +74,7 @@
   struct termios newf;
   FILE *fp, *cin;
 
-  if (!isatty(STDOUT_FILENO) || !(cin = fopen("/dev/tty", "r"))) {
+  if (!isatty(1) || !(cin = fopen("/dev/tty", "r"))) {
     loopfiles(toys.optargs, do_cat_operation);
     return;
   }
@@ -125,7 +123,8 @@
       }
 
       putchar(ch);
-      if (ch == '\t') col = (col | 0x7) + 1; else col++;
+      if (ch == '\t') col = (col | 0x7) + 1;
+      else col++;
       if (col == cols) putchar(ch = '\n');
       if (ch == '\n') {
         col = 0;