1 files changed, 15 insertions, 5 deletions

diff --git a/usr.bin/tar/bsdtar.c b/usr.bin/tar/bsdtar.c
index bf99464b5138f..852d4b8cf7e4e 100644
--- a/usr.bin/tar/bsdtar.c
+++ b/usr.bin/tar/bsdtar.c
@@ -120,6 +120,10 @@ static const char *tar_opts = "+Bb:C:cF:f:HhI:jkLlmnOoPprtT:UuvW:wX:xyZz";
 #define	OPTION_TOTALS 28
 #define	OPTION_VERSION 30
 
+/*
+ * If you add anything, be very careful
+ * to keep this list properly sorted.
+ */
 static const struct option tar_longopts[] = {
 	{ "absolute-paths",     no_argument,       NULL, 'P' },
 	{ "append",             no_argument,       NULL, 'r' },
@@ -753,12 +757,18 @@ bsdtar_getopt(struct bsdtar *bsdtar, const char *optstring,
 			*poption = option;
 			opt = option->val;
 
-			/* Check if there's another match. */
-			option++;
-			while (option->name != NULL &&
-			    (strlen(option->name) < option_length ||
-			    strncmp(p, option->name, option_length) != 0)) {
+			/* If the first match was exact, we're done. */
+			if (strncmp(p, option->name, strlen(option->name)) == 0) {
+				while (option->name != NULL)
+					option++;
+			} else {
+				/* Check if there's another match. */
 				option++;
+				while (option->name != NULL &&
+				    (strlen(option->name) < option_length ||
+				    strncmp(p, option->name, option_length) != 0)) {
+					option++;
+				}
 			}
 			if (option->name != NULL)
 				bsdtar_errc(bsdtar, 1, 0,