BSD 4_3_Reno release

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

diff --git a/usr/src/usr.bin/paste/paste.c b/usr/src/usr.bin/paste/paste.c
index 44ce13e..7eadeb9 100644 (file)
--- a/usr/src/usr.bin/paste/paste.c
+++ b/usr/src/usr.bin/paste/paste.c
@@ -5,7 +5,19 @@
  * This code is derived from software contributed to Berkeley by
  * Adam S. Moskowitz of Menlo Consulting.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam S. Moskowitz of Menlo Consulting.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * Neither the name of the University nor the names of its contributors may
+ * 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
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -15,7 +27,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)paste.c    5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)paste.c    5.6 (Berkeley) 6/24/90";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -78,7 +90,7 @@ parallel(argv)
        register char ch, *p;
        LIST *head, *tmp;
        int opencnt, output;
        register char ch, *p;
        LIST *head, *tmp;
        int opencnt, output;

-       char buf[_POSIX2_LINE_MAX + 1], *malloc();
+       char buf[_BSD_LINE_MAX + 1], *malloc();

 
        for (cnt = 0, head = NULL; p = *argv; ++argv, ++cnt) {
                if (!(lp = (LIST *)malloc((u_int)sizeof(LIST)))) {
 
        for (cnt = 0, head = NULL; p = *argv; ++argv, ++cnt) {
                if (!(lp = (LIST *)malloc((u_int)sizeof(LIST)))) {


@@ -151,7 +163,7 @@ sequential(argv)
        register FILE *fp;
        register int cnt;
        register char ch, *p, *dp;
        register FILE *fp;
        register int cnt;
        register char ch, *p, *dp;

-       char buf[_POSIX2_LINE_MAX + 1];
+       char buf[_BSD_LINE_MAX + 1];

 
        for (; p = *argv; ++argv) {
                if (p[0] == '-' && !p[1])
 
        for (; p = *argv; ++argv) {
                if (p[0] == '-' && !p[1])