X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/3cdb9703ecf1c06dbbe87078cd9515f95ad547d1..ee2af4a46fc2ddef3a589ee9d5b58aa1c1f923bc:/bin/expr/expr.y

diff --git a/bin/expr/expr.y b/bin/expr/expr.y
index 0bcd6e0bc3..4807d9d479 100644
--- a/bin/expr/expr.y
+++ b/bin/expr/expr.y
@@ -244,12 +244,25 @@ is_zero_or_null(struct val *vp)
 	/* NOTREACHED */
 }
 
+static void
+usage(void)
+{
+        fprintf(stderr,
+                "usage: expr expression\n");
+        exit(EXIT_FAILURE);
+}
+
 int
-main (int argc __unused, char **argv)
+main (int argc, char **argv)
 {
 	setlocale (LC_ALL, "");
 
-	av = argv + 1;
+	if (argc > 1 && strcmp(argv[1], "--"))
+		av = argv + 1;
+	else if (argc > 2)
+		av = argv + 2;
+	else
+		usage();
 
 	yyparse ();