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>

Documentation/boilerplate.c

@@ -93,7 +93,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	return EXIT_SUCCESS;

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)

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);
 		}
 	}
 

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)

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;

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);
 		}
 	}
 

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)

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;

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;

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);
 		}
 	}
 

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);
 		}
 	}
 

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;

disk-utils/mkswap.c

@@ -402,7 +402,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

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);
 		}
 	}
 

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);
 		}
 
 	/*

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)

disk-utils/sfdisk.c

@@ -2102,7 +2102,7 @@ int main(int argc, char *argv[])
 			sf->notell = 1;
 			break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

disk-utils/swaplabel.c

@@ -168,8 +168,7 @@ int main(int argc, char *argv[])
 #endif
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

include/c.h

@@ -212,6 +212,12 @@ errmsg(char doexit, int excode, char adderr, const char *fmt, ...)
 	exit(eval); \
 })
 
+#define errtryh(eval) __extension__ ({ \
+	fprintf(stderr, _("Try '%s -h' for more information.\n"), \
+			program_invocation_short_name); \
+	exit(eval); \
+})
+
 
 static inline __attribute__((const)) int is_power_of_2(unsigned long num)
 {

login-utils/chfn.c

@@ -175,7 +175,7 @@ static void parse_argv(struct chfn_control *ctl, int argc, char **argv)
 		case 'u':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 		ctl->changed = 1;
 		ctl->interactive = 0;

login-utils/chsh.c

@@ -153,7 +153,7 @@ static void parse_argv(int argc, char **argv, struct sinfo *pinfo)
 			pinfo->shell = optarg;
 			break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	/* done parsing arguments.  check for a username. */

login-utils/last.c

@@ -1002,8 +1002,7 @@ int main(int argc, char **argv)
 			ctl.time_fmt = which_time_format(optarg);
 			break;
 		default:
-			usage(&ctl, stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

login-utils/lslogins.c

@@ -1443,7 +1443,7 @@ int main(int argc, char *argv[])
 			break;
 		}
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

login-utils/newgrp.c

@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (!(pw_entry = getpwuid(getuid())))

login-utils/nologin.c

@@ -59,8 +59,7 @@ int main(int argc, char *argv[])
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_FAILURE;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

login-utils/su-common.c

@@ -856,7 +856,7 @@ su_main (int argc, char **argv, int mode)
 	  exit(EXIT_SUCCESS);
 
 	default:
-	  usage (EXIT_FAILURE);
+	  errtryhelp(EXIT_FAILURE);
 	}
     }
 

login-utils/utmpdump.c

@@ -365,7 +365,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

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);
 		}
 	}
 

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);
 		}
 	}
 

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);
 		}
 	}
 

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;

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;

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);
 		}
 	}
 

misc-utils/mcookie.c

@@ -169,7 +169,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

misc-utils/namei.c

@@ -400,7 +400,7 @@ main(int argc, char **argv)
 			flags |= NAMEI_VERTICAL;
 			break;
 		default:
-			usage(EXIT_FAILURE);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

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;

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);
 		}
 	}
 

misc-utils/uuidd.c

@@ -641,7 +641,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

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) {

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);
 		}
 	}
 

schedutils/chrt.c

@@ -439,8 +439,6 @@ int main(int argc, char **argv)
 
 	while((c = getopt_long(argc, argv, "+abdD:fiphmoP:T:rRvV", longopts, NULL)) != -1)
 	{
-		int ret = EXIT_FAILURE;
-
 		switch (c) {
 		case 'a':
 			ctl->all_tasks = 1;
@@ -496,10 +494,9 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		case 'h':
-			ret = EXIT_SUCCESS;
-			/* fallthrough */
+			show_usage(EXIT_SUCCESS);
 		default:
-			show_usage(ret);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

schedutils/ionice.c

@@ -203,7 +203,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	switch (ioclass) {

schedutils/taskset.c

@@ -172,8 +172,7 @@ int main(int argc, char **argv)
 			usage(stdout);
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/blkdiscard.c

@@ -163,8 +163,7 @@ int main(int argc, char **argv)
 			act = ACT_ZEROOUT;
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/chcpu.c

@@ -333,7 +333,7 @@ int main(int argc, char *argv[])
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/chmem.c

@@ -308,6 +308,8 @@ int main(int argc, char **argv)
 		case 'V':
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
+		default:
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/ctrlaltdel.c

@@ -100,7 +100,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc < 2)

sys-utils/dmesg.c

@@ -1380,9 +1380,8 @@ int main(int argc, char *argv[])
 		case OPT_TIME_FORMAT:
 			ctl.time_fmt = which_time_format(optarg);
 			break;
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	argc -= optind;

sys-utils/eject.c

@@ -268,8 +268,7 @@ static void parse_args(struct eject_control *ctl, int argc, char **argv)
 			exit(EXIT_SUCCESS);
 			break;
 		default:
-		case '?':
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 			break;
 		}
 	}

sys-utils/fallocate.c

@@ -347,8 +347,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/flock.c

@@ -214,12 +214,10 @@ int main(int argc, char *argv[])
 		case 'V':
 			printf(UTIL_LINUX_VERSION);
 			exit(EX_OK);
+		case 'h':
+			usage(0);
 		default:
-			/* optopt will be set if this was an unrecognized
-			 * option, i.e.  *not* 'h' or '?
-			 */
-			usage(optopt ? EX_USAGE : 0);
-			break;
+			errtryhelp(EX_USAGE);
 		}
 	}
 

sys-utils/fsfreeze.c

@@ -107,8 +107,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			exit(EXIT_SUCCESS);
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/fstrim.c

@@ -331,7 +331,7 @@ int main(int argc, char **argv)
 			verbose = 1;
 			break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 			break;
 		}
 	}

sys-utils/hwclock.c

@@ -1850,9 +1850,9 @@ int main(int argc, char **argv)
 			out_version();
 			return 0;
 		case 'h':			/* --help */
-		case '?':
-		default:
 			usage(NULL);
+		default:
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/ipcmk.c

@@ -127,8 +127,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			ask_shm = ask_msg = ask_sem = 0;
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/ipcrm.c

@@ -403,7 +403,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 
@@ -413,7 +413,7 @@ int main(int argc, char **argv)
 	/* print usage if we still have some arguments left over */
 	if (optind < argc) {
 		warnx(_("unknown argument: %s"), argv[optind]);
-		usage(stderr);
+		errtryhelp(EXIT_FAILURE);
 	}
 
 	return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;

sys-utils/ipcs.c

@@ -155,7 +155,7 @@ int main (int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/ldattach.c

@@ -356,8 +356,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(EXIT_SUCCESS);
 		default:
-			warnx(_("invalid option"));
-			usage(EXIT_FAILURE);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/losetup.c

@@ -698,7 +698,7 @@ int main(int argc, char **argv)
 			flags |= LOOPDEV_FL_SIZELIMIT;
                         break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/lscpu.c

@@ -2051,7 +2051,7 @@ int main(int argc, char *argv[])
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/lsmem.c

@@ -491,7 +491,7 @@ int main(int argc, char **argv)
 				lsmem->want_table = 0;
 			break;
 		default:
-			lsmem_usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/lsns.c

@@ -718,9 +718,8 @@ int main(int argc, char *argv[])
 			ls.fltr_ntypes++;
 			break;
 		}
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/mount.c

@@ -1017,8 +1017,7 @@ int main(int argc, char **argv)
 			mnt_context_set_source(cxt, optarg);
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(MOUNT_EX_USAGE);
 		}
 	}
 

sys-utils/mountpoint.c

@@ -173,8 +173,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/nsenter.c

@@ -338,7 +338,7 @@ int main(int argc, char *argv[])
 			break;
 #endif
 		default:
-			usage(EXIT_FAILURE);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/pivot_root.c

@@ -65,7 +65,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc != 3)

sys-utils/prlimit.c

@@ -607,9 +607,8 @@ int main(int argc, char **argv)
 		case RAW_OPTION:
 			raw = 1;
 			break;
-
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	if (argc > optind && pid)

sys-utils/readprofile.c

@@ -213,7 +213,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/setarch.c

@@ -379,7 +379,7 @@ int main(int argc, char *argv[])
 				warnx(_("unrecognized option '--list'"));
 			/* fallthrough */
 		default:
-			show_usage(NULL);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/setpriv.c

@@ -750,10 +750,8 @@ int main(int argc, char **argv)
 		case 'V':
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
-		case '?':
-			usage(stderr);
 		default:
-			errx(EXIT_FAILURE, _("unrecognized option '%c'"), c);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/setsid.c

@@ -80,7 +80,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc - optind < 1)

sys-utils/swapoff.c

@@ -221,9 +221,8 @@ int main(int argc, char *argv[])
 		case 'U':
 			add_uuid(optarg);
 			break;
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	argv += optind;

sys-utils/swapon.c

@@ -960,9 +960,8 @@ int main(int argc, char *argv[])
 			return EXIT_SUCCESS;
 		case 0:
 			break;
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	argv += optind;

sys-utils/tunelp.c

@@ -238,7 +238,7 @@ int main(int argc, char **argv)
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
-			print_usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/umount.c

@@ -610,8 +610,7 @@ int main(int argc, char **argv)
 			print_version();
 			break;
 		default:
-			usage(stderr);
-			break;
+			errtryhelp(MOUNT_EX_USAGE);
 		}
 	}
 

sys-utils/unshare.c

@@ -375,7 +375,7 @@ int main(int argc, char *argv[])
 			propagation = parse_propagation(optarg);
 			break;
 		default:
-			usage(EXIT_FAILURE);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/wdctl.c

@@ -553,10 +553,8 @@ int main(int argc, char *argv[])
 			noident = 1;
 			notimeouts = 1;
 			break;
-
-		case '?':
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

sys-utils/zramctl.c

@@ -640,7 +640,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

term-utils/mesg.c

@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	argc -= optind;

term-utils/script.c

@@ -731,7 +731,7 @@ int main(int argc, char **argv)
 			usage(stdout);
 			break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	argc -= optind;
 	argv += optind;

term-utils/scriptreplay.c

@@ -174,7 +174,7 @@ main(int argc, char *argv[])
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 			}
 	argc -= optind;
 	argv += optind;
@@ -182,7 +182,7 @@ main(int argc, char *argv[])
 
 	if ((argc < 1 && !tname) || argc > 3) {
 		warnx(_("wrong number of arguments"));
-		usage(stderr);
+		errtryhelp(EXIT_FAILURE);
 	}
 	if (!tname)
 		tname = argv[idx++];

term-utils/setterm.c

@@ -670,7 +670,7 @@ static void parse_option(struct setterm_control *ctl, int ac, char **av)
 		case OPT_HELP:
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 }

term-utils/wall.c

@@ -217,7 +217,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 	argc -= optind;

term-utils/write.c

@@ -362,7 +362,7 @@ int main(int argc, char **argv)
 		do_write(&ctl);
 		break;
 	default:
-		usage(stderr);
+		errtryhelp(EXIT_FAILURE);
 	}
 	free(ctl.dst_tty_path);
 	return EXIT_SUCCESS;

text-utils/col.c

@@ -223,7 +223,7 @@ int main(int argc, char **argv)
 		case 'H':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (optind != argc)

text-utils/colcrt.c

@@ -266,7 +266,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

text-utils/colrm.c

@@ -178,7 +178,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc > 1)

text-utils/column.c

@@ -196,7 +196,7 @@ int main(int argc, char **argv)
 			xflag = 1;
 			break;
 		default:
-			usage(EXIT_FAILURE);
+			errtryhelp(EXIT_FAILURE);
 	}
 	argc -= optind;
 	argv += optind;

text-utils/hexdump.c

@@ -137,7 +137,7 @@ parse_args(int argc, char **argv, struct hexdump *hex)
 			exit(EXIT_SUCCESS);
 			break;
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	}
 

text-utils/line.c

@@ -64,7 +64,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	setvbuf(stdin, NULL, _IONBF, 0);

text-utils/rev.c

@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	argc -= optind;

text-utils/tailf.c

@@ -268,7 +268,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 
 	if (argc == optind)

text-utils/ul.c

@@ -192,7 +192,7 @@ int main(int argc, char **argv)
 		case 'h':
 			usage(stdout);
 		default:
-			usage(stderr);
+			errtryhelp(EXIT_FAILURE);
 		}
 	setupterm(termtype, STDOUT_FILENO, &ret);
 	switch (ret) {