Merge branch 'bpftool-misc-fixes'

Browse source

Quentin Monnet says:

====================
First commit in this series fixes a crash that occurs when incorrect
arguments are passed to bpftool after the `--json` option. It comes from
the usage() function trying to use the JSON writer, although the latter
has not been created yet at that point.

Other patches add destruction of the writer in case the program exits in
usage(), fix error messages handling when an unrecognized option is
encountered, remove a spurious new-line character in an error message.

Last patches are related to the Makefiles. They fix the installation
directory prefix and .PHONY targets.
====================

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

...

This commit is contained in:

Daniel Borkmann 2017-11-30 02:09:30 +01:00

parent a39e17b2d8 ad3cda0644

commit d775a418ac

4 changed files with 32 additions and 18 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

tools/bpf/bpftool/Documentation/Makefile

View file

7

tools/bpf/bpftool/Makefile

View file

36

tools/bpf/bpftool/main.c

View file

5

tools/bpf/bpftool/main.h

View file