Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- don't make -h/-H get around the argument check by setting 

'inquiry' in the fallthru case, but instead explicitly
  check for 'display_usage' as well.
This commit is contained in:
mrg 2019-02-04 09:53:41 +00:00
parent a5ca97c6e5
commit 597023c44e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.sbin/mmcformat/mmcformat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mmcformat.c,v 1.4 2013/10/19 17:16:37 christos Exp $ */
/* $NetBSD: mmcformat.c,v 1.5 2019/02/04 09:53:41 mrg Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@ -765,6 +765,7 @@ main(int argc, char *argv[])
case 'h' :
case 'H' :
display_usage = 1;
break;
case 'I' :
inquiry = 1;
break;
@ -792,10 +793,10 @@ main(int argc, char *argv[])
argv += optind;
argc -= optind;
if ((!blank && !format && !grow_session && !grow_spare) &&
(!expert && !inquiry)) {
fprintf(stderr, "%s : at least one of -B, -F, -G, -S, -X or -I "
"needs to be specified\n\n", progname);
if (!blank && !format && !grow_session && !grow_spare &&
!expert && !inquiry && !display_usage) {
fprintf(stderr, "%s : at least one of -B, -F, -G, -h, -H -S, "
"-X or -I needs to be specified\n\n", progname);
return usage(progname);
}