1 files changed, 76 insertions, 21 deletions

diff --git a/src/internal/argv/argv.h b/src/internal/argv/argv.h
index 2324c8f..d17865b 100644
--- a/src/internal/argv/argv.h
+++ b/src/internal/argv/argv.h
@@ -1,6 +1,6 @@
 /****************************************************************************/
 /*  argv.h: a thread-safe argument vector parser and usage screen generator */
-/*  Copyright (C) 2015--2021  SysDeer Technologies, LLC                     */
+/*  Copyright (C) 2015--2024  SysDeer Technologies, LLC                     */
 /*  Released under the Standard MIT License; see COPYING.SLIBTOOL.          */
 /****************************************************************************/
 
@@ -83,6 +83,7 @@ enum argv_error {
 	ARGV_ERROR_INTERNAL,
 	ARGV_ERROR_SHORT_OPTION,
 	ARGV_ERROR_LONG_OPTION,
+	ARGV_ERROR_VENDOR_OPTION,
 	ARGV_ERROR_OPTARG_NONE,
 	ARGV_ERROR_OPTARG_REQUIRED,
 	ARGV_ERROR_OPTARG_PARADIGM,
@@ -398,7 +399,11 @@ static void argv_scan(
 						fval = ch;
 				}
 			} else {
-				ferr = ARGV_ERROR_SHORT_OPTION;
+				if ((ch == &parg[0][1]) && (ch[0] == 'W') && ch[1]) {
+					ferr = ARGV_ERROR_VENDOR_OPTION;
+				} else {
+					ferr = ARGV_ERROR_SHORT_OPTION;
+				}
 			}
 
 		} else if (!fnoscan && (fhybrid || is_long_option(ch))) {
@@ -413,49 +418,72 @@ static void argv_scan(
 					ch = *parg;
 				}
 
-				if (fhybrid && !(option->flags & ARGV_OPTION_HYBRID_SWITCH))
+				/* now verify the proper setting of option values */
+				if (fhybrid && !(option->flags & ARGV_OPTION_HYBRID_SWITCH)) {
 					ferr = ARGV_ERROR_HYBRID_NONE;
-				else if (!fhybrid && (option->flags & ARGV_OPTION_HYBRID_ONLY))
+
+				} else if (!fhybrid && (option->flags & ARGV_OPTION_HYBRID_ONLY)) {
 					ferr = ARGV_ERROR_HYBRID_ONLY;
-				else if (option->optarg == ARGV_OPTARG_NONE) {
+
+				} else if (option->optarg == ARGV_OPTARG_NONE) {
 					if (val[0]) {
 						ferr = ARGV_ERROR_OPTARG_NONE;
 						ctx->errch = val + 1;
-					} else
+					} else {
 						fval = false;
+					}
+
 				} else if (val[0] && (option->flags & ARGV_OPTION_HYBRID_JOINED)) {
 					fval = true;
 					ch   = val;
-				} else if (fhybrid && !val[0] && !(option->flags & ARGV_OPTION_HYBRID_SPACE))
-					ferr = ARGV_ERROR_HYBRID_SPACE;
-				else if (fhybrid && (val[0]=='=') && !(option->flags & ARGV_OPTION_HYBRID_EQUAL))
+
+				} else if (fhybrid && !val[0] && !(option->flags & ARGV_OPTION_HYBRID_SPACE)) {
+					if (option->optarg == ARGV_OPTARG_OPTIONAL) {
+						fval = false;
+
+					} else {
+						ferr = ARGV_ERROR_HYBRID_SPACE;
+					}
+
+				} else if (fhybrid && (val[0]=='=') && !(option->flags & ARGV_OPTION_HYBRID_EQUAL)) {
 					ferr = ARGV_ERROR_HYBRID_EQUAL;
-				else if (fhybrid && (val[0]==',') && !(option->flags & ARGV_OPTION_HYBRID_COMMA))
+
+				} else if (fhybrid && (val[0]==',') && !(option->flags & ARGV_OPTION_HYBRID_COMMA)) {
 					ferr = ARGV_ERROR_HYBRID_COMMA;
-				else if (!fhybrid && (val[0]==','))
+
+				} else if (!fhybrid && (val[0]==',')) {
 					ferr = ARGV_ERROR_HYBRID_COMMA;
-				else if (val[0] && !val[1])
+
+				} else if (val[0] && !val[1]) {
 					ferr = ARGV_ERROR_OPTARG_REQUIRED;
-				else if (val[0] && val[1]) {
+
+				} else if (val[0] && val[1]) {
 					fval = true;
 					ch   = ++val;
+
 				} else if (option->optarg == ARGV_OPTARG_REQUIRED) {
-					if (!val[0] && !*parg)
+					if (!val[0] && !*parg) {
 						ferr = ARGV_ERROR_OPTARG_REQUIRED;
-					else if (*parg && is_short_option(*parg))
+
+					} else if (*parg && is_short_option(*parg)) {
 						ferr = ARGV_ERROR_OPTARG_REQUIRED;
-					else if (*parg && is_long_option(*parg))
+
+					} else if (*parg && is_long_option(*parg)) {
 						ferr = ARGV_ERROR_OPTARG_REQUIRED;
-					else if (*parg && is_last_option(*parg))
+
+					} else if (*parg && is_last_option(*parg)) {
 						ferr = ARGV_ERROR_OPTARG_REQUIRED;
-					else
+
+					} else {
 						fval = true;
+					}
 				} else {
 					/* ARGV_OPTARG_OPTIONAL */
 					fval = val[0];
 				}
-			} else
+			} else {
 				ferr = ARGV_ERROR_LONG_OPTION;
+			}
 		}
 
 		if (ferr == ARGV_ERROR_OK)
@@ -531,7 +559,11 @@ static const char * argv_program_name(const char * program_path)
 
 static void argv_show_error(int fd, struct argv_ctx * ctx)
 {
-	char opt_short_name[2] = {0,0};
+	const char * src;
+	char *       dst;
+	char *       cap;
+	char         opt_vendor_buf[256];
+	char         opt_short_name[2] = {0,0};
 
 	if (ctx->erropt && ctx->erropt->short_name)
 		opt_short_name[0] = ctx->erropt->short_name;
@@ -547,6 +579,27 @@ static void argv_show_error(int fd, struct argv_ctx * ctx)
 			argv_dprintf(fd,"'--%s' is not a valid long option\n",ctx->errch);
 			break;
 
+		case ARGV_ERROR_VENDOR_OPTION:
+			src = ctx->errch;
+			dst = opt_vendor_buf;
+			cap = &opt_vendor_buf[sizeof(opt_vendor_buf)];
+
+			for (; src && *src && dst<cap; ) {
+				if ((*src == '=') || (*src == ',') || (*src == ':')) {
+					src  = 0;
+				} else {
+					*dst++ = *src++;
+				}
+			}
+
+			if (dst == cap)
+				dst--;
+
+			*dst = '\0';
+
+			argv_dprintf(fd,"'-%s' is not a valid vendor option\n",opt_vendor_buf);
+			break;
+
 		case ARGV_ERROR_OPTARG_NONE:
 			argv_dprintf(fd,"'%s' is not a valid option value for [%s%s%s%s%s] "
 					"(option values may not be specified)\n",
@@ -563,7 +616,9 @@ static void argv_show_error(int fd, struct argv_ctx * ctx)
 				opt_short_name[0] ? "-" : "",
 				opt_short_name,
 				opt_short_name[0] ? "," : "",
-				ctx->erropt->long_name ? "--" : "",
+				ctx->erropt->long_name
+					? (ctx->erropt->flags & ARGV_OPTION_HYBRID_ONLY) ? "-" : "--"
+					: "",
 				ctx->erropt->long_name,
 				ctx->erropt->paradigm ? "one of the following values:" : "a value",
 				ctx->erropt->paradigm ? "{" : "",