From: Davidlohr Bueso <dave@xxxxxxx>
usage() does not return, also move the help option handling to the bottom of the switch.
Signed-off-by: Davidlohr Bueso <dave@xxxxxxx>
---
fdisk/fdisk.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 2f3c119..9387795 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -2095,8 +2095,8 @@ static void command_prompt(void)
}
}
-int
-main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
int j, c;
int optl = 0, opts = 0;
@@ -2130,9 +2130,6 @@ main(int argc, char **argv) {
else if (optarg && strcmp(optarg, "=nondos"))
usage(stderr);
break;
- case 'h':
- usage(stdout);
- break;
case 'H':
user_heads = strtou32_or_err(optarg, _("invalid heads argument"));
if (user_heads > 256)
@@ -2160,6 +2157,8 @@ main(int argc, char **argv) {
case 'v':
printf(UTIL_LINUX_VERSION);
return EXIT_SUCCESS;
+ case 'h':
+ usage(stdout);
default:
usage(stderr);
}
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
