dns-oarc/dnsperf
1
0
Fork 0
Code Issues Activity

Merging upstream version 2.11.1.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-09 09:07:10 +01:00
parent 666415b758
commit 99896cdeba
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
5 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGES
View file

@ -1,3 +1,12 @@
2023-03-10 Jerry Lundström
Release 2.11.1
Fixed long option argument handling that broke in v2.11.0 and enhanced
long option help text, now includes argument type.
034e893 Long opt
2023-02-08 Jerry Lundström
Release 2.11.0

20
configure vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for dnsperf 2.11.0.
# Generated by GNU Autoconf 2.69 for dnsperf 2.11.1.
#
# Report bugs to <admin@dns-oarc.net>.
#
@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dnsperf'
PACKAGE_TARNAME='dnsperf'
PACKAGE_VERSION='2.11.0'
PACKAGE_STRING='dnsperf 2.11.0'
PACKAGE_VERSION='2.11.1'
PACKAGE_STRING='dnsperf 2.11.1'
PACKAGE_BUGREPORT='admin@dns-oarc.net'
PACKAGE_URL='https://github.com/DNS-OARC/dnsperf/issues'
@ -1362,7 +1362,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures dnsperf 2.11.0 to adapt to many kinds of systems.
\`configure' configures dnsperf 2.11.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1433,7 +1433,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of dnsperf 2.11.0:";;
short | recursive ) echo "Configuration of dnsperf 2.11.1:";;
esac
cat <<\_ACEOF
@ -1572,7 +1572,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
dnsperf configure 2.11.0
dnsperf configure 2.11.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1941,7 +1941,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by dnsperf $as_me 2.11.0, which was
It was created by dnsperf $as_me 2.11.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2804,7 +2804,7 @@ fi
# Define the identity of the package.
PACKAGE='dnsperf'
VERSION='2.11.0'
VERSION='2.11.1'
cat >>confdefs.h <<_ACEOF
@ -14436,7 +14436,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by dnsperf $as_me 2.11.0, which was
This file was extended by dnsperf $as_me 2.11.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -14503,7 +14503,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
dnsperf config.status 2.11.0
dnsperf config.status 2.11.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

2
configure.ac
View file

@ -16,7 +16,7 @@
# limitations under the License.
AC_PREREQ(2.64)
AC_INIT([dnsperf], [2.11.0], [admin@dns-oarc.net], [dnsperf], [https://github.com/DNS-OARC/dnsperf/issues])
AC_INIT([dnsperf], [2.11.1], [admin@dns-oarc.net], [dnsperf], [https://github.com/DNS-OARC/dnsperf/issues])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AC_CONFIG_SRCDIR([src/dnsperf.c])
AC_CONFIG_HEADER([src/config.h])

8
src/opt.c
View file

@ -240,7 +240,7 @@ static int perf_opt_long_parse(char* optarg)
if ((arg = strchr(optarg, '='))) {
arg++;
optlen = arg - optarg;
optlen = strlen(arg);
if (optlen < 1) {
return -1;
}
@ -305,7 +305,11 @@ void perf_long_opt_usage(void)
fprintf(stderr, "Usage: %s ... -O <name>[=<value>] ...\n\nAvailable long options:\n", progname);
long_opt_t* opt = longopts;
while (opt) {
fprintf(stderr, " %s%s: %s", opt->name, opt->type != perf_opt_boolean ? "=<val>" : "", opt->help);
if (opt->type == perf_opt_boolean) {
fprintf(stderr, " %s: %s", opt->name, opt->help);
} else {
fprintf(stderr, " %s=<%s>: %s", opt->name, opt->desc ? opt->desc : "val", opt->help);
}
if (opt->defval) {
fprintf(stderr, " (default: %s)", opt->defval);
}

3
src/test/test1.sh
View file

@ -7,3 +7,6 @@
! ../dnsperf -O suppress=
! ../resperf -O suppress
! ../resperf -O suppress=
# test for broken long opt in v2.11.0
../dnsperf -O suppress=test 2>&1 |grep -q "unknown message type to suppress: test"