Author: phil
Date: Thu Nov 7 18:05:26 2019
New Revision: 354453
URL: https://svnweb.freebsd.org/changeset/base/354453
Log:
Import libxo 1.3.1
Modified:
vendor/Juniper/libxo/dist/configure.ac
vendor/Juniper/libxo/dist/libxo/libxo.c
vendor/Juniper/libxo/dist/tests/core/test_01.c
Modified: vendor/Juniper/libxo/dist/configure.ac
==============================================================================
--- vendor/Juniper/libxo/dist/configure.ac Thu Nov 7 17:34:44 2019
(r354452)
+++ vendor/Juniper/libxo/dist/configure.ac Thu Nov 7 18:05:26 2019
(r354453)
@@ -12,7 +12,7 @@
#
AC_PREREQ(2.2)
-AC_INIT([libxo], [1.3.0], [p...@juniper.net])
+AC_INIT([libxo], [1.3.1], [p...@juniper.net])
AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
# Support silent build rules. Requires at least automake-1.11.
Modified: vendor/Juniper/libxo/dist/libxo/libxo.c
==============================================================================
--- vendor/Juniper/libxo/dist/libxo/libxo.c Thu Nov 7 17:34:44 2019
(r354452)
+++ vendor/Juniper/libxo/dist/libxo/libxo.c Thu Nov 7 18:05:26 2019
(r354453)
@@ -8104,12 +8104,14 @@ xo_parse_args (int argc, char **argv)
cp = strrchr(xo_program, '/');
if (cp)
xo_program = ++cp;
+ else
+ cp = argv[0]; /* Reset to front of string */
/* GNU tools add an annoying ".test" as the program extension; remove it */
size_t len = strlen(xo_program);
static const char gnu_ext[] = ".test";
if (len >= sizeof(gnu_ext)) {
- cp = &cp[len + 1 - sizeof(gnu_ext)];
+ cp += len + 1 - sizeof(gnu_ext);
if (xo_streq(cp, gnu_ext))
*cp = '\0';
}
Modified: vendor/Juniper/libxo/dist/tests/core/test_01.c
==============================================================================
--- vendor/Juniper/libxo/dist/tests/core/test_01.c Thu Nov 7 17:34:44
2019 (r354452)
+++ vendor/Juniper/libxo/dist/tests/core/test_01.c Thu Nov 7 18:05:26
2019 (r354453)
@@ -50,6 +50,9 @@ main (int argc, char **argv)
{ "sold", "number", "Number of items sold" },
{ XO_INFO_NULL },
};
+
+ char name[] = "test_01.test"; /* test trimming of xo_program */
+ argv[0] = name;
argc = xo_parse_args(argc, argv);
if (argc < 0)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
