pwqfilter: Allow --pre-hashed after --hash*

solardiz · solardiz · commit 7a564c913289 · 2022-01-17T17:25:36.000+01:00
We allowed this combination of options in the other order, and its effect
is documented in the man page.  No reason to insist on the order.
diff --git a/pwqfilter.c b/pwqfilter.c
@@ -1062,7 +1062,7 @@ int main(int argc, char **argv)
 		}
 
 		if (!strcmp("--pre-hashed", opt)) {
-			if ((options & OPT_HASH_ALL) || mode == MODE_STATUS)
+			if (mode == MODE_STATUS)
 				goto fail_conflict;
 			options |= OPT_PRE_HASHED;
 			continue;

Original file line number	Diff line number	Diff line change
`@@ -1062,7 +1062,7 @@ int main(int argc, char **argv)`
`1062`	`1062`	`}`
`1063`	`1063`
`1064`	`1064`	`if (!strcmp("--pre-hashed", opt)) {`
`1065`		`- if ((options & OPT_HASH_ALL) \|\| mode == MODE_STATUS)`
	`1065`	`+ if (mode == MODE_STATUS)`
`1066`	`1066`	`goto fail_conflict;`
`1067`	`1067`	`options \|= OPT_PRE_HASHED;`
`1068`	`1068`	`continue;`