diff options
author | William A. Rowe Jr <wrowe@apache.org> | 2018-08-30 21:08:28 +0000 |
---|---|---|
committer | William A. Rowe Jr <wrowe@apache.org> | 2018-08-30 21:08:28 +0000 |
commit | 232cd26685361833b19d0dbe5d567abe02e005a7 (patch) | |
tree | bc2ea7f911f1dac0341d29d9ac5ec772a575fc06 | |
parent | 65d947c6caef4f1d8e6eacb23607922d37268e91 (diff) | |
download | apr-232cd26685361833b19d0dbe5d567abe02e005a7.tar.gz |
Revert 1839627, this macro does not result in a usable CC_FOR_BUILD
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1839699 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | Makefile.in | 10 | ||||
-rwxr-xr-x | build/buildcheck.sh | 4 | ||||
-rw-r--r-- | configure.in | 3 | ||||
-rw-r--r-- | locks/netware/proc_mutex.c | 2 | ||||
-rw-r--r-- | test/testfnmatch.c | 13 | ||||
-rw-r--r-- | time/win32/time.c | 10 |
6 files changed, 29 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in index c6ce9944d..bf1b55b72 100644 --- a/Makefile.in +++ b/Makefile.in @@ -53,7 +53,7 @@ LT_VERSION = @LT_VERSION@ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \ build/apr_rules.out tools/gen_test_char@EXEEXT@ \ - tools/gen_test_char.o \ + tools/gen_test_char.o tools/gen_test_char.lo \ include/private/apr_escape_test_char.h DISTCLEAN_TARGETS = config.cache config.log config.status \ include/apr.h include/arch/unix/apr_private.h \ @@ -162,9 +162,13 @@ check: $(TARGET_LIB) etags: etags `find . -name '*.[ch]'` -tools/gen_test_char@EXEEXT@: tools/gen_test_char.c +OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) +tools/gen_test_char.lo: tools/gen_test_char.c $(APR_MKDIR) tools - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@ + $(LT_COMPILE) + +tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) + $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ $(APR_MKDIR) include/private diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 44921b502..76ff8cef2 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -40,9 +40,7 @@ fi # output is multiline from 1.5 onwards # Require libtool 1.4 or newer -if test -z "$libtool"; then - libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` -fi +libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` if test -z "$lt_pversion"; then echo "buildconf: libtool not found." diff --git a/configure.in b/configure.in index 242b01654..58bd7983c 100644 --- a/configure.in +++ b/configure.in @@ -196,9 +196,6 @@ dnl can only be used once within a configure script, so this prevents a dnl preload section from invoking the macro to get compiler info. AC_PROG_CC -dnl Check build CC for gen_test_char compiling which is executed at build time. -AX_PROG_CC_FOR_BUILD - dnl AC_PROG_SED is only avaliable in recent autoconf versions. dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present. ifdef([AC_PROG_SED], diff --git a/locks/netware/proc_mutex.c b/locks/netware/proc_mutex.c index 287011b06..9be5ac094 100644 --- a/locks/netware/proc_mutex.c +++ b/locks/netware/proc_mutex.c @@ -155,7 +155,7 @@ APR_DECLARE(apr_status_t) apr_os_proc_mutex_put_ex(apr_proc_mutex_t **pmutex, if (pool == NULL) { return APR_ENOPOOL; } - if (mech != APR_LOCK_DEFAULT) { + if (mech != APR_LOCK_DEFAULT && mech != APR_LOCK_DEFAULT_TIMED) { return APR_ENOTIMPL; } diff --git a/test/testfnmatch.c b/test/testfnmatch.c index 1d1c0315d..d52f5a816 100644 --- a/test/testfnmatch.c +++ b/test/testfnmatch.c @@ -135,6 +135,19 @@ static struct pattern_s { {"test/*", "test/.this", FAILS_IF(APR_FNM_PERIOD | APR_FNM_PATHNAME)}, {"test/?this", "test/.this", FAILS_IF(APR_FNM_PERIOD | APR_FNM_PATHNAME)}, {"test/[.]this", "test/.this", FAILS_IF(APR_FNM_PERIOD | APR_FNM_PATHNAME)}, + + {"foo[[]bar", "foo[bar", SUCCEEDS}, + {"foo]bar", "foo]bar", SUCCEEDS}, + {"foo[[]]bar", "foo[]bar", SUCCEEDS}, + + {"foo[]bar", "foobar", FAILS}, + {"foo[]]bar", "foo]bar", FAILS}, + {"foo[!]bar", "foobar", SUCCEEDS}, + {"foo[^]bar", "foobar", SUCCEEDS}, + {"foo[!]]bar", "foo]bar", SUCCEEDS}, + {"foo[^]]bar", "foo]bar", SUCCEEDS}, + {"foo[!]]bar", "fooXbar", FAILS}, + {"foo[^]]bar", "fooXbar", FAILS}, {NULL, NULL, 0} }; diff --git a/time/win32/time.c b/time/win32/time.c index 1a705443b..6f4590541 100644 --- a/time/win32/time.c +++ b/time/win32/time.c @@ -54,9 +54,6 @@ static void SystemTimeToAprExpTime(apr_time_exp_t *xt, SYSTEMTIME *tm) static const int dayoffset[12] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; - if (tm->wMonth < 1 || tm->wMonth > 12) - return APR_EBADDATE; - /* Note; the caller is responsible for filling in detailed tm_usec, * tm_gmtoff and tm_isdst data when applicable. */ @@ -111,6 +108,7 @@ APR_DECLARE(apr_status_t) apr_time_exp_gmt(apr_time_exp_t *result, FileTimeToSystemTime(&ft, &st); /* The Platform SDK documents that SYSTEMTIME/FILETIME are * generally UTC, so no timezone info needed + * The time value makes a roundtrip, st cannot be invalid below. */ SystemTimeToAprExpTime(result, &st); result->tm_usec = (apr_int32_t) (input % APR_USEC_PER_SEC); @@ -127,6 +125,7 @@ APR_DECLARE(apr_status_t) apr_time_exp_tz(apr_time_exp_t *result, FileTimeToSystemTime(&ft, &st); /* The Platform SDK documents that SYSTEMTIME/FILETIME are * generally UTC, so we will simply note the offs used. + * The time value makes a roundtrip, st cannot be invalid below. */ SystemTimeToAprExpTime(result, &st); result->tm_usec = (apr_int32_t) (input % APR_USEC_PER_SEC); @@ -158,6 +157,7 @@ APR_DECLARE(apr_status_t) apr_time_exp_lt(apr_time_exp_t *result, * because FileTimeToLocalFileFime is documented that the * resulting time local file time would have DST relative * to the *present* date, not the date converted. + * The time value makes a roundtrip, localst cannot be invalid below. */ SystemTimeToTzSpecificLocalTime(tz, &st, &localst); SystemTimeToAprExpTime(result, &localst); @@ -187,6 +187,7 @@ APR_DECLARE(apr_status_t) apr_time_exp_lt(apr_time_exp_t *result, TIME_ZONE_INFORMATION tz; /* XXX: This code is simply *wrong*. The time converted will always * map to the *now current* status of daylight savings time. + * The time value makes a roundtrip, st cannot be invalid below. */ FileTimeToLocalFileTime(&ft, &localft); @@ -298,6 +299,9 @@ APR_DECLARE(apr_status_t) apr_os_exp_time_put(apr_time_exp_t *aprtime, /* The Platform SDK documents that SYSTEMTIME/FILETIME are * generally UTC, so no timezone info needed */ + if (tm->wMonth < 1 || tm->wMonth > 12) + return APR_EBADDATE; + SystemTimeToAprExpTime(aprtime, *ostime); return APR_SUCCESS; } |