13 files changed, 16 insertions, 22 deletions
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 8e8620094..436d34d9d 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -765,10 +765,10 @@ int main(int argc, char **argv)
 			/* ignore - backward compatibility */
 			break;
 		case 'h':
-			err = 0;
-			/* fallthrough */
+			usage(0);
+			break;
 		default:
-			usage(err);
+			errtryh(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 0e2f0d4a0..8df397cbd 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -394,9 +394,8 @@ int main(int argc, char **argv)
 			return EXIT_SUCCESS;
 		case 'h':
 			usage(stdout);
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 564c74cc3..aff284728 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -1477,8 +1477,7 @@ int main(int argc, char *argv[])
 			force_tree = 1;
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 0e1ebfffc..8111a927e 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -1196,9 +1196,8 @@ int main(int argc, char **argv)
 				errx(EXIT_FAILURE, _("invalid structured data parameter: '%s'"), optarg);
 			add_structured_data_param(get_user_structured_data(&ctl), optarg);
 			break;
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	argc -= optind;
diff --git a/misc-utils/look.c b/misc-utils/look.c
index 93c388e6a..58cb83b60 100644
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -127,9 +127,8 @@ main(int argc, char *argv[])
 			return EXIT_SUCCESS;
 		case 'h':
 			usage(stdout);
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	argc -= optind;
 	argv += optind;
diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index 684de082b..639db313f 100644
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -586,9 +586,8 @@ int main(int argc, char *argv[])
 		case 'u':
 			disable_columns_truncate();
 			break;
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c
index ffeb36abe..cc2d7ce6a 100644
--- a/misc-utils/mcookie.c
+++ b/misc-utils/mcookie.c
@@ -169,7 +169,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index df678e003..97e4d5674 100644
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -400,7 +400,7 @@ main(int argc, char **argv)
 			flags |= NAMEI_VERTICAL;
 			break;
 		default:
-			usage(EXIT_FAILURE);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/rename.c b/misc-utils/rename.c
index c8a4f8ca5..f53b236e2 100644
--- a/misc-utils/rename.c
+++ b/misc-utils/rename.c
@@ -164,7 +164,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	argc -= optind;
diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c
index 4a2daf936..34bb246da 100644
--- a/misc-utils/test_uuidd.c
+++ b/misc-utils/test_uuidd.c
@@ -37,6 +37,7 @@
 #include "c.h"
 #include "xalloc.h"
 #include "strutils.h"
+#include "nls.h"
 
 #define LOG(level,args) if (loglev >= level) { fprintf args; }
 
@@ -279,8 +280,7 @@ int main(int argc, char *argv[])
 			usage(stdout);
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryh(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 49cf9dc51..313a4afe0 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -641,7 +641,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index 40b00ffeb..911fead72 100644
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	switch (do_type) {
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 0021e76e6..2845b18f7 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -546,8 +546,7 @@ main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}