From 132358e7bf44ef1b1d14e579f352f20c58c755d0 Mon Sep 17 00:00:00 2001 From: maxim Date: Mon, 30 Jun 2003 11:49:00 +0000 Subject: o Support for '--' to cancel options list processing. PR: bin/32433 Prodded by: Zak Johnson Obtained from: easyedit-1.4.6 MFC after: 2 weeks --- usr.bin/ee/ee.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c index 1d80b96..10e2874 100644 --- a/usr.bin/ee/ee.c +++ b/usr.bin/ee/ee.c @@ -2041,6 +2041,7 @@ char *arguments[]; struct files *temp_names = NULL; char *name; char *ptr; + int no_more_opts = FALSE; /* | see if editor was invoked as 'ree' (restricted mode) @@ -2057,7 +2058,7 @@ char *arguments[]; input_file = FALSE; recv_file = FALSE; count = 1; - while (count < numargs) + while ((count < numargs) && (!no_more_opts)) { buff = arguments[count]; if (!strcmp("-i", buff)) @@ -2086,9 +2087,18 @@ char *arguments[]; buff++; start_at_line = buff; } - + else if (!(strcmp("--", buff))) + no_more_opts = TRUE; else { + count--; + no_more_opts = TRUE; + } + count++; + } + while (count < numargs) + { + buff = arguments[count]; if (top_of_stack == NULL) { temp_names = top_of_stack = name_alloc(); @@ -2109,7 +2119,6 @@ char *arguments[]; temp_names->next_name = NULL; input_file = TRUE; recv_file = TRUE; - } count++; } } -- cgit v1.1