On Sun, Mar 05, 2017 at 08:52:25PM +0000, Sami Kerola wrote: > while ((c = getopt (argc, argv, > @@ -721,39 +724,38 @@ int main(int argc, char **argv) > else if (!strcmp(optarg, "full")) > output_format = 0; > else { > - fprintf(stderr, "Invalid output format %s. " > + errx(BLKID_EXIT_OTHER, _("Invalid output format %s. " > "Choose from value,\n\t" > - "device, list, udev or full\n", optarg); > - exit(BLKID_EXIT_OTHER); > + "value, device, list, udev, export, or full"), optarg); > } > break; > case 'O': > - offset = strtosize_or_err(optarg, "invalid offset argument"); > + offset = strtosize_or_err(optarg, _("invalid offset argument")); > break; > case 'p': > lowprobe |= LOWPROBE_SUPERBLOCKS; > break; > case 's': > if (numtag + 1 >= sizeof(show) / sizeof(*show)) { > - fprintf(stderr, "Too many tags specified\n"); > + warnx(_("Too many tags specified")); > usage(err); Ah, it seems blkid is one of the remaining tools where I have no changed usage(err) to errtryh(err). We don't want to print all usage() on errors, it's better to see Try 'blkid -h' for more information. only. -- Karel Zak <kzak@xxxxxxxxxx> http://karelzak.blogspot.com -- 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