BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/cut/cut.c b/usr/src/usr.bin/cut/cut.c
index 39a38b6..a7e81a7 100644 (file)
--- a/usr/src/usr.bin/cut/cut.c
+++ b/usr/src/usr.bin/cut/cut.c
@@ -5,17 +5,33 @@
  * This code is derived from software contributed to Berkeley by
  * Adam S. Moskowitz of Menlo Consulting and Marciano Pitargue.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam S. Moskowitz of Menlo Consulting and Marciano Pitargue.
  *

- * 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 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


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

-static char sccsid[] = "@(#)cut.c      5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)cut.c      5.4 (Berkeley) 10/30/90";

 #endif /* not lint */
 
 #include <limits.h>
 #endif /* not lint */
 
 #include <limits.h>


@@ -98,7 +114,7 @@ main(argc, argv)
 
 int autostart, autostop, maxval;
 
 
 int autostart, autostop, maxval;
 

-char positions[LINE_MAX + 1];
+char positions[_POSIX2_LINE_MAX + 1];

 
 get_list(list)
        char *list;
 
 get_list(list)
        char *list;


@@ -139,10 +155,10 @@ get_list(list)
                        badlist("illegal list value");
                if (!stop || !start)
                        badlist("values may not include zero");
                        badlist("illegal list value");
                if (!stop || !start)
                        badlist("values may not include zero");

-               if (stop > LINE_MAX) {
+               if (stop > _POSIX2_LINE_MAX) {

                        /* positions used rather than allocate a new buffer */
                        (void)sprintf(positions, "%d too large (max %d)",
                        /* positions used rather than allocate a new buffer */
                        (void)sprintf(positions, "%d too large (max %d)",

-                           stop, LINE_MAX);
+                           stop, _POSIX2_LINE_MAX);

                        badlist(positions);
                }
                if (maxval < stop)
                        badlist(positions);
                }
                if (maxval < stop)


@@ -194,7 +210,7 @@ f_cut(fp, fname)
        register int ch, field, isdelim;
        register char *pos, *p, sep;
        int output;
        register int ch, field, isdelim;
        register char *pos, *p, sep;
        int output;

-       char lbuf[LINE_MAX + 1];
+       char lbuf[_POSIX2_LINE_MAX + 1];

 
        for (sep = dchar, output = 0; fgets(lbuf, sizeof(lbuf), fp);) {
                for (isdelim = 0, p = lbuf;; ++p) {
 
        for (sep = dchar, output = 0; fgets(lbuf, sizeof(lbuf), fp);) {
                for (isdelim = 0, p = lbuf;; ++p) {