Make the output for them resemble the output for other programs.
Change-Id: I45dbee32ad403b8fedc2350ac9096ac1a5820cbe
Reviewed-on: https://code.wireshark.org/review/2799
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Splitting %s from \n makes it clearer that the %s's in question take
arguments that already include a newline, and that the subsequent \n
adds a blank line.
Change-Id: I5bac8ca80b42f7de980ad29480042cae3166ff7e
Reviewed-on: https://code.wireshark.org/review/2797
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Have --version print the version number, the copyright information, the
"compiled with" information, the "running on/with" information, and the
compiler information.
Have --help print the version number, a one-line summary of what the
program does, a reference to http://www.wireshark.org for more
information, a Usage: line, and a list of command-line options.
This means programs doing that don't need to include version.h; that's
left up to get_ws_vcs_version_info() to do.
Change-Id: Idac641bc10e4dfd04c9914d379b3a3e0cc5ca8cb
Reviewed-on: https://code.wireshark.org/review/2794
Reviewed-by: Guy Harris <guy@alum.mit.edu>
That way, --help and --version, as well as -h and -v, work.
Change-Id: I095e0dcef9f6181d6fbe6337f9f33e80bc44f11a
Reviewed-on: https://code.wireshark.org/review/2790
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Only print to the standard output, and only give the version
information, if a "print help" command-line option is specified.
Otherwise, leave out the version information, and print to the standard
error.
Leave out the copyright information; it's extra cruft, and
http://www.gnu.org/prep/standards/html_node/_002d_002dhelp.html
doesn't say anything about it (and bash, at least, doesn't print it).
Change-Id: Ic5029ccf96e096453f3bd38383cc2dd355542e8a
Reviewed-on: https://code.wireshark.org/review/2789
Reviewed-by: Guy Harris <guy@alum.mit.edu>
For Wireshark, say "Wireshark", not "wireshark".
For other programs, put "(Wireshark)" after the program name, as per
http://www.gnu.org/prep/standards/html_node/_002d_002dversion.html
("If the program is a subsidiary part of a larger package, mention the
package name in parentheses, like this").
Change-Id: I68558f64cfa6ee4423e42f3d6b120633ef1b2716
Reviewed-on: https://code.wireshark.org/review/2788
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Hopefully, this will mean that somebody doing a set-UID/set-GID/setcap
installation as themselves rather than as root will not "succeed" but
leave dumpcap installed without enhanced privileges, so the underlying
problem in bugs such as bug 10247 will be more obvious.
Change-Id: I34393bc2c9ea4dc59854a08524edb4f65e79730b
Reviewed-on: https://code.wireshark.org/review/2781
Reviewed-by: Guy Harris <guy@alum.mit.edu>
NDPS dissector is also the poster child for not being considered "that naughty" by checkAPIs because most of its proto_tree_add_text calls don't have printf-style arguments (which is what checkAPIs really keys off of)
Fixed both cases and removed about 370 proto_tree_add_text calls from the dissector.
Change-Id: I721678c39d4a0544e5e7212e622c0c2eebfd04f7
Reviewed-on: https://code.wireshark.org/review/2775
Reviewed-by: Evan Huus <eapache@gmail.com>
Append user's flags to our flags instead of prepending them to make
user flags higher priority.
Change-Id: I3ead33ee5fa06a2395d9197a027306ef99a704a2
Reviewed-on: https://code.wireshark.org/review/2722
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
instructions for building QtShark; note alternate cygwin package for
'patch' utility; update example setup script to add Qt bin directory to PATH,
and extract out paths as variables.
Change-Id: Id404b8757dbfd0dc1119b89e01bbe2fa139e2b38
Reviewed-on: https://code.wireshark.org/review/2751
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Fetch header value, only when we need to parse it.
Change-Id: I3c170ef8ab03985c8111a1b84ac1afc87bc8b5ca
Reviewed-on: https://code.wireshark.org/review/2767
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
that a later version may be required; e.g. my a2x (from cygwin64) generates a
developer-guide.xml that needs docbook-xml45.
Change-Id: Iea9d4b45e32157a9317e3fcf6794668e3a810c54
Reviewed-on: https://code.wireshark.org/review/2750
Reviewed-by: Evan Huus <eapache@gmail.com>
(It's not being built by the Ubuntu buildboth when it's building the
Debian package.)
Change-Id: Id7866e13ce72cdda4bb7d5cf0362ba7295ff766b
Reviewed-on: https://code.wireshark.org/review/2772
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This way, if you ask for both setuid and setcap installation of dumpcap,
it will fail, rather than silently (other than a message you might miss)
ignoring the request for setuid installation. See bug 10246.
Also:
if you ask for setuid or setcap installation of dumpcap, but
dumpcap isn't built, it'll let you know that there's nothing to
make setuid/setcap, and fail;
if you ask for setcap installation of dumpcap, but setcap wasn't
found, it'll let you know that it can't install it setcap, and
fail;
so that it won't silently (other than a message you might miss) ignore
those requests, either.
Change-Id: Ibc01593e59fd1cd1be8c68d8cdacbfdca863efa0
Reviewed-on: https://code.wireshark.org/review/2771
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Make the dependencies list indicate that.
Change-Id: I88416e1239130b7661bbd9deccfb289e0b0fd627
Reviewed-on: https://code.wireshark.org/review/2770
Reviewed-by: Guy Harris <guy@alum.mit.edu>
That's the option for newer versions of Sun^WOracle C.
Change-Id: I62c12d5870d84587f81a8789732675021523e9ed
Reviewed-on: https://code.wireshark.org/review/2769
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Apparently the new win8 vm has a *very* low-resolution timer, and the allocators
are indistinguishable at the previous amount of work.
Change-Id: If4e5bb8f85b1f0d39658f54001c88f42ffddfc47
Reviewed-on: https://code.wireshark.org/review/2768
Reviewed-by: Evan Huus <eapache@gmail.com>
This may let us, at least for those compilers, make the default "hidden"
with -xldscope=hidden.
Change-Id: I94e10733c2aba0ff8d77a8bf4f1dc8ecc8b2a47f
Reviewed-on: https://code.wireshark.org/review/2766
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Fedora prohibits it, we don't need it, and it gets in the way some times.
Change-Id: I92cee959f471866ff90efe9f96e4fa519c357dd9
Reviewed-on: https://code.wireshark.org/review/2763
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
We don't need to do the right __attribute__ magic ourselves; GLib does
it for us.
Change-Id: Id31943a8413f0272237be4f868659b5bd5e70626
Reviewed-on: https://code.wireshark.org/review/2758
Reviewed-by: Guy Harris <guy@alum.mit.edu>
I.e., do
if we have 32-bit Cygwin
CYGWIN_PATH=path to it
else if we have 64-bit Cygwin
CYGWIN_PATH=path to it
else
fail
endif
rather than
CYGWIN_PATH=standard path for 32-bit Cygwin
if we don't have 32-bit cygwin and we do have 64-bit Cygwin
CYGWIN_PATH=path to 64-bit cygwin
else
fail
endif
as the latter will fail if we *do* have 32-bit Cygwin.
Change-Id: I42d607a1319263edcc1d6e546b813862b7d33ffa
Reviewed-on: https://code.wireshark.org/review/2756
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Not all AC_WIRESHARK_LDFLAGS_CHECK flags are -Wl,{option} flags, so
don't check for that first. If we want to check for specific compilers
and linkers, we should do that, not for -Wl,{option} support.
Change-Id: Ib9581d4a1573a1ffa2493ce08e6d5845d2601352
Reviewed-on: https://code.wireshark.org/review/2755
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Note why we don't use G_GNUC_INTERNAL, but duplicate what GLib does, and
don't use G_HAVE_GNUC_VISIBILITY to determine whether we can use
__attribute__ ((visibility (...))).
Change-Id: I0b8d40f40d04e821352522320626173806787214
Reviewed-on: https://code.wireshark.org/review/2753
Reviewed-by: Guy Harris <guy@alum.mit.edu>
about forward slashes in the QT5_BASE_PATH if the recommended qmake
command is used; both of these issues will cause annoyingly non-
obvious errors.
Change-Id: I6f9a662969d1fc1887e75e8b0fde3520bbbea416
Reviewed-on: https://code.wireshark.org/review/2749
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
to copy the rquired Qt files into the runtime directory
Qt 5.2 is broken as windeployqt doesn't take the required --release flag
Also fix the passing of GCC_DLL and GPGERROR_DLL into config.pri so
that the Qt build copies the required files instead of the entire
gnutls bin dir twice (the variables expanded to nothing).
Add support for autodetection of Qt 5.3.0 with msvc2013
Change-Id: I1e9c70a5ff5d1fdfdce88ba15d324f1899c8129c
Reviewed-on: https://code.wireshark.org/review/2734
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Do it at the same point at which Wireshark does so. Do some other
things in the same order as well.
Change-Id: I2925366d49d14271ceffa1a938b5e3450337c772
Reviewed-on: https://code.wireshark.org/review/2743
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Make some arguments and structure members gsize, as that's what stored
into them or passed to them. (And move a newly-widened-on-LP64 item, to
avoid extra structure padding.)
Add a cast, which also appears necessary to squelch a warning.
Clean up indentation while we're at it.
Change-Id: I0cc92e7d2904c5af1f3f3d93f51b6ecb3aed464d
Reviewed-on: https://code.wireshark.org/review/2741
Reviewed-by: Guy Harris <guy@alum.mit.edu>
build could fail in wsutil because of missing version.h
Change-Id: If6fdf1080c6de9ca1581bcc126506e78ec03a1d8
Reviewed-on: https://code.wireshark.org/review/2740
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Guy Harris