From 69a773273c39942c6c48a60e3fcf1a95657663cc Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Jan 03 2016 03:29:29 +0000
Subject: argv.h: skip unavailable short/long option records with --help={short|long}.


---

diff --git a/src/internal/argv/argv.h b/src/internal/argv/argv.h
index a8c7269..f47dbc2 100644
--- a/src/internal/argv/argv.h
+++ b/src/internal/argv/argv.h
@@ -791,6 +791,11 @@ static void argv_usage(
 		desclen = 32;
 
 	for (option=options,buflen=0,rdesclen=1; option->short_name || option->long_name; option++) {
+		if (fshort && !option->short_name)
+			continue;
+		else if (flong && !option->long_name)
+			continue;
+
 		if (option->paradigm) {
 			if (option->optarg == ARGV_OPTARG_OPTIONAL)
 				rparalen = strlen(option->paradigm) - 2*rbblen;