diff options
| author | Quentin Monnet <quentin@isovalent.com> | 2022-10-20 12:03:00 +0200 |
|---|---|---|
| committer | Andrii Nakryiko <andrii@kernel.org> | 2022-10-21 23:37:46 +0200 |
| commit | 7e5eb725cf0a0a8f85e6b96e062bbd0d5d90c94e (patch) | |
| tree | 89d916139ff328c3b087f4ced8182bffa7edf7f1 | |
| parent | libbpf: Avoid allocating reg_name with sscanf in parse_usdt_arg() (diff) | |
| download | linux-7e5eb725cf0a0a8f85e6b96e062bbd0d5d90c94e.tar.xz linux-7e5eb725cf0a0a8f85e6b96e062bbd0d5d90c94e.zip | |
bpftool: Set binary name to "bpftool" in help and version output
Commands "bpftool help" or "bpftool version" use argv[0] to display the
name of the binary. While it is a convenient way to retrieve the string,
it does not always produce the most readable output. For example,
because of the way bpftool is currently packaged on Ubuntu (using a
wrapper script), the command displays the absolute path for the binary:
$ bpftool version | head -n 1
/usr/lib/linux-tools/5.15.0-50-generic/bpftool v5.15.60
More generally, there is no apparent reason for keeping the whole path
and exact binary name in this output. If the user wants to understand
what binary is being called, there are other ways to do so. This commit
replaces argv[0] with "bpftool", to simply reflect what the tool is
called. This is aligned on what "ip" or "tc" do, for example.
As an additional benefit, this seems to help with integration with
Meson for packaging [0].
[0] https://github.com/NixOS/nixpkgs/pull/195934
Suggested-by: Vladimír Čunát <vladimir.cunat@nic.cz>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20221020100300.69328-1-quentin@isovalent.com
| -rw-r--r-- | tools/bpf/bpftool/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c index ccd7457f92bf..8bf3615f684f 100644 --- a/tools/bpf/bpftool/main.c +++ b/tools/bpf/bpftool/main.c @@ -450,7 +450,7 @@ int main(int argc, char **argv) json_output = false; show_pinned = false; block_mount = false; - bin_name = argv[0]; + bin_name = "bpftool"; opterr = 0; while ((opt = getopt_long(argc, argv, "VhpjfLmndB:l", |