Use --help suggestion on invalid option

The current default is to print all usage() output. This is overkill
in many case.

Addresses: https://github.com/karelzak/util-linux/issues/338
Signed-off-by: Karel Zak <kzak@redhat.com>

17 files changed, 18 insertions, 18 deletions

diff --git a/disk-utils/addpart.c b/disk-utils/addpart.c
index 73fd1ff4e..e003b18b5 100644
--- a/disk-utils/addpart.c
+++ b/disk-utils/addpart.c
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc != 5)
diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 5e70a234b..4e1f13b5f 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -2587,6 +2587,8 @@ int main(int argc, char *argv[])
 		case 'z':
 			cf->zero_start = 1;
 			break;
+		default:
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/disk-utils/delpart.c b/disk-utils/delpart.c
index efa7a70ef..d39401f6f 100644
--- a/disk-utils/delpart.c
+++ b/disk-utils/delpart.c
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc != 3)
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index 66e1bb90d..ad6b62b50 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -209,7 +209,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	argc -= optind;
diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index df7f0ceb3..a2b4daa36 100644
--- a/disk-utils/fdisk.c
+++ b/disk-utils/fdisk.c
@@ -926,7 +926,7 @@ int main(int argc, char **argv)
 			fdisk_set_size_unit(cxt, FDISK_SIZEUNIT_BYTES);
 			break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index 915c0c93c..9e7bab898 100644
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -684,7 +684,7 @@ int main(int argc, char **argv)
 			blksize = strtou32_or_err(optarg, _("invalid blocksize argument"));
 			break;
 		default:
-			usage(FSCK_EX_USAGE);
+			errtryhelp(FSCK_EX_USAGE);
 		}
 
 	if ((argc - optind) != 1)
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 97e558b76..34fbfdf72 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -1323,7 +1323,7 @@ main(int argc, char **argv) {
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(FSCK_EX_USAGE);
 		}
 	argc -= optind;
 	argv += optind;
diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c
index e35be6c7c..cd8a16fc8 100644
--- a/disk-utils/isosize.c
+++ b/disk-utils/isosize.c
@@ -218,7 +218,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	ct = argc - optind;
diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
index d66da14eb..0bf18509e 100644
--- a/disk-utils/mkfs.bfs.c
+++ b/disk-utils/mkfs.bfs.c
@@ -172,7 +172,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index bf7f00838..3c7d0f599 100644
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -769,7 +769,7 @@ int main(int argc, char **argv)
 			opt_holes = 1;
 			break;
 		default:
-			usage(FSCK_EX_USAGE);
+			errtryhelp(MKFS_EX_USAGE);
 		}
 	}
 
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 0e26966e5..613a06997 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -793,7 +793,7 @@ int main(int argc, char ** argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(MKFS_EX_USAGE);
 		}
 	argc -= optind;
 	argv += optind;
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 93a15deac..b367117dd 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -402,7 +402,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/disk-utils/partx.c b/disk-utils/partx.c
index cff160fbe..d74a52a6e 100644
--- a/disk-utils/partx.c
+++ b/disk-utils/partx.c
@@ -876,9 +876,8 @@ int main(int argc, char **argv)
 		case 'V':
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/disk-utils/raw.c b/disk-utils/raw.c
index b8dbe72fa..77945bc0f 100644
--- a/disk-utils/raw.c
+++ b/disk-utils/raw.c
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
 		case 'h':
 			usage(EXIT_SUCCESS);
 		default:
-			usage(EXIT_FAILURE);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	/*
diff --git a/disk-utils/resizepart.c b/disk-utils/resizepart.c
index 9a6235b5d..5c6c0497a 100644
--- a/disk-utils/resizepart.c
+++ b/disk-utils/resizepart.c
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc != 4)
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 2d6597434..fb9fa499a 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -2102,7 +2102,7 @@ int main(int argc, char *argv[])
 			sf->notell = 1;
 			break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c
index 89be2aed6..046efb495 100644
--- a/disk-utils/swaplabel.c
+++ b/disk-utils/swaplabel.c
@@ -168,8 +168,7 @@ int main(int argc, char *argv[])
 #endif
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}