| Message ID | 20221020100300.69328-1-quentin@isovalent.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7e5eb725cf0a0a8f85e6b96e062bbd0d5d90c94e |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] bpftool: Set binary name to "bpftool" in help and version output | expand |
Hello: This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <andrii@kernel.org>: On Thu, 20 Oct 2022 11:03:00 +0100 you wrote: > 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 > > [...] Here is the summary with links: - [bpf-next] bpftool: Set binary name to "bpftool" in help and version output https://git.kernel.org/bpf/bpf-next/c/7e5eb725cf0a You are awesome, thank you!
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",
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> --- tools/bpf/bpftool/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)