rip out SHELL_ESCAPE define

[unix-history] / usr / src / usr.bin / window / parser3.c

diff --git a/usr/src/usr.bin/window/parser3.c b/usr/src/usr.bin/window/parser3.c
index 070cfd0..7fed060 100644 (file)
--- a/usr/src/usr.bin/window/parser3.c
+++ b/usr/src/usr.bin/window/parser3.c
@@ -1,6 +1,23 @@
+/*
+ * Copyright (c) 1983 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
 #ifndef lint

-static char *sccsid = "@(#)parser3.c   3.2 84/05/06";
-#endif
+static char sccsid[] = "@(#)parser3.c  3.7 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "parser.h"
 
 
 #include "parser.h"
 


@@ -65,7 +82,7 @@ char flag;
                true = v->v_num != 0;
                break;
        case V_STR:
                true = v->v_num != 0;
                break;
        case V_STR:

-               p_error("Numeric value required for ?.");
+               p_error("?: Numeric left operand required.");

                str_free(v->v_str);
                v->v_type = V_ERR;
        case V_ERR:
                str_free(v->v_str);
                v->v_type = V_ERR;
        case V_ERR:


@@ -104,7 +121,7 @@ char flag;
                        v->v_num = true = true || v->v_num != 0;
                        break;
                case V_STR:
                        v->v_num = true = true || v->v_num != 0;
                        break;
                case V_STR:

-                       p_error("Numeric value required for ||.");
+                       p_error("||: Numeric operands required.");

                        str_free(v->v_str);
                        v->v_type = V_ERR;
                case V_ERR:
                        str_free(v->v_str);
                        v->v_type = V_ERR;
                case V_ERR:


@@ -138,7 +155,7 @@ char flag;
                        v->v_num = true = true && v->v_num != 0;
                        break;
                case V_STR:
                        v->v_num = true = true && v->v_num != 0;
                        break;
                case V_STR:

-                       p_error("Numeric value required for &&.");
+                       p_error("&&: Numeric operands required.");

                        str_free(v->v_str);
                        v->v_type = V_ERR;
                case V_ERR:
                        str_free(v->v_str);
                        v->v_type = V_ERR;
                case V_ERR: