=/^G show total bytes now; document may not always work

[unix-history] / usr / src / usr.bin / colcrt / colcrt.c

diff --git a/usr/src/usr.bin/colcrt/colcrt.c b/usr/src/usr.bin/colcrt/colcrt.c
index 2e4479c..cd2b8a3 100644 (file)
--- a/usr/src/usr.bin/colcrt/colcrt.c
+++ b/usr/src/usr.bin/colcrt/colcrt.c
@@ -1,18 +1,29 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1980 The Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)colcrt.c   5.1 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)colcrt.c   5.3 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <stdio.h>
 /*
 
 #include <stdio.h>
 /*


@@ -68,8 +79,7 @@ main(argc, argv)
        do {
                if (argc > 0) {
                        close(0);
        do {
                if (argc > 0) {
                        close(0);

-                       if ((f=fopen(argv[0], "r")
-) < 0) {
+                       if (!(f = fopen(argv[0], "r"))) {

                                fflush(stdout);
                                perror(argv[0]);
                                exit (1);
                                fflush(stdout);
                                perror(argv[0]);
                                exit (1);