summaryrefslogtreecommitdiffstats
path: root/text-utils
diff options
context:
space:
mode:
authorKarel Zak2016-12-19 13:13:34 +0100
committerKarel Zak2016-12-19 13:13:34 +0100
commit677ec86cef983a106c6e5d175f44b125858c3016 (patch)
treeb993641faa65700acd62768da189a103da4c40ec /text-utils
parentinclude/c.h: add errtryhelp() (diff)
downloadkernel-qcow2-util-linux-677ec86cef983a106c6e5d175f44b125858c3016.tar.gz
kernel-qcow2-util-linux-677ec86cef983a106c6e5d175f44b125858c3016.tar.xz
kernel-qcow2-util-linux-677ec86cef983a106c6e5d175f44b125858c3016.zip
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>
Diffstat (limited to 'text-utils')
-rw-r--r--text-utils/col.c2
-rw-r--r--text-utils/colcrt.c2
-rw-r--r--text-utils/colrm.c2
-rw-r--r--text-utils/column.c2
-rw-r--r--text-utils/hexdump.c2
-rw-r--r--text-utils/line.c2
-rw-r--r--text-utils/rev.c2
-rw-r--r--text-utils/tailf.c2
-rw-r--r--text-utils/ul.c2
9 files changed, 9 insertions, 9 deletions
diff --git a/text-utils/col.c b/text-utils/col.c
index 0823573f4..9b0e23058 100644
--- a/text-utils/col.c
+++ b/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)
diff --git a/text-utils/colcrt.c b/text-utils/colcrt.c
index 62f84251a..c6bba4b50 100644
--- a/text-utils/colcrt.c
+++ b/text-utils/colcrt.c
@@ -266,7 +266,7 @@ int main(int argc, char **argv)
case 'h':
usage(stdout);
default:
- usage(stderr);
+ errtryhelp(EXIT_FAILURE);
}
}
diff --git a/text-utils/colrm.c b/text-utils/colrm.c
index 431eae0d2..9510b7296 100644
--- a/text-utils/colrm.c
+++ b/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)
diff --git a/text-utils/column.c b/text-utils/column.c
index b8d31c989..a642d8432 100644
--- a/text-utils/column.c
+++ b/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;
diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
index 9d26c4e48..125734dfe 100644
--- a/text-utils/hexdump.c
+++ b/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);
}
}
diff --git a/text-utils/line.c b/text-utils/line.c
index 7bee6d2fd..486e5dd31 100644
--- a/text-utils/line.c
+++ b/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);
diff --git a/text-utils/rev.c b/text-utils/rev.c
index 735aaef3d..fe3884389 100644
--- a/text-utils/rev.c
+++ b/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;
diff --git a/text-utils/tailf.c b/text-utils/tailf.c
index c111d02c0..9f175822c 100644
--- a/text-utils/tailf.c
+++ b/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)
diff --git a/text-utils/ul.c b/text-utils/ul.c
index 3fd0b6a85..5421c24a0 100644
--- a/text-utils/ul.c
+++ b/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) {