diff options
| -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, 13 insertions, 29 deletions
diff --git a/Makefile.in b/Makefile.in index bf1b55b72..c6ce9944d 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.lo \ + tools/gen_test_char.o \ 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,13 +162,9 @@ check: $(TARGET_LIB) etags: etags `find . -name '*.[ch]'` -OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) -tools/gen_test_char.lo: tools/gen_test_char.c +tools/gen_test_char@EXEEXT@: tools/gen_test_char.c $(APR_MKDIR) tools - $(LT_COMPILE) - -tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) - $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@ 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 76ff8cef2..44921b502 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -40,7 +40,9 @@ fi # output is multiline from 1.5 onwards # Require libtool 1.4 or newer -libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` +if test -z "$libtool"; then + libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` +fi 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 58bd7983c..242b01654 100644 --- a/configure.in +++ b/configure.in @@ -196,6 +196,9 @@ 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 9be5ac094..287011b06 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 && mech != APR_LOCK_DEFAULT_TIMED) { + if (mech != APR_LOCK_DEFAULT) { return APR_ENOTIMPL; } diff --git a/test/testfnmatch.c b/test/testfnmatch.c index d52f5a816..1d1c0315d 100644 --- a/test/testfnmatch.c +++ b/test/testfnmatch.c @@ -135,19 +135,6 @@ 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 6f4590541..1a705443b 100644 --- a/time/win32/time.c +++ b/time/win32/time.c @@ -54,6 +54,9 @@ 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. */ @@ -108,7 +111,6 @@ 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); @@ -125,7 +127,6 @@ 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); @@ -157,7 +158,6 @@ 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,7 +187,6 @@ 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); @@ -299,9 +298,6 @@ 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; } |