BSD 4_3_Net_2 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 7eadeb9..83051c1 100644 (file)
--- a/usr/src/usr.bin/paste/paste.c
+++ b/usr/src/usr.bin/paste/paste.c
@@ -5,19 +5,33 @@
  * 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.
  *

- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


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

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

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


@@ -90,7 +104,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[_BSD_LINE_MAX + 1], *malloc();
+       char buf[_POSIX2_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)))) {


@@ -163,7 +177,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[_BSD_LINE_MAX + 1];
+       char buf[_POSIX2_LINE_MAX + 1];

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