diff options
| author | taesub kim <taesub.kim@samsung.com> | 2017-03-23 16:45:32 +0900 |
|---|---|---|
| committer | taesub kim <taesub.kim@samsung.com> | 2017-03-23 16:46:02 +0900 |
| commit | 24b9957402f17c422eeeb3386bf049feeb342e78 (patch) | |
| tree | e260727dc080e910dfea79203509fdc4f32ed852 /tests | |
| parent | 88d478478059f53e6de0d1267c3a1e6b02c4273f (diff) | |
| download | curl-24b9957402f17c422eeeb3386bf049feeb342e78.tar.gz curl-24b9957402f17c422eeeb3386bf049feeb342e78.tar.bz2 curl-24b9957402f17c422eeeb3386bf049feeb342e78.zip | |
Imported Upstream version 7.53.1upstream/7.53.1
Change-Id: Id0454e17b6cb083c803c5497d34964dd8fa0dbc6
Diffstat (limited to 'tests')
203 files changed, 4538 insertions, 861 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 585d0171d..d9dbf0e15 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -99,3 +99,8 @@ checksrc: cd libtest && $(MAKE) checksrc cd unit && $(MAKE) checksrc cd server && $(MAKE) checksrc + +if CURLDEBUG +# for debug builds, we scan the sources on all regular make invokes +all-local: checksrc +endif diff --git a/tests/Makefile.in b/tests/Makefile.in index 13d33abc7..5f9ebcb1e 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -450,9 +450,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign tests/Makefile + $(AUTOMAKE) --gnu tests/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -633,7 +633,8 @@ distdir: $(DISTFILES) done check-am: all-am check: check-recursive -all-am: Makefile +@CURLDEBUG_FALSE@all-local: +all-am: Makefile all-local installdirs: installdirs-recursive installdirs-am: install: install-recursive @@ -736,9 +737,9 @@ uninstall-am: .MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-generic clean-libtool cscopelist-am ctags \ - ctags-am distclean distclean-generic distclean-libtool \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ + check check-am clean clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ @@ -789,6 +790,9 @@ checksrc: cd unit && $(MAKE) checksrc cd server && $(MAKE) checksrc +# for debug builds, we scan the sources on all regular make invokes +@CURLDEBUG_TRUE@all-local: checksrc + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/tests/README b/tests/README index 834be63a5..8f52688c0 100644 --- a/tests/README +++ b/tests/README @@ -4,7 +4,7 @@ | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| -The cURL Test Suite +The curl Test Suite 1. Running 1.1 Requires to run @@ -164,7 +164,7 @@ The cURL Test Suite 1.8 Logs - All logs are generated in the logs/ subdirectory (it is emptied first in the + All logs are generated in the log/ subdirectory (it is emptied first in the runtests.pl script). Use runtests.pl -k to force it to keep the temporary files after the test run since successful runs will clean it up otherwise. diff --git a/tests/data/Makefile.in b/tests/data/Makefile.in index 286e763ad..6bdbd45e5 100644 --- a/tests/data/Makefile.in +++ b/tests/data/Makefile.in @@ -21,7 +21,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -409,7 +409,7 @@ test626 test627 test628 test629 test630 test631 test632 test633 test634 \ test635 test636 test637 test638 test639 test640 test641 \ \ test700 test701 test702 test703 test704 test705 test706 test707 test708 \ -test709 test710 test711 test712 \ +test709 test710 test711 test712 test713 test714 test715 \ \ test800 test801 test802 test803 test804 test805 test806 test807 test808 \ test809 test810 test811 test812 test813 test814 test815 test816 test817 \ @@ -449,14 +449,17 @@ test1112 test1113 test1114 test1115 test1116 test1117 test1118 test1119 \ test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \ test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \ test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \ -test1144 \ +test1144 test1145 test1146 \ test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \ test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \ test1216 test1217 test1218 test1219 \ test1220 test1221 test1222 test1223 test1224 test1225 test1226 test1227 \ test1228 test1229 test1230 test1231 test1232 test1233 test1234 test1235 \ test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \ -test1244 \ +test1244 test1245 test1246 test1247 test1248 test1249 test1250 test1251 \ +test1252 test1253 test1254 test1255 test1256 test1257 test1258 test1259 \ +\ +test1280 test1281 test1282 test1283 test1284 test1285 test1286 \ \ test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \ test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \ @@ -477,7 +480,7 @@ test1408 test1409 test1410 test1411 test1412 test1413 test1414 test1415 \ test1416 test1417 test1418 test1419 test1420 test1421 test1422 test1423 \ test1424 \ test1428 test1429 test1430 test1431 test1432 test1433 test1434 test1435 \ -test1436 test1437 \ +test1436 test1437 test1438 test1439 \ \ test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \ test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \ @@ -485,9 +488,10 @@ test1516 test1517 \ \ test1520 \ \ -test1525 test1526 test1527 test1528 test1529 test1530 test1531 \ +test1525 test1526 test1527 test1528 test1529 test1530 test1531 test1532 \ +test1533 test1534 test1535 test1536 \ \ -test1600 test1601 test1602 test1603 test1604 \ +test1600 test1601 test1602 test1603 test1604 test1605 \ \ test1700 test1701 test1702 \ \ @@ -501,7 +505,7 @@ test2016 test2017 test2018 test2019 test2020 test2021 test2022 test2023 \ test2024 test2025 test2026 test2027 test2028 test2029 test2030 test2031 \ test2032 test2033 test2034 test2035 test2036 test2037 test2038 test2039 \ test2040 test2041 test2042 test2043 test2044 test2045 test2046 test2047 \ -test2048 test2049 test2050 test2051 test2052 +test2048 test2049 test2050 test2051 test2052 test2053 test2054 test2055 # TESTCASES are taken from Makefile.inc @@ -518,9 +522,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Ma exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/data/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/data/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign tests/data/Makefile + $(AUTOMAKE) --gnu tests/data/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 6673bb75b..8251ab9a4 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -80,7 +80,7 @@ test626 test627 test628 test629 test630 test631 test632 test633 test634 \ test635 test636 test637 test638 test639 test640 test641 \ \ test700 test701 test702 test703 test704 test705 test706 test707 test708 \ -test709 test710 test711 test712 \ +test709 test710 test711 test712 test713 test714 test715 \ \ test800 test801 test802 test803 test804 test805 test806 test807 test808 \ test809 test810 test811 test812 test813 test814 test815 test816 test817 \ @@ -120,14 +120,17 @@ test1112 test1113 test1114 test1115 test1116 test1117 test1118 test1119 \ test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \ test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \ test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \ -test1144 \ +test1144 test1145 test1146 \ test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \ test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \ test1216 test1217 test1218 test1219 \ test1220 test1221 test1222 test1223 test1224 test1225 test1226 test1227 \ test1228 test1229 test1230 test1231 test1232 test1233 test1234 test1235 \ test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \ -test1244 \ +test1244 test1245 test1246 test1247 test1248 test1249 test1250 test1251 \ +test1252 test1253 test1254 test1255 test1256 test1257 test1258 test1259 \ +\ +test1280 test1281 test1282 test1283 test1284 test1285 test1286 \ \ test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \ test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \ @@ -148,7 +151,7 @@ test1408 test1409 test1410 test1411 test1412 test1413 test1414 test1415 \ test1416 test1417 test1418 test1419 test1420 test1421 test1422 test1423 \ test1424 \ test1428 test1429 test1430 test1431 test1432 test1433 test1434 test1435 \ -test1436 test1437 \ +test1436 test1437 test1438 test1439 \ \ test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \ test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \ @@ -156,9 +159,10 @@ test1516 test1517 \ \ test1520 \ \ -test1525 test1526 test1527 test1528 test1529 test1530 test1531 \ +test1525 test1526 test1527 test1528 test1529 test1530 test1531 test1532 \ +test1533 test1534 test1535 test1536 \ \ -test1600 test1601 test1602 test1603 test1604 \ +test1600 test1601 test1602 test1603 test1604 test1605 \ \ test1700 test1701 test1702 \ \ @@ -172,4 +176,4 @@ test2016 test2017 test2018 test2019 test2020 test2021 test2022 test2023 \ test2024 test2025 test2026 test2027 test2028 test2029 test2030 test2031 \ test2032 test2033 test2034 test2035 test2036 test2037 test2038 test2039 \ test2040 test2041 test2042 test2043 test2044 test2045 test2046 test2047 \ -test2048 test2049 test2050 test2051 test2052 +test2048 test2049 test2050 test2051 test2052 test2053 test2054 test2055 diff --git a/tests/data/test1 b/tests/data/test1 index b88273514..7c0e1602a 100644 --- a/tests/data/test1 +++ b/tests/data/test1 @@ -8,7 +8,7 @@ HTTP GET # # Server-side -<reply name="1"> +<reply> <data> HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT diff --git a/tests/data/test1021 b/tests/data/test1021 index 3ac9e12e6..2705730ee 100644 --- a/tests/data/test1021 +++ b/tests/data/test1021 @@ -27,7 +27,7 @@ HTTP/1.1 407 Authorization Required to proxy me my dear Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
Content-Length: 28
-And you should ignore this data.
+27 bytes and newline to ign </connect1001> # This is supposed to be returned when the server gets the second diff --git a/tests/data/test1035 b/tests/data/test1035 index 20b434c34..05172ec9a 100644 --- a/tests/data/test1035 +++ b/tests/data/test1035 @@ -32,7 +32,8 @@ http idn </features> <setenv> -CHARSET=ISO8859-1 +CHARSET=UTF-8 +LANG=en_US.UTF-8 </setenv> <name> HTTP over proxy with too long IDN host name diff --git a/tests/data/test1060 b/tests/data/test1060 index e4aea6589..14fc7e53c 100644 --- a/tests/data/test1060 +++ b/tests/data/test1060 @@ -839,7 +839,6 @@ daniel HTTP/1.1 200 OK swsbounce
Server: no -Nice proxy auth sir! </connect1000> <datacheck> diff --git a/tests/data/test1061 b/tests/data/test1061 index a55a27295..c481d39c4 100644 --- a/tests/data/test1061 +++ b/tests/data/test1061 @@ -844,7 +844,6 @@ daniel HTTP/1.1 200 OK swsbounce
Server: no -Nice proxy auth sir! </connect1000> <datacheck> diff --git a/tests/data/test1097 b/tests/data/test1097 index 3b733a55a..7512a2e7d 100644 --- a/tests/data/test1097 +++ b/tests/data/test1097 @@ -15,27 +15,25 @@ HTTP proxy NTLM auth HTTP/1.1 200 We are fine and cool
Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2
Content-Length: 27
- +
This is all fine and dandy </data> +# This is the CONNECT response <connect1001> HTTP/1.1 200 We are fine and cool
Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2
-Content-Length: 27
- -This is all fine and dandy +
</connect1001> <datacheck> HTTP/1.1 200 We are fine and cool
Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2
-Content-Length: 27
- +
HTTP/1.1 200 We are fine and cool
Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2
Content-Length: 27
- +
This is all fine and dandy </datacheck> </reply> diff --git a/tests/data/test1109 b/tests/data/test1109 index c18ae46c6..b68b5a22f 100644 --- a/tests/data/test1109 +++ b/tests/data/test1109 @@ -8,7 +8,7 @@ CURLOPT_URL </info> # Server-side -<reply name="1"> +<reply> <data> HTTP/1.1 200 OK Content-Length: 6 diff --git a/tests/data/test1110 b/tests/data/test1110 index 90ffc41e3..94cfe9105 100644 --- a/tests/data/test1110 +++ b/tests/data/test1110 @@ -9,7 +9,7 @@ CURLOPT_URL </info> # Server-side -<reply name="1"> +<reply> <data> HTTP/1.1 200 OK Content-Length: 6 diff --git a/tests/data/test1111 b/tests/data/test1111 index 77b78f75d..d9db12c7f 100644 --- a/tests/data/test1111 +++ b/tests/data/test1111 @@ -9,7 +9,7 @@ CURLOPT_URL </info> # Server-side -<reply name="1"> +<reply> <data> HTTP/1.1 200 OK Content-Length: 6 diff --git a/tests/data/test1135 b/tests/data/test1135 index 960aade8d..f7c6a7ae2 100644 --- a/tests/data/test1135 +++ b/tests/data/test1135 @@ -58,7 +58,7 @@ CURL_EXTERN CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...); CURL_EXTERN CURLcode curl_easy_perform(CURL *curl); CURL_EXTERN void curl_easy_cleanup(CURL *curl); CURL_EXTERN CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...); -CURL_EXTERN CURL* curl_easy_duphandle(CURL *curl); +CURL_EXTERN CURL *curl_easy_duphandle(CURL *curl); CURL_EXTERN void curl_easy_reset(CURL *curl); CURL_EXTERN CURLcode curl_easy_recv(CURL *curl, void *buffer, size_t buflen, CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer, diff --git a/tests/data/test1139 b/tests/data/test1139 index 30f730c2e..72761c670 100644 --- a/tests/data/test1139 +++ b/tests/data/test1139 @@ -4,6 +4,7 @@ source analysis symbols-in-versions documentation +--manual </keywords> </info> @@ -19,7 +20,7 @@ Verify that all libcurl options have man pages </name> <command type="perl"> -%SRCDIR/manpage-scan.pl %SRCDIR/.. +%SRCDIR/manpage-scan.pl %SRCDIR/.. %PWD/.. </command> </client> diff --git a/tests/data/test1144 b/tests/data/test1144 index 3b4a1b479..3fb90936a 100644 --- a/tests/data/test1144 +++ b/tests/data/test1144 @@ -30,6 +30,10 @@ data to verify </data> +# make sure no data is written +<datacheck nonewline="yes"> + +</datacheck> </reply> # @@ -58,5 +62,8 @@ Host: %HOSTIP:%HTTPPORT Accept: */*
</protocol> +<errorcode> +8 +</errorcode> </verify> </testcase> diff --git a/tests/data/test1145 b/tests/data/test1145 new file mode 100644 index 000000000..287bebfcc --- /dev/null +++ b/tests/data/test1145 @@ -0,0 +1,40 @@ +<testcase> +<info> +<keywords> +FILE +</keywords> +</info> + +<reply> +</reply> + +# Client-side +<client> +<server> +file +</server> +<name> +file:// bad host +</name> +# This command should not succeed since we only accept +# file:/// file://localhost/ file://127.0.0.1/ +<command> +file://bad-host%PWD/log/test1145.txt +</command> +<file name="log/test1145.txt"> +foo + bar +bar + foo +moo +</file> +</client> + +# Verify data after the test has been "shot" +<verify> +# CURLE_URL_MALFORMAT is error code 3 +<errorcode> +3 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test1146 b/tests/data/test1146 new file mode 100644 index 000000000..43f33b793 --- /dev/null +++ b/tests/data/test1146 @@ -0,0 +1,45 @@ +<testcase> +<info> +<keywords> +FILE +--proto-default +</keywords> +</info> + +<reply> +<data> +foo + bar +bar + foo +moo +</data> +</reply> + +# Client-side +<client> +<server> +file +</server> +<name> +--proto-default file +</name> +<command> +--proto-default file %PWD/log/test1146.txt +</command> +<file name="log/test1146.txt"> +foo + bar +bar + foo +moo +</file> +</client> + +# Verify data after the test has been "shot" +<verify> +<errorcode> +0 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test1205 b/tests/data/test1205 index 6d7bb7b03..7e4a882c7 100644 --- a/tests/data/test1205 +++ b/tests/data/test1205 @@ -8,7 +8,7 @@ HTTP GET # # Server-side -<reply name="1205"> +<reply> <data> HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT diff --git a/tests/data/test1230 b/tests/data/test1230 index 3c1d3d448..ca2f6c67d 100644 --- a/tests/data/test1230 +++ b/tests/data/test1230 @@ -23,14 +23,12 @@ mooooooo <connect> HTTP/1.1 200 welcome dear
Date: Thu, 09 Nov 2010 14:49:00 GMT
-Content-Length: 0
</connect> <datacheck> HTTP/1.1 200 welcome dear
Date: Thu, 09 Nov 2010 14:49:00 GMT
-Content-Length: 0
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
diff --git a/tests/data/test1231 b/tests/data/test1231 index 16533a851..61998d1c3 100644 --- a/tests/data/test1231 +++ b/tests/data/test1231 @@ -9,7 +9,7 @@ dotdot removal # # Server-side -<reply name="1"> +<reply> <data> HTTP/1.1 200 OK Content-Length: 6 diff --git a/tests/data/test1232 b/tests/data/test1232 index ead43365f..d0659f126 100644 --- a/tests/data/test1232 +++ b/tests/data/test1232 @@ -11,7 +11,7 @@ dotdot removal # # Server-side -<reply name="1"> +<reply> <data> HTTP/1.1 200 OK Content-Length: 6 diff --git a/tests/data/test1245 b/tests/data/test1245 new file mode 100644 index 000000000..34d6549de --- /dev/null +++ b/tests/data/test1245 @@ -0,0 +1,63 @@ +<testcase> +<info> +<keywords> +FTP +HTTP +HTTP GET +--proto +--proto-redir +followlocation +</keywords> +</info> + +# +# Server-side +<reply> +<data> +HTTP/1.1 301 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 0
+Location: ftp://127.0.0.1:8992/1245
+Connection: close
+
+</data> +</reply> + +# +# Client-side +<client> +<server> +ftp +http +</server> +<name> +--proto deny must override --proto-redir allow +</name> +<command> +--location --proto +all,-ftp --proto-redir -all,+ftp http://%HOSTIP:%HTTPPORT/1245 +</command> +# The data section doesn't do variable substitution, so we must assert this +<precheck> +perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%FTPPORT' ne '8992' );" +</precheck> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /1245 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +# 1 - Protocol ftp not supported or disabled in libcurl +<errorcode> +1 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test1246 b/tests/data/test1246 new file mode 100644 index 000000000..65659292d --- /dev/null +++ b/tests/data/test1246 @@ -0,0 +1,64 @@ +<testcase> +<info> +# verify URL with hostname ending in pound sign +<keywords> +HTTP +HTTP GET +HTTP proxy +</keywords> +</info> + +# +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Content-Length: 6 +Connection: close + +-foo- +</data> + +<data1> +HTTP/1.1 200 OK +Content-Length: 7 +Connection: close + +-cool- +</data1> +</reply> + +# +# Client-side +<client> +<server> +http +</server> + <name> +URL with '#' at end of host name instead of '/' + </name> + <command> +--proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1246:%HTTPPORT#@127.0.0.1/tricked.html no-scheme-url.com.1246:%HTTPPORT#@127.127.127.127/again.html +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET http://test.remote.haxx.se.1246:%HTTPPORT/ HTTP/1.1
+Host: test.remote.haxx.se.1246:%HTTPPORT
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://no-scheme-url.com.1246:%HTTPPORT/ HTTP/1.1
+Host: no-scheme-url.com.1246:%HTTPPORT
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1247 b/tests/data/test1247 new file mode 100644 index 000000000..48c5ccdf4 --- /dev/null +++ b/tests/data/test1247 @@ -0,0 +1,38 @@ +<testcase> +<info> +<keywords> +HTTP +--fail-early +</keywords> +</info> + +# +# Server-side +<reply> +<data> +</data> +</reply> + +# +# Client-side +<client> +<server> +none +</server> + <name> +--fail-early + </name> + <command> +--fail-early h1234://%HOSTIP:%HTTPPORT/1247 http://%HOSTIP:%HTTPPORT/1247 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +# Protocol "h1234" not supported or disabled in libcurl +<errorcode> +1 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test1248 b/tests/data/test1248 new file mode 100644 index 000000000..28e7a8527 --- /dev/null +++ b/tests/data/test1248 @@ -0,0 +1,49 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP proxy +noproxy +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 4 +Content-Type: text/html + +foo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<name> +Access a non-proxied host with using the combination of --proxy option and --noproxy option +</name> +<command> +http://user:secret@%HOSTIP:%HTTPPORT/1248 --proxy http://dummy:%PROXYPORT/ --noproxy %HOSTIP --max-time 5 +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /1248 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic dXNlcjpzZWNyZXQ=
+Accept: */*
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1249 b/tests/data/test1249 new file mode 100644 index 000000000..ab5614068 --- /dev/null +++ b/tests/data/test1249 @@ -0,0 +1,52 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP proxy +NO_PROXY +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 4 +Content-Type: text/html + +foo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<name> +Access a non-proxied host with using the combination of --proxy option and NO_PROXY env var +</name> +<setenv> +NO_PROXY=%HOSTIP +</setenv> +<command> +http://user:secret@%HOSTIP:%HTTPPORT/1249 --proxy http://dummy:%PROXYPORT/ --max-time 5 +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /1249 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic dXNlcjpzZWNyZXQ=
+Accept: */*
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1250 b/tests/data/test1250 new file mode 100644 index 000000000..bf67b7fe7 --- /dev/null +++ b/tests/data/test1250 @@ -0,0 +1,53 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP proxy +http_proxy +noproxy +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 4 +Content-Type: text/html + +foo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<name> +Access a non-proxied host with using the combination of http_proxy env var and --noproxy option +</name> +<setenv> +http_proxy=http://dummy:%PROXYPORT/ +</setenv> +<command> +http://user:secret@%HOSTIP:%HTTPPORT/1250 --noproxy %HOSTIP --max-time 5 +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /1250 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic dXNlcjpzZWNyZXQ=
+Accept: */*
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1251 b/tests/data/test1251 new file mode 100644 index 000000000..f37a685e8 --- /dev/null +++ b/tests/data/test1251 @@ -0,0 +1,54 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP proxy +http_proxy +NO_PROXY +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 4 +Content-Type: text/html + +foo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<name> +Access a non-proxied host with using the combination of http_proxy env var and NO_PROXY env var +</name> +<setenv> +http_proxy=http://dummy:%PROXYPORT/ +NO_PROXY=%HOSTIP +</setenv> +<command> +http://user:secret@%HOSTIP:%HTTPPORT/1251 --max-time 5 +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /1251 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic dXNlcjpzZWNyZXQ=
+Accept: */*
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1252 b/tests/data/test1252 new file mode 100644 index 000000000..cbaef48b7 --- /dev/null +++ b/tests/data/test1252 @@ -0,0 +1,52 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP proxy +NO_PROXY +noproxy +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 4 +Content-Type: text/html + +foo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<name> +Under condition using --proxy, override NO_PROXY by --nproxy and access target URL directly +</name> +<setenv> +NO_PROXY=example.com +</setenv> +<command> +http://%HOSTIP:%HTTPPORT/1252 --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /1252 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1253 b/tests/data/test1253 new file mode 100644 index 000000000..74002994b --- /dev/null +++ b/tests/data/test1253 @@ -0,0 +1,53 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP proxy +NO_PROXY +noproxy +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 4 +Content-Type: text/html + +foo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<name> +Under condition using --proxy, override NO_PROXY by --nproxy and access target URL through proxy +</name> +<setenv> +NO_PROXY=example.com +</setenv> +<command> +http://somewhere.example.com/1253 --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET http://somewhere.example.com/1253 HTTP/1.1
+Host: somewhere.example.com
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1254 b/tests/data/test1254 new file mode 100644 index 000000000..817b9342b --- /dev/null +++ b/tests/data/test1254 @@ -0,0 +1,53 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP proxy +NO_PROXY +noproxy +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 4 +Content-Type: text/html + +foo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<name> +Under condition using --proxy, override NO_PROXY by --nproxy and access target URL through proxy +</name> +<setenv> +NO_PROXY=example.com +</setenv> +<command> +http://somewhere.example.com/1254 --proxy http://%HOSTIP:%HTTPPORT --noproxy "" +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET http://somewhere.example.com/1254 HTTP/1.1
+Host: somewhere.example.com
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1255 b/tests/data/test1255 new file mode 100644 index 000000000..d82310f67 --- /dev/null +++ b/tests/data/test1255 @@ -0,0 +1,53 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP proxy +NO_PROXY +noproxy +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 4 +Content-Type: text/html + +foo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<name> +Under condition using http_proxy, override NO_PROXY by --nproxy and access target URL directly +</name> +<setenv> +http_proxy=http://%HOSTIP:%HTTPPORT +NO_PROXY=example.com +</setenv> +<command> +http://%HOSTIP:%HTTPPORT/1255 --noproxy %HOSTIP +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /1255 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1256 b/tests/data/test1256 new file mode 100644 index 000000000..09c59f4ff --- /dev/null +++ b/tests/data/test1256 @@ -0,0 +1,54 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP proxy +NO_PROXY +noproxy +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 4 +Content-Type: text/html + +foo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<name> +Under condition using http_proxy, override NO_PROXY by --nproxy and access target URL through proxy +</name> +<setenv> +http_proxy=http://%HOSTIP:%HTTPPORT +NO_PROXY=example.com +</setenv> +<command> +http://somewhere.example.com/1256 --noproxy %HOSTIP +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET http://somewhere.example.com/1256 HTTP/1.1
+Host: somewhere.example.com
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1257 b/tests/data/test1257 new file mode 100644 index 000000000..6b7e93736 --- /dev/null +++ b/tests/data/test1257 @@ -0,0 +1,54 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP proxy +NO_PROXY +noproxy +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 4 +Content-Type: text/html + +foo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<name> +Under condition using http_proxy, override NO_PROXY by --nproxy and access target URL through proxy +</name> +<setenv> +http_proxy=http://%HOSTIP:%HTTPPORT +NO_PROXY=example.com +</setenv> +<command> +http://somewhere.example.com/1257 --noproxy "" +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET http://somewhere.example.com/1257 HTTP/1.1
+Host: somewhere.example.com
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1258 b/tests/data/test1258 new file mode 100644 index 000000000..6fa88e16e --- /dev/null +++ b/tests/data/test1258 @@ -0,0 +1,54 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +HTTP replaced headers +cookies +httponly +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.0 200 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Content-Type: text/html
+Set-Cookie: I-am=here; domain=localhost; +
+boo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> + <name> +HTTP, use cookies with localhost + </name> + <command> +http://%HOSTIP:%HTTPPORT/we/want/1258 http://%HOSTIP:%HTTPPORT/we/want?hoge=fuga -b non-existing -H "Host: localhost" +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /we/want/1258 HTTP/1.1
+Host: localhost
+Accept: */*
+
+GET /we/want?hoge=fuga HTTP/1.1
+Host: localhost
+Accept: */*
+Cookie: I-am=here
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1259 b/tests/data/test1259 new file mode 100644 index 000000000..bad4ee25e --- /dev/null +++ b/tests/data/test1259 @@ -0,0 +1,47 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.0 200 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Content-Type: text/html
+Set-Cookie: I-am=here; domain=localhost; +
+boo +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> + <name> +HTTP URL with semicolon in password + </name> + <command> +"http://user:pass;word@%HOSTIP:%HTTPPORT/we/want/1259" +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /we/want/1259 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic dXNlcjpwYXNzO3dvcmQ=
+Accept: */*
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1280 b/tests/data/test1280 new file mode 100644 index 000000000..15c1e2fd1 --- /dev/null +++ b/tests/data/test1280 @@ -0,0 +1,58 @@ +<testcase> +<info> +<keywords> +globbing +</keywords> +</info> + +# +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 6 +Connection: close + +bytes +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> + <name> +simple [a-d] globbing + </name> + <command> +http://%HOSTIP:%HTTPPORT/[a-d]/1280 +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /a/1280 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /b/1280 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /c/1280 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /d/1280 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1281 b/tests/data/test1281 new file mode 100644 index 000000000..661b3c851 --- /dev/null +++ b/tests/data/test1281 @@ -0,0 +1,38 @@ +<testcase> +<info> +<keywords> +URL +</keywords> +</info> + +# +# Server-side +<reply> +<data> +</data> +</reply> + +# Client-side +<client> +<server> +none +</server> +<features> +http +</features> + <name> +reject non-numerical port number in URL + </name> + <command> +http://%HOSTIP:alpha/beta/1281 +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +# 3 == CURLE_URL_MALFORMAT +<errorcode> +3 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test1282 b/tests/data/test1282 new file mode 100644 index 000000000..197356c6b --- /dev/null +++ b/tests/data/test1282 @@ -0,0 +1,45 @@ +<testcase> +<info> +<keywords> +FTP +PASV +RETR +</keywords> +</info> +# Server-side +<reply> +<servercmd> +REPLY PASS 633 XXXXXXXX\x00\x00XXXXXXXX +</servercmd> +</reply> + +# Client-side +<client> +<server> +ftp +</server> +<features> +GSS-API +</features> + <name> +FTP with 633 response before gss initialized + </name> + <command> +ftp://%HOSTIP:%FTPPORT/1282 +</command> + +</client> + +# Verify data after the test has been "shot" +<verify> +<protocol> +USER anonymous
+PASS ftp@example.com
+</protocol> + +# 67 == CURLE_LOGIN_DENIED +<errorcode> +67 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test1283 b/tests/data/test1283 new file mode 100644 index 000000000..ac275e92e --- /dev/null +++ b/tests/data/test1283 @@ -0,0 +1,57 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +globbing +[] range +</keywords> +</info> + +# +# Server-side +<reply> +<data nocheck="yes"> +HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Content-Length: 6
+Connection: close
+
+bytes +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<name> +globbing range with same start and stop +</name> +<command option="no-output"> +http://%HOSTIP:%HTTPPORT/[a-a][1-1][b-b:1][2-2:1]/1283 -o "log/outfile1283_#1#2#3#4.dump" +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /a1b2/1283 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<file name="log/outfile1283_a1b2.dump"> +HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Content-Length: 6
+Connection: close
+
+bytes +</file> +</verify> +</testcase> diff --git a/tests/data/test1284 b/tests/data/test1284 new file mode 100644 index 000000000..8437a4082 --- /dev/null +++ b/tests/data/test1284 @@ -0,0 +1,89 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP POST +HTTP Digest auth +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 401 authentication please swsbounce
+Server: Microsoft-IIS/6.0
+WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 0
+
+</data> +<data1000> +HTTP/1.1 200 A OK
+Server: Microsoft-IIS/6.0
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 3
+
+ok +</data1000> + +<datacheck> +HTTP/1.1 401 authentication please swsbounce
+Server: Microsoft-IIS/6.0
+WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 0
+
+HTTP/1.1 200 A OK
+Server: Microsoft-IIS/6.0
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 3
+
+ok +</datacheck> + +</reply> + +# Client-side +<client> +# +<server> +http +</server> +<features> +!SSPI +crypto +</features> +<name> +HTTP POST --digest with user-specified Content-Length header +</name> +# This test is to ensure 'Content-Length: 0' is sent while negotiating auth +# even when there is a user-specified Content-Length header. +# https://github.com/curl/curl/pull/1242 +<command> +-H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/1284 +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol nonewline="yes"> +POST /1284 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 0
+Content-Type: application/x-www-form-urlencoded
+
+POST /1284 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1284", response="5763079608de439072861a59ac733515"
+Accept: */*
+Content-Length: 11
+Content-Type: application/x-www-form-urlencoded
+
+junkelijunk +</protocol> +</verify> +</testcase> diff --git a/tests/data/test1285 b/tests/data/test1285 new file mode 100644 index 000000000..16c66238a --- /dev/null +++ b/tests/data/test1285 @@ -0,0 +1,97 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP PUT +HTTP Digest auth +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 401 authentication please swsbounce
+Server: Microsoft-IIS/6.0
+WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 0
+
+</data> +<data1000> +HTTP/1.1 200 A OK
+Server: Microsoft-IIS/6.0
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 3
+
+ok +</data1000> + +<datacheck> +HTTP/1.1 401 authentication please swsbounce
+Server: Microsoft-IIS/6.0
+WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 0
+
+HTTP/1.1 200 A OK
+Server: Microsoft-IIS/6.0
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 3
+
+ok +</datacheck> + +</reply> + +# Client-side +<client> +# +<server> +http +</server> +<features> +!SSPI +crypto +</features> +<name> +HTTP PUT --digest with user-specified Content-Length header +</name> +# This test is to ensure 'Content-Length: 0' is sent while negotiating auth +# even when there is a user-specified Content-Length header. +# https://github.com/curl/curl/pull/1242 +<command> +-H "Content-Length: 85" -u auser:apasswd --digest -T log/put1285 http://%HOSTIP:%HTTPPORT/1285 +</command> +<file name="log/put1285"> +This is data we upload with PUT +a second line +line three +four is the number of lines +</file> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +PUT /1285 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 0
+
+PUT /1285 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1285", response="dc185587d5e8391b347eef194c2a3cd6"
+Accept: */*
+Content-Length: 85
+Expect: 100-continue
+
+This is data we upload with PUT +a second line +line three +four is the number of lines +</protocol> +</verify> +</testcase> diff --git a/tests/data/test1286 b/tests/data/test1286 new file mode 100644 index 000000000..41782cb0f --- /dev/null +++ b/tests/data/test1286 @@ -0,0 +1,110 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +HTTP Digest auth +followlocation +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 401 authentication please swsbounce
+Server: Microsoft-IIS/6.0
+WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", qop="auth"
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 0
+
+</data> +<data1000> +HTTP/1.1 302 Thanks for this, but we want to redir you!
+Server: Microsoft-IIS/5.0
+Content-Type: text/html; charset=iso-8859-1
+Location: /12860001
+Content-Length: 0
+
+</data1000> +<data1001> +HTTP/1.1 404 Not Found
+Server: Microsoft-IIS/5.0
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 0
+
+</data1001> + +<datacheck> +HTTP/1.1 401 authentication please swsbounce
+Server: Microsoft-IIS/6.0
+WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", qop="auth"
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 0
+
+HTTP/1.1 302 Thanks for this, but we want to redir you!
+Server: Microsoft-IIS/5.0
+Content-Type: text/html; charset=iso-8859-1
+Location: /12860001
+Content-Length: 0
+
+HTTP/1.1 404 Not Found
+Server: Microsoft-IIS/5.0
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 0
+
+</datacheck> + +</reply> + +# Client-side +<client> +# +<server> +http +</server> +<features> +crypto +</features> +<name> +HTTP GET --digest increasing nonce-count +</name> +# This test is to ensure the nonce-count (nc) increases +# https://github.com/curl/curl/pull/1251 +<command> +-u auser:apasswd --location --digest http://%HOSTIP:%HTTPPORT/1286 +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +# Reorder the fields in 'Authorization: Digest' header. +# Since regular and SSPI digest auth header fields may not have the same order +# or whitespace we homogenize so that both may be tested. Also: +# - Remove the unique value from cnonce if in RFC format +# - Remove the unique value from response if in RFC format +# - Remove quotes from qop="auth" used by SSPI +# The if statement is one line because runtests evaluates one line at a time. +<strippart> +if(s/^(Authorization: Digest )([^\r\n]+)(\r?\n)$//) { $_ = $1 . join(', ', map { s/^(cnonce=)"[a-zA-Z0-9+\/=]+"$/$1REMOVED/; s/^(response=)"[a-f0-9]{32}"$/$1REMOVED/; s/^qop="auth"$/qop=auth/; $_ } sort split(/, */, $2)) . $3; } +</strippart> +<protocol> +GET /1286 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /1286 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest cnonce=REMOVED, nc=00000001, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/1286", username="auser"
+Accept: */*
+
+GET /12860001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest cnonce=REMOVED, nc=00000002, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/12860001", username="auser"
+Accept: */*
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test1301 b/tests/data/test1301 index 4b6fac8b8..8506c0005 100644 --- a/tests/data/test1301 +++ b/tests/data/test1301 @@ -2,7 +2,7 @@ <info> <keywords> unittest -curl_strequal +curl_strcasecompare </keywords> </info> @@ -16,7 +16,7 @@ none unittest </features> <name> -curl_strequal unit tests +curl_strcasecompare unit tests </name> <tool> unit1301 diff --git a/tests/data/test1400 b/tests/data/test1400 index 0ee737021..838fe6387 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -77,6 +77,7 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer + CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1401 b/tests/data/test1401 index 602b09acc..1e2b4a77f 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -96,6 +96,7 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer + CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1402 b/tests/data/test1402 index 0c2199e3b..07c3f491d 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -84,6 +84,7 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer + CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1403 b/tests/data/test1403 index 98f238f9d..18167b4fd 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -79,6 +79,7 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer + CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1404 b/tests/data/test1404 index a159e49d4..6f53ca8cf 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -133,6 +133,7 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer + CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1405 b/tests/data/test1405 index f223954cf..4e8d46d7f 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -93,6 +93,7 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer + CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1406 b/tests/data/test1406 index c7e4cd41c..0ccb08a77 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -88,6 +88,7 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer + CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1407 b/tests/data/test1407 index 8f8cb2aa9..981e4e414 100644 --- a/tests/data/test1407 +++ b/tests/data/test1407 @@ -68,6 +68,7 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer + CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1420 b/tests/data/test1420 index 7a868062e..a20f89868 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -73,6 +73,7 @@ int main(int argc, char *argv[]) them yourself. CURLOPT_WRITEDATA set to a objectpointer + CURLOPT_INTERLEAVEDATA set to a objectpointer CURLOPT_WRITEFUNCTION set to a functionpointer CURLOPT_READDATA set to a objectpointer CURLOPT_READFUNCTION set to a functionpointer diff --git a/tests/data/test1438 b/tests/data/test1438 new file mode 100644 index 000000000..8aaedb71e --- /dev/null +++ b/tests/data/test1438 @@ -0,0 +1,58 @@ +<testcase> +<info> +<keywords> +protocol +--write-out +</keywords> +</info> +# Server-side +<reply> +<data nocheck="yes"> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 9 +Connection: close +Content-Type: text/plain + +testdata +</data> + +</reply> + +# Client-side +<client> +<server> +http +</server> + +<name> +Check if %{scheme} returns HTTP +</name> +<command> +http://%HOSTIP:%HTTPPORT/1438 --write-out '%{scheme}' +</command> +</client> + +# Verify data +<verify> +<stdout nonewline="yes"> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 9 +Connection: close +Content-Type: text/plain + +testdata +HTTP +</stdout> +<protocol> +GET /1438 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<strip> +^User-Agent:.* +</strip> +</verify> +</testcase> diff --git a/tests/data/test1439 b/tests/data/test1439 new file mode 100644 index 000000000..cb906adbc --- /dev/null +++ b/tests/data/test1439 @@ -0,0 +1,58 @@ +<testcase> +<info> +<keywords> +HTTP +--write-out +</keywords> +</info> +# Server-side +<reply> +<data nocheck="yes"> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 9 +Connection: close +Content-Type: text/plain + +testdata +</data> + +</reply> + +# Client-side +<client> +<server> +http +</server> + +<name> +Check if %{scheme} returns HTTP +</name> +<command> +http://%HOSTIP:%HTTPPORT/1439 --write-out '%{http_version}' +</command> +</client> + +# Verify data +<verify> +<stdout nonewline="yes"> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 9 +Connection: close +Content-Type: text/plain + +testdata +1.1 +</stdout> +<protocol> +GET /1439 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<strip> +^User-Agent:.* +</strip> +</verify> +</testcase> diff --git a/tests/data/test1525 b/tests/data/test1525 index 0560d5c1a..595da5ea9 100644 --- a/tests/data/test1525 +++ b/tests/data/test1525 @@ -14,7 +14,6 @@ CURLOPT_PROXYHEADER <reply> <connect> HTTP/1.1 200 OK
-Content-Length: 17
</connect> <data> @@ -26,7 +25,6 @@ ETag: "21025-dc7-39462498" </data> <datacheck> HTTP/1.1 200 OK
-Content-Length: 17
HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT diff --git a/tests/data/test1532 b/tests/data/test1532 new file mode 100644 index 000000000..5b2afc71a --- /dev/null +++ b/tests/data/test1532 @@ -0,0 +1,49 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +</keywords> +</info> + +# +# Server-side +<reply> +<data nocheck="yes"> +HTTP/1.0 200 OK swsclose
+Content-Length: 0
+
+</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +# tool is what to use instead of 'curl' +<tool> +lib1532 +</tool> +<name> +Test CURLINFO_RESPONSE_CODE +</name> +<command> +http://%HOSTIP:%HTTPPORT/1532 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +GET /1532 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<errorcode> +0 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test1533 b/tests/data/test1533 new file mode 100644 index 000000000..56518161c --- /dev/null +++ b/tests/data/test1533 @@ -0,0 +1,74 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP POST +CURLOPT_KEEP_SENDING_ON_ERROR +</keywords> +</info> + +# Server-side +<reply> +<servercmd> +auth_required +</servercmd> +<data nocheck="yes"> +HTTP/1.1 401 Authorization Required
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 15
+ +Early Response +</data> +</reply> +# Client-side +<client> +<server> +http +</server> +<tool> +lib1533 +</tool> +<name> +HTTP with CURLOPT_KEEP_SENDING_ON_ERROR and an early error response +</name> +<command> +http://%HOSTIP:%HTTPPORT/1533 +</command> +</client> + +# Verify data after the test has been "shot" +# TEST_ERR_SUCCESS is errorcode 120 +<verify> +<errorcode> +120 +</errorcode> +<protocol nonewline="yes"> +POST /1533 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
+POST /1533 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
+POST /1533 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
+aaaPOST /1533 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+Content-Length: 3
+Content-Type: application/x-www-form-urlencoded
+
+aaa +</protocol> +</verify> +</testcase> diff --git a/tests/data/test1534 b/tests/data/test1534 new file mode 100644 index 000000000..5ebf57d3a --- /dev/null +++ b/tests/data/test1534 @@ -0,0 +1,50 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +</keywords> +</info> + +# +# Server-side +<reply> +<data nocheck="yes"> +HTTP/1.0 200 OK swsclose
+Last-Modified: Thu, 01 Jan 1970 00:00:30 GMT
+Content-Length: 0
+
+</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +# tool is what to use instead of 'curl' +<tool> +lib1534 +</tool> +<name> +CURLINFO_FILETIME init and reset +</name> +<command> +http://%HOSTIP:%HTTPPORT/1534 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +GET /1534 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<errorcode> +0 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test1535 b/tests/data/test1535 new file mode 100644 index 000000000..226190d05 --- /dev/null +++ b/tests/data/test1535 @@ -0,0 +1,50 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +</keywords> +</info> + +# +# Server-side +<reply> +<data nocheck="yes"> +HTTP/1.0 200 OK swsclose +Last-Modified: Thu, 01 Jan 1970 00:00:30 GMT +Content-Length: 0 + +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +# tool is what to use instead of 'curl' +<tool> +lib1535 +</tool> +<name> +Test CURLINFO_RESPONSE_CODE CURLINFO_PROTOCOL +</name> +<command> +http://%HOSTIP:%HTTPPORT/1535 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +GET /1535 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<errorcode> +0 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test1536 b/tests/data/test1536 new file mode 100644 index 000000000..a6e5a66cb --- /dev/null +++ b/tests/data/test1536 @@ -0,0 +1,50 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +</keywords> +</info> + +# +# Server-side +<reply> +<data nocheck="yes"> +HTTP/1.0 200 OK swsclose +Last-Modified: Thu, 01 Jan 1970 00:00:30 GMT +Content-Length: 0 + +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +# tool is what to use instead of 'curl' +<tool> +lib1536 +</tool> +<name> +Test CURLINFO_RESPONSE_CODE CURLINFO_SCHEME +</name> +<command> +http://%HOSTIP:%HTTPPORT/1536 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +GET /1536 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<errorcode> +0 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test1605 b/tests/data/test1605 new file mode 100644 index 000000000..09ef66942 --- /dev/null +++ b/tests/data/test1605 @@ -0,0 +1,25 @@ +<testcase> +<info> +<keywords> +unittest +</keywords> +</info> + +# +# Client-side +<client> +<server> +none +</server> +<features> +unittest +</features> + <name> +Test negative data lengths as input to libcurl functions + </name> +<tool> +unit1605 +</tool> +</client> + +</testcase> diff --git a/tests/data/test165 b/tests/data/test165 index ddfe1e9dc..6fc0ad2d5 100644 --- a/tests/data/test165 +++ b/tests/data/test165 @@ -31,13 +31,14 @@ http idn </features> <setenv> -CHARSET=ISO8859-1 +CHARSET=UTF-8 +LANG=en_US.UTF-8 </setenv> <name> HTTP over proxy with IDN host name </name> <command> -http://www.åäö.se/page/165 -x %HOSTIP:%HTTPPORT +http://www.åäö.se/page/165 -x %HOSTIP:%HTTPPORT http://www.große.de/page/165 </command> </client> @@ -53,6 +54,11 @@ Host: www.xn--4cab6c.se Accept: */*
Proxy-Connection: Keep-Alive
+GET http://www.xn--groe-xna.de/page/165 HTTP/1.1
+Host: www.xn--groe-xna.de
+Accept: */*
+Proxy-Connection: Keep-Alive
+
</protocol> </verify> </testcase> diff --git a/tests/data/test1800 b/tests/data/test1800 index 96a6c1461..011018400 100644 --- a/tests/data/test1800 +++ b/tests/data/test1800 @@ -48,7 +48,7 @@ Host: %HOSTIP:%HTTPPORT Accept: */*
Connection: Upgrade, HTTP2-Settings
Upgrade: %H2CVER
-HTTP2-Settings: AAMAAABkAAQAAP__
+HTTP2-Settings: AAMAAABkAARAAAAAAAIAAAAA
</protocol> </verify> diff --git a/tests/data/test1801 b/tests/data/test1801 index 16ee12d42..b827ab51e 100644 --- a/tests/data/test1801 +++ b/tests/data/test1801 @@ -58,7 +58,7 @@ Host: %HOSTIP:%HTTPPORT Accept: */*
Connection: Upgrade, HTTP2-Settings
Upgrade: %H2CVER
-HTTP2-Settings: AAMAAABkAAQAAP__
+HTTP2-Settings: AAMAAABkAARAAAAAAAIAAAAA
</protocol> # CURLE_HTTP2: Send failure: Broken pipe diff --git a/tests/data/test199 b/tests/data/test199 index 881ee03a0..72675b535 100644 --- a/tests/data/test199 +++ b/tests/data/test199 @@ -8,7 +8,7 @@ globbing </info> # # Server-side -<reply name="1"> +<reply> <data> HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT diff --git a/tests/data/test2032 b/tests/data/test2032 index f708665e6..12fdbee3c 100644 --- a/tests/data/test2032 +++ b/tests/data/test2032 @@ -5,6 +5,7 @@ HTTP HTTP GET HTTP Basic auth HTTP NTLM auth +flaky </keywords> </info> # Server-side diff --git a/tests/data/test2045 b/tests/data/test2045 index 3190f803b..15647d3e7 100644 --- a/tests/data/test2045 +++ b/tests/data/test2045 @@ -19,7 +19,7 @@ In the broken scenario curl would use HTTP to talk to our FTP server. We handle that by replying with something that both protocols can understand. Our FTP server allows a custom welcome message, so we use that feature to make an HTTP reply that contains an FTP reply (think polyglot). In the case of FTP we expect -curl will return CURLE_FTP_WEIRD_SERVER_REPLY so we test for that return code. +curl will return CURLE_WEIRD_SERVER_REPLY so we test for that return code. --> <servercmd> REPLY welcome HTTP/1.1 200 OK\r\nContent-Length: 21\r\n\r\n500 Weird FTP Reply @@ -46,7 +46,7 @@ Set the default protocol to ftp for a schemeless URL # # Verify data after the test has been "shot" <verify> -# CURLE_FTP_WEIRD_SERVER_REPLY is error code 8 +# CURLE_WEIRD_SERVER_REPLY is error code 8 <errorcode> 8 </errorcode> diff --git a/tests/data/test2046 b/tests/data/test2046 index 133c14d73..0f0eb52c6 100644 --- a/tests/data/test2046 +++ b/tests/data/test2046 @@ -42,6 +42,7 @@ idn </features> <setenv> CHARSET=UTF-8 +LANG=en_US.UTF-8 </setenv> <name> Connection re-use with IDN host name diff --git a/tests/data/test2047 b/tests/data/test2047 index 442297801..f54a30af6 100644 --- a/tests/data/test2047 +++ b/tests/data/test2047 @@ -43,6 +43,7 @@ idn </features> <setenv> CHARSET=UTF-8 +LANG=en_US.UTF-8 </setenv> <name> Connection re-use with IDN host name over HTTP proxy diff --git a/tests/data/test2048 b/tests/data/test2048 index eb2b1df75..787f584ef 100644 --- a/tests/data/test2048 +++ b/tests/data/test2048 @@ -26,7 +26,7 @@ https Server-localhost-sv.pem pinnedpubkey no-match must fail even when insecure </name> <command> ---insecure --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost.nn-sv.pub.der https://localhost:%HTTPSPORT/2034 +--insecure --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost.nn-sv.pub.der https://localhost:%HTTPSPORT/2048 </command> </client> diff --git a/tests/data/test2053 b/tests/data/test2053 new file mode 100644 index 000000000..98e78454e --- /dev/null +++ b/tests/data/test2053 @@ -0,0 +1,56 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +CURLOPT_CONNECT_TO +</keywords> +</info> + +# +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 3 +Content-Type: text/plain + +OK +</data> +</reply> + +# +# Client-side +<client> +<server> +http +</server> + <name> +Connect to specific host with IP addresses + </name> + + <command> +http://10.0.0.1:8081/2053 --connect-to 10.0.0.1:8081:%HOSTIP:%HTTPPORT --next http://[fc00::1]:8082/2053 --connect-to [fc00::1]:8082:%HOSTIP:%HTTPPORT +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /2053 HTTP/1.1
+Host: 10.0.0.1:8081
+Accept: */*
+
+GET /2053 HTTP/1.1
+Host: [fc00::1]:8082
+Accept: */*
+
+</protocol> + +</verify> +</testcase> diff --git a/tests/data/test2054 b/tests/data/test2054 new file mode 100644 index 000000000..2a0b54ebc --- /dev/null +++ b/tests/data/test2054 @@ -0,0 +1,64 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +CURLOPT_CONNECT_TO +</keywords> +</info> + +# +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 3 +Content-Type: text/plain + +OK +</data> +</reply> + +# +# Client-side +<client> +<server> +http +</server> + <name> +Connect to specific host: use the first "connect-to" string that matches + </name> + + <command> +http://%HOSTIP:%HTTPPORT/2054 --connect-to foo::bar: --connect-to :123::456 --next http://www.example.com:%HTTPPORT/2054 --connect-to www.example.com::%HOSTIP: --connect-to www.example.com::foo: --next http://%HOSTIP:8083/2054 --connect-to :8083::%HTTPPORT --connect-to :8083::123 --next http://www.example.com:8084/2054 --connect-to www.example.com:8084:%HOSTIP:%HTTPPORT --connect-to www.example.com:8084:foo:123 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /2054 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /2054 HTTP/1.1
+Host: www.example.com:%HTTPPORT
+Accept: */*
+
+GET /2054 HTTP/1.1
+Host: %HOSTIP:8083
+Accept: */*
+
+GET /2054 HTTP/1.1
+Host: www.example.com:8084
+Accept: */*
+
+</protocol> + +</verify> +</testcase> diff --git a/tests/data/test2055 b/tests/data/test2055 new file mode 100755 index 000000000..cca44942f --- /dev/null +++ b/tests/data/test2055 @@ -0,0 +1,80 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +HTTP CONNECT +HTTP proxy +proxytunnel +CURLOPT_CONNECT_TO +SOCKS5 +</keywords> +</info> + +# +# Server-side +<reply> +<connect> +HTTP/1.1 200 Connection established + +</connect> + +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 3 +Content-Type: text/plain + +OK +</data> + +<datacheck> +HTTP/1.1 200 Connection established + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 3 +Content-Type: text/plain + +OK +</datacheck> +</reply> + +# +# Client-side +<client> +<server> +http +http-proxy +socks5 +</server> + <name> +Connect to specific host via SOCKS proxy and HTTP proxy (switch to tunnel mode automatically) + </name> + + <command> +http://www.example.com.2055/2055 --connect-to ::connect.example.com.2055:%HTTPPORT -x %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<proxy> +CONNECT connect.example.com.2055:%HTTPPORT HTTP/1.1
+Host: connect.example.com.2055:%HTTPPORT
+Proxy-Connection: Keep-Alive
+
+</proxy> +<protocol> +GET /2055 HTTP/1.1
+Host: www.example.com.2055
+Accept: */*
+
+</protocol> + +</verify> +</testcase> diff --git a/tests/data/test209 b/tests/data/test209 index 961eba1a2..3aefac4e4 100644 --- a/tests/data/test209 +++ b/tests/data/test209 @@ -16,6 +16,7 @@ HTTP proxy NTLM auth <connect1001> HTTP/1.1 407 Authorization Required to proxy me my dear
Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+Content-Length: 33
And you should ignore this data. </connect1001> @@ -52,6 +53,7 @@ Nice proxy auth sir! <datacheck> HTTP/1.1 407 Authorization Required to proxy me my dear
Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+Content-Length: 33
HTTP/1.1 200 Things are fine in proxy land
Server: Microsoft-IIS/5.0
diff --git a/tests/data/test213 b/tests/data/test213 index edbb6a6f3..a0de1fad4 100644 --- a/tests/data/test213 +++ b/tests/data/test213 @@ -16,6 +16,7 @@ HTTP proxy NTLM auth <connect1001> HTTP/1.1 407 Authorization Required to proxy me my dear
Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+Content-Length: 33
And you should ignore this data. </connect1001> @@ -52,6 +53,7 @@ Nice proxy auth sir! <datacheck> HTTP/1.1 407 Authorization Required to proxy me my dear
Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+Content-Length: 33
HTTP/1.1 200 Things are fine in proxy land
Server: Microsoft-IIS/5.0
diff --git a/tests/data/test265 b/tests/data/test265 index 1a162b808..a7c456cc3 100644 --- a/tests/data/test265 +++ b/tests/data/test265 @@ -19,7 +19,7 @@ Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4 Content-Length: 1033
And you should ignore this data. -QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQz +QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ </connect1001> # This is supposed to be returned when the server gets the second diff --git a/tests/data/test47 b/tests/data/test47 index 0a6d4da3b..bd779d346 100644 --- a/tests/data/test47 +++ b/tests/data/test47 @@ -8,7 +8,7 @@ HTTP/1.0 </info> # # Server-side -<reply name="47"> +<reply> <data> HTTP/1.0 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT diff --git a/tests/data/test500 b/tests/data/test500 index faf3d7271..56a5c9138 100644 --- a/tests/data/test500 +++ b/tests/data/test500 @@ -7,7 +7,7 @@ HTTP GET </info> # # Server-side -<reply name="1"> +<reply> <data> HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
diff --git a/tests/data/test501 b/tests/data/test501 index 9c9dcc9e3..674bc43b4 100644 --- a/tests/data/test501 +++ b/tests/data/test501 @@ -6,7 +6,7 @@ missing URL </info> # # Server-side -<reply name="1"> +<reply> </reply> # Client-side diff --git a/tests/data/test506 b/tests/data/test506 index f1939fe52..96e690b2f 100644 --- a/tests/data/test506 +++ b/tests/data/test506 @@ -41,10 +41,12 @@ Content-Type: text/html Funny-head: yesyes Set-Cookie: test4=overwritten4; domain=host.foo.com; expires=Sat May 5 GMT 11:56:27 2035 Set-Cookie: test1=overwritten1; domain=foo.com; expires=Thu Mar 3 GMT 11:56:27 2033 +Set-Cookie: test6=six; domain=.www.host.foo.com; expires=Thu Mar 3 GMT 11:56:27 2033 +Set-Cookie: test6=six_more; expires=Thu Mar 3 GMT 11:56:27 2033 Content-Type: text/html -Content-Length: 32 +Content-Length: 73 -run 3: overwrite cookie 1 and 4 +run 3: overwrite cookie 1 and 4, set cookie 6 with and without tailmatch </data3> </reply> @@ -166,24 +168,28 @@ lock: cookie [Pigs in space]: 60 unlock: cookie [Pigs in space]: 61 lock: cookie [Pigs in space]: 62 unlock: cookie [Pigs in space]: 63 -run 3: overwrite cookie 1 and 4 -lock: dns [Pigs in space]: 64 -unlock: dns [Pigs in space]: 65 -CLEANUP +lock: cookie [Pigs in space]: 64 +unlock: cookie [Pigs in space]: 65 lock: cookie [Pigs in space]: 66 unlock: cookie [Pigs in space]: 67 -lock: share [Pigs in space]: 68 -unlock: share [Pigs in space]: 69 +run 3: overwrite cookie 1 and 4, set cookie 6 with and without tailmatch +lock: dns [Pigs in space]: 68 +unlock: dns [Pigs in space]: 69 +CLEANUP +lock: cookie [Pigs in space]: 70 +unlock: cookie [Pigs in space]: 71 +lock: share [Pigs in space]: 72 +unlock: share [Pigs in space]: 73 CURLOPT_SHARE -lock: share [Pigs in space]: 70 -unlock: share [Pigs in space]: 71 +lock: share [Pigs in space]: 74 +unlock: share [Pigs in space]: 75 CURLOPT_COOKIELIST ALL -lock: cookie [Pigs in space]: 72 -unlock: cookie [Pigs in space]: 73 +lock: cookie [Pigs in space]: 76 +unlock: cookie [Pigs in space]: 77 CURLOPT_COOKIEJAR CURLOPT_COOKIELIST RELOAD -lock: cookie [Pigs in space]: 74 -unlock: cookie [Pigs in space]: 75 +lock: cookie [Pigs in space]: 78 +unlock: cookie [Pigs in space]: 79 loaded cookies: ----------------- .host.foo.com TRUE / FALSE 1896263787 injected yes @@ -192,19 +198,21 @@ loaded cookies: .foo.com TRUE / FALSE 1896263787 test3 three .host.foo.com TRUE / FALSE 2061978987 test4 overwritten4 .host.foo.com TRUE / FALSE 1896263787 test5 five + .www.host.foo.com TRUE / FALSE 1993463787 test6 six + www.host.foo.com FALSE / FALSE 1993463787 test6 six_more ----------------- try SHARE_CLEANUP... -lock: share [Pigs in space]: 76 -unlock: share [Pigs in space]: 77 -SHARE_CLEANUP failed, correct -CLEANUP -lock: cookie [Pigs in space]: 78 -unlock: cookie [Pigs in space]: 79 lock: share [Pigs in space]: 80 unlock: share [Pigs in space]: 81 +SHARE_CLEANUP failed, correct +CLEANUP +lock: cookie [Pigs in space]: 82 +unlock: cookie [Pigs in space]: 83 +lock: share [Pigs in space]: 84 +unlock: share [Pigs in space]: 85 SHARE_CLEANUP -lock: share [Pigs in space]: 82 -unlock: share [Pigs in space]: 83 +lock: share [Pigs in space]: 86 +unlock: share [Pigs in space]: 87 GLOBAL_CLEANUP </stdout> <stderr> @@ -221,6 +229,8 @@ http://%HOSTIP:%HTTPPORT/506 .foo.com TRUE / FALSE 1896263787 test3 three .host.foo.com TRUE / FALSE 2061978987 test4 overwritten4 .host.foo.com TRUE / FALSE 1896263787 test5 five +.www.host.foo.com TRUE / FALSE 1993463787 test6 six +www.host.foo.com FALSE / FALSE 1993463787 test6 six_more </file> </verify> </testcase> diff --git a/tests/data/test517 b/tests/data/test517 index c81a45e0a..513634f15 100644 --- a/tests/data/test517 +++ b/tests/data/test517 @@ -116,6 +116,12 @@ nothing 81: 20111323 12:34:56 => -1 82: 20110623 12:34:79 => -1 83: Wed, 31 Dec 2008 23:59:60 GMT => 1230768000 +84: 20110623 12:3 => 1308830580 +85: 20110623 1:3 => 1308790980 +86: 20110623 1:30 => 1308792600 +87: 20110623 12:12:3 => 1308831123 +88: 20110623 01:12:3 => 1308791523 +89: 20110623 01:99:30 => -1 </stdout> # This test case previously tested an overflow case ("2094 Nov 6 => diff --git a/tests/data/test552 b/tests/data/test552 Binary files differindex b44ca3455..5d1478bd5 100644 --- a/tests/data/test552 +++ b/tests/data/test552 diff --git a/tests/data/test556 b/tests/data/test556 index 55c7c91c3..549b9a4a2 100644 --- a/tests/data/test556 +++ b/tests/data/test556 @@ -8,7 +8,7 @@ HTTP GET <reply> <data> -HTTP/1.1 200 OK
+HTTP/1.1 200 OK swsclose
Server: test-server/fake
Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
Content-Length: 6
diff --git a/tests/data/test557 b/tests/data/test557 index 8d0944a1e..ad9350f6e 100644 --- a/tests/data/test557 +++ b/tests/data/test557 @@ -40,6 +40,7 @@ All curl_mprintf() unsigned long tests OK! All curl_mprintf() signed long tests OK! All curl_mprintf() curl_off_t tests OK! All curl_mprintf() strings tests OK! +All float strings tests OK! </stdout> </verify> diff --git a/tests/data/test558 b/tests/data/test558 index a1ac7d475..27457ff41 100644 --- a/tests/data/test558 +++ b/tests/data/test558 @@ -41,8 +41,8 @@ FD connect.c: sclose() MEM lib558.c: malloc() MEM lib558.c: free() MEM escape.c: malloc() -MEM escape.c: realloc() -MEM escape.c: realloc() +MEM strdup.c: realloc() +MEM strdup.c: realloc() MEM escape.c: free() </file> <stripfile> diff --git a/tests/data/test578 b/tests/data/test578 index e4ee4ac17..abbe49a3c 100644 --- a/tests/data/test578 +++ b/tests/data/test578 @@ -7,7 +7,7 @@ HTTP POST </info> # # Server-side -<reply name="1"> +<reply> <data> HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
diff --git a/tests/data/test59 b/tests/data/test59 index 1924650f5..9c9601778 100644 --- a/tests/data/test59 +++ b/tests/data/test59 @@ -7,7 +7,7 @@ HTTP GET </info> # # Server-side -<reply name="1"> +<reply> <data> HTTP/1.0 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT diff --git a/tests/data/test700 b/tests/data/test700 index ce6f894fd..ac63fa59a 100644 --- a/tests/data/test700 +++ b/tests/data/test700 @@ -9,7 +9,7 @@ SOCKS4 # # Server-side -<reply name="1"> +<reply> <data> HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT diff --git a/tests/data/test701 b/tests/data/test701 index 014aca249..799597f38 100644 --- a/tests/data/test701 +++ b/tests/data/test701 @@ -9,7 +9,7 @@ SOCKS5 # # Server-side -<reply name="1"> +<reply> <data> HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT diff --git a/tests/data/test708 b/tests/data/test708 index 716d9aec0..e8bffc365 100644 --- a/tests/data/test708 +++ b/tests/data/test708 @@ -9,7 +9,7 @@ SOCKS4 # # Server-side -<reply name="1"> +<reply> <data> HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT diff --git a/tests/data/test71 b/tests/data/test71 index b71f969e7..341a0033f 100644 --- a/tests/data/test71 +++ b/tests/data/test71 @@ -31,6 +31,7 @@ HTTP and -F upload in config file -F name=daniel -F tool=curl -F file=@log/test71.txt +user-agent = "" </stdin> <command> http://%HOSTIP:%HTTPPORT/we/want/71 -K - @@ -46,11 +47,10 @@ bar # Verify data after the test has been "shot" <verify> <strip> -^(User-Agent:|Content-Type: multipart/form-data;|------------).* +^(Content-Type: multipart/form-data;|------------).* </strip> <protocol> POST /we/want/71 HTTP/1.1
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
Host: %HOSTIP:%HTTPPORT
Accept: */*
Content-Length: 408
diff --git a/tests/data/test712 b/tests/data/test712 index c62e9f2c5..252c9ef0e 100644 --- a/tests/data/test712 +++ b/tests/data/test712 @@ -6,7 +6,6 @@ FTP PASV RETR SOCKS5 -all_proxy </keywords> </info> # diff --git a/tests/data/test713 b/tests/data/test713 new file mode 100755 index 000000000..bb79994f5 --- /dev/null +++ b/tests/data/test713 @@ -0,0 +1,49 @@ +<testcase> +#based off test 712 +<info> +<keywords> +FTP +PASV +RETR +SOCKS5 +CURLOPT_CONNECT_TO +</keywords> +</info> +# +# Server-side +<reply> +<data> +silly content +</data> +</reply> + +# +# Client-side +<client> +<server> +ftp +socks5 +</server> + <name> +FTP fetch with --proxy set to socks5:// and with --connect-to + </name> + <command> +ftp://ftp.example.com/713 --connect-to ::%HOSTIP:%FTPPORT --proxy socks5://%HOSTIP:%SOCKSPORT +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE 713
+RETR 713
+QUIT
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test714 b/tests/data/test714 new file mode 100755 index 000000000..9d1f0a96e --- /dev/null +++ b/tests/data/test714 @@ -0,0 +1,64 @@ +<testcase> +#based off test 712 +<info> +<keywords> +FTP +PASV +RETR +HTTP +HTTP CONNECT +proxytunnel +CURLOPT_CONNECT_TO +</keywords> +</info> +# +# Server-side +<reply> +<connect> +HTTP/1.1 200 Connection established + +</connect> + +<data nocheck="yes"> +silly content +</data> + +<datacheck> +HTTP/1.1 200 Connection established + +HTTP/1.1 200 Connection established + +silly content +</datacheck> +</reply> + +# +# Client-side +<client> +<server> +ftp +http-proxy +</server> + <name> +FTP fetch with --proxy set to http:// and with --connect-to + </name> + <command> +ftp://ftp.example.com.714/714 --connect-to ::connect.example.com.714:%FTPPORT --proxytunnel --proxy http://%HOSTIP:%PROXYPORT +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE 714
+RETR 714
+QUIT
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test715 b/tests/data/test715 new file mode 100755 index 000000000..ffcfc7e3e --- /dev/null +++ b/tests/data/test715 @@ -0,0 +1,66 @@ +<testcase> +#based off test 712 +<info> +<keywords> +FTP +PASV +RETR +HTTP +HTTP CONNECT +proxytunnel +SOCKS5 +CURLOPT_CONNECT_TO +</keywords> +</info> +# +# Server-side +<reply> +<connect> +HTTP/1.1 200 Connection established + +</connect> + +<data nocheck="yes"> +silly content +</data> + +<datacheck> +HTTP/1.1 200 Connection established + +HTTP/1.1 200 Connection established + +silly content +</datacheck> +</reply> + +# +# Client-side +<client> +<server> +ftp +http-proxy +socks5 +</server> + <name> +FTP fetch with --preproxy, --proxy and --connect-to + </name> + <command> +ftp://ftp.example.com.715/715 --connect-to ::connect.example.com.715:%FTPPORT --proxytunnel --proxy %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE 715
+RETR 715
+QUIT
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test864 b/tests/data/test864 index 9ad98f7ee..ebdebd671 100644 --- a/tests/data/test864 +++ b/tests/data/test864 @@ -11,7 +11,7 @@ APOP <reply> <servercmd> CAPA APOP -REPLY welcome +OK cURL POP3 server ready to serve <1972.987654321\@curl> +REPLY welcome +OK curl POP3 server ready to serve <1972.987654321\@curl> </servercmd> <data> From: me@somewhere
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index 01a7df865..081298f1b 100755 --- a/tests/ftpserver.pl +++ b/tests/ftpserver.pl @@ -609,7 +609,7 @@ sub protocolsetup { ' / __| | | | |_) | | '."\r\n", ' | (__| |_| | _ {| |___ '."\r\n", ' \___|\___/|_| \_\_____|'."\r\n", - '+OK cURL POP3 server ready to serve '."\r\n") + '+OK curl POP3 server ready to serve '."\r\n") ); } elsif($proto eq 'imap') { @@ -643,7 +643,7 @@ sub protocolsetup { ' / __| | | | |_) | | '."\r\n", ' | (__| |_| | _ {| |___ '."\r\n", ' \___|\___/|_| \_\_____|'."\r\n", - '* OK cURL IMAP server ready to serve'."\r\n") + '* OK curl IMAP server ready to serve'."\r\n") ); } elsif($proto eq 'smtp') { @@ -1057,7 +1057,7 @@ sub EXPN_smtp { } sub QUIT_smtp { - sendcontrol "221 cURL $smtp_type server signing off\r\n"; + sendcontrol "221 curl $smtp_type server signing off\r\n"; return 0; } @@ -1605,7 +1605,7 @@ sub NOOP_imap { } sub LOGOUT_imap { - sendcontrol "* BYE cURL IMAP server signing off\r\n"; + sendcontrol "* BYE curl IMAP server signing off\r\n"; sendcontrol "$cmdid OK LOGOUT completed\r\n"; return 0; @@ -1941,7 +1941,7 @@ sub QUIT_pop3 { @deleted = (); } - sendcontrol "+OK cURL POP3 server signing off\r\n"; + sendcontrol "+OK curl POP3 server signing off\r\n"; return 0; } diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index cc9d7e1f8..a7449c374 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -43,6 +43,10 @@ if(NOT WIN32) # library at (tests)/libtest/.libs/libhostname.so set_target_properties(hostname PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/.libs) + if(HIDES_CURL_PRIVATE_SYMBOLS) + set_property(TARGET hostname APPEND PROPERTY COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS") + set_property(TARGET hostname APPEND PROPERTY COMPILE_FLAGS ${CURL_CFLAG_SYMBOLS_HIDE}) + endif() endif() # # files used only in some libcurl test programs diff --git a/tests/libtest/Makefile.in b/tests/libtest/Makefile.in index eec09b82c..4820f21a1 100644 --- a/tests/libtest/Makefile.in +++ b/tests/libtest/Makefile.in @@ -124,7 +124,9 @@ noinst_PROGRAMS = chkhostname$(EXEEXT) libauthretry$(EXEEXT) \ lib1515$(EXEEXT) lib1517$(EXEEXT) lib1520$(EXEEXT) \ lib1525$(EXEEXT) lib1526$(EXEEXT) lib1527$(EXEEXT) \ lib1528$(EXEEXT) lib1529$(EXEEXT) lib1530$(EXEEXT) \ - lib1531$(EXEEXT) lib1900$(EXEEXT) lib2033$(EXEEXT) + lib1531$(EXEEXT) lib1532$(EXEEXT) lib1533$(EXEEXT) \ + lib1534$(EXEEXT) lib1535$(EXEEXT) lib1536$(EXEEXT) \ + lib1900$(EXEEXT) lib2033$(EXEEXT) @USE_CPPFLAG_CURL_STATICLIB_TRUE@am__append_1 = -DCURL_STATICLIB @CURL_LT_SHLIB_USE_NO_UNDEFINED_TRUE@am__append_2 = -no-undefined @CURL_LT_SHLIB_USE_MIMPURE_TEXT_TRUE@am__append_3 = -mimpure-text @@ -348,473 +350,508 @@ am_lib1531_OBJECTS = lib1531-lib1531.$(OBJEXT) $(am__objects_68) \ $(am__objects_69) $(am__objects_70) lib1531_OBJECTS = $(am_lib1531_OBJECTS) lib1531_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_71 = lib1900-first.$(OBJEXT) -am__objects_72 = lib1900-testutil.$(OBJEXT) -am__objects_73 = ../../lib/lib1900-warnless.$(OBJEXT) -am_lib1900_OBJECTS = lib1900-lib1900.$(OBJEXT) $(am__objects_71) \ +am__objects_71 = lib1532-first.$(OBJEXT) +am__objects_72 = lib1532-testutil.$(OBJEXT) +am__objects_73 = ../../lib/lib1532-warnless.$(OBJEXT) +am_lib1532_OBJECTS = lib1532-lib1532.$(OBJEXT) $(am__objects_71) \ $(am__objects_72) $(am__objects_73) +lib1532_OBJECTS = $(am_lib1532_OBJECTS) +lib1532_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__objects_74 = lib1533-first.$(OBJEXT) +am__objects_75 = lib1533-testutil.$(OBJEXT) +am__objects_76 = ../../lib/lib1533-warnless.$(OBJEXT) +am_lib1533_OBJECTS = lib1533-lib1533.$(OBJEXT) $(am__objects_74) \ + $(am__objects_75) $(am__objects_76) +lib1533_OBJECTS = $(am_lib1533_OBJECTS) +lib1533_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__objects_77 = lib1534-first.$(OBJEXT) +am__objects_78 = lib1534-testutil.$(OBJEXT) +am__objects_79 = ../../lib/lib1534-warnless.$(OBJEXT) +am_lib1534_OBJECTS = lib1534-lib1534.$(OBJEXT) $(am__objects_77) \ + $(am__objects_78) $(am__objects_79) +lib1534_OBJECTS = $(am_lib1534_OBJECTS) +lib1534_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__objects_80 = lib1535-first.$(OBJEXT) +am__objects_81 = lib1535-testutil.$(OBJEXT) +am__objects_82 = ../../lib/lib1535-warnless.$(OBJEXT) +am_lib1535_OBJECTS = lib1535-lib1535.$(OBJEXT) $(am__objects_80) \ + $(am__objects_81) $(am__objects_82) +lib1535_OBJECTS = $(am_lib1535_OBJECTS) +lib1535_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__objects_83 = lib1536-first.$(OBJEXT) +am__objects_84 = lib1536-testutil.$(OBJEXT) +am__objects_85 = ../../lib/lib1536-warnless.$(OBJEXT) +am_lib1536_OBJECTS = lib1536-lib1536.$(OBJEXT) $(am__objects_83) \ + $(am__objects_84) $(am__objects_85) +lib1536_OBJECTS = $(am_lib1536_OBJECTS) +lib1536_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__objects_86 = lib1900-first.$(OBJEXT) +am__objects_87 = lib1900-testutil.$(OBJEXT) +am__objects_88 = ../../lib/lib1900-warnless.$(OBJEXT) +am_lib1900_OBJECTS = lib1900-lib1900.$(OBJEXT) $(am__objects_86) \ + $(am__objects_87) $(am__objects_88) lib1900_OBJECTS = $(am_lib1900_OBJECTS) lib1900_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_74 = lib2033-first.$(OBJEXT) -am__objects_75 = lib2033-testutil.$(OBJEXT) -am__objects_76 = ../../lib/lib2033-warnless.$(OBJEXT) +am__objects_89 = lib2033-first.$(OBJEXT) +am__objects_90 = lib2033-testutil.$(OBJEXT) +am__objects_91 = ../../lib/lib2033-warnless.$(OBJEXT) am_lib2033_OBJECTS = lib2033-libntlmconnect.$(OBJEXT) \ - $(am__objects_74) $(am__objects_75) $(am__objects_76) + $(am__objects_89) $(am__objects_90) $(am__objects_91) lib2033_OBJECTS = $(am_lib2033_OBJECTS) lib2033_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_77 = lib500-first.$(OBJEXT) -am__objects_78 = lib500-testutil.$(OBJEXT) -am__objects_79 = lib500-testtrace.$(OBJEXT) -am_lib500_OBJECTS = lib500-lib500.$(OBJEXT) $(am__objects_77) \ - $(am__objects_78) $(am__objects_79) +am__objects_92 = lib500-first.$(OBJEXT) +am__objects_93 = lib500-testutil.$(OBJEXT) +am__objects_94 = lib500-testtrace.$(OBJEXT) +am_lib500_OBJECTS = lib500-lib500.$(OBJEXT) $(am__objects_92) \ + $(am__objects_93) $(am__objects_94) lib500_OBJECTS = $(am_lib500_OBJECTS) lib500_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_80 = lib501-first.$(OBJEXT) -am_lib501_OBJECTS = lib501-lib501.$(OBJEXT) $(am__objects_80) +am__objects_95 = lib501-first.$(OBJEXT) +am_lib501_OBJECTS = lib501-lib501.$(OBJEXT) $(am__objects_95) lib501_OBJECTS = $(am_lib501_OBJECTS) lib501_LDADD = $(LDADD) lib501_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_81 = lib502-first.$(OBJEXT) -am__objects_82 = lib502-testutil.$(OBJEXT) -am__objects_83 = ../../lib/lib502-warnless.$(OBJEXT) -am_lib502_OBJECTS = lib502-lib502.$(OBJEXT) $(am__objects_81) \ - $(am__objects_82) $(am__objects_83) +am__objects_96 = lib502-first.$(OBJEXT) +am__objects_97 = lib502-testutil.$(OBJEXT) +am__objects_98 = ../../lib/lib502-warnless.$(OBJEXT) +am_lib502_OBJECTS = lib502-lib502.$(OBJEXT) $(am__objects_96) \ + $(am__objects_97) $(am__objects_98) lib502_OBJECTS = $(am_lib502_OBJECTS) lib502_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_84 = lib503-first.$(OBJEXT) -am__objects_85 = lib503-testutil.$(OBJEXT) -am__objects_86 = ../../lib/lib503-warnless.$(OBJEXT) -am_lib503_OBJECTS = lib503-lib503.$(OBJEXT) $(am__objects_84) \ - $(am__objects_85) $(am__objects_86) +am__objects_99 = lib503-first.$(OBJEXT) +am__objects_100 = lib503-testutil.$(OBJEXT) +am__objects_101 = ../../lib/lib503-warnless.$(OBJEXT) +am_lib503_OBJECTS = lib503-lib503.$(OBJEXT) $(am__objects_99) \ + $(am__objects_100) $(am__objects_101) lib503_OBJECTS = $(am_lib503_OBJECTS) lib503_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_87 = lib504-first.$(OBJEXT) -am__objects_88 = lib504-testutil.$(OBJEXT) -am__objects_89 = ../../lib/lib504-warnless.$(OBJEXT) -am_lib504_OBJECTS = lib504-lib504.$(OBJEXT) $(am__objects_87) \ - $(am__objects_88) $(am__objects_89) +am__objects_102 = lib504-first.$(OBJEXT) +am__objects_103 = lib504-testutil.$(OBJEXT) +am__objects_104 = ../../lib/lib504-warnless.$(OBJEXT) +am_lib504_OBJECTS = lib504-lib504.$(OBJEXT) $(am__objects_102) \ + $(am__objects_103) $(am__objects_104) lib504_OBJECTS = $(am_lib504_OBJECTS) lib504_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_90 = lib505-first.$(OBJEXT) -am_lib505_OBJECTS = lib505-lib505.$(OBJEXT) $(am__objects_90) +am__objects_105 = lib505-first.$(OBJEXT) +am_lib505_OBJECTS = lib505-lib505.$(OBJEXT) $(am__objects_105) lib505_OBJECTS = $(am_lib505_OBJECTS) lib505_LDADD = $(LDADD) lib505_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_91 = lib506-first.$(OBJEXT) -am_lib506_OBJECTS = lib506-lib506.$(OBJEXT) $(am__objects_91) +am__objects_106 = lib506-first.$(OBJEXT) +am_lib506_OBJECTS = lib506-lib506.$(OBJEXT) $(am__objects_106) lib506_OBJECTS = $(am_lib506_OBJECTS) lib506_LDADD = $(LDADD) lib506_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_92 = lib507-first.$(OBJEXT) -am__objects_93 = lib507-testutil.$(OBJEXT) -am__objects_94 = ../../lib/lib507-warnless.$(OBJEXT) -am_lib507_OBJECTS = lib507-lib507.$(OBJEXT) $(am__objects_92) \ - $(am__objects_93) $(am__objects_94) +am__objects_107 = lib507-first.$(OBJEXT) +am__objects_108 = lib507-testutil.$(OBJEXT) +am__objects_109 = ../../lib/lib507-warnless.$(OBJEXT) +am_lib507_OBJECTS = lib507-lib507.$(OBJEXT) $(am__objects_107) \ + $(am__objects_108) $(am__objects_109) lib507_OBJECTS = $(am_lib507_OBJECTS) lib507_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_95 = lib508-first.$(OBJEXT) -am_lib508_OBJECTS = lib508-lib508.$(OBJEXT) $(am__objects_95) +am__objects_110 = lib508-first.$(OBJEXT) +am_lib508_OBJECTS = lib508-lib508.$(OBJEXT) $(am__objects_110) lib508_OBJECTS = $(am_lib508_OBJECTS) lib508_LDADD = $(LDADD) lib508_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_96 = lib509-first.$(OBJEXT) -am_lib509_OBJECTS = lib509-lib509.$(OBJEXT) $(am__objects_96) +am__objects_111 = lib509-first.$(OBJEXT) +am_lib509_OBJECTS = lib509-lib509.$(OBJEXT) $(am__objects_111) lib509_OBJECTS = $(am_lib509_OBJECTS) lib509_LDADD = $(LDADD) lib509_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_97 = lib510-first.$(OBJEXT) -am_lib510_OBJECTS = lib510-lib510.$(OBJEXT) $(am__objects_97) +am__objects_112 = lib510-first.$(OBJEXT) +am_lib510_OBJECTS = lib510-lib510.$(OBJEXT) $(am__objects_112) lib510_OBJECTS = $(am_lib510_OBJECTS) lib510_LDADD = $(LDADD) lib510_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_98 = lib511-first.$(OBJEXT) -am_lib511_OBJECTS = lib511-lib511.$(OBJEXT) $(am__objects_98) +am__objects_113 = lib511-first.$(OBJEXT) +am_lib511_OBJECTS = lib511-lib511.$(OBJEXT) $(am__objects_113) lib511_OBJECTS = $(am_lib511_OBJECTS) lib511_LDADD = $(LDADD) lib511_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_99 = lib512-first.$(OBJEXT) -am_lib512_OBJECTS = lib512-lib512.$(OBJEXT) $(am__objects_99) +am__objects_114 = lib512-first.$(OBJEXT) +am_lib512_OBJECTS = lib512-lib512.$(OBJEXT) $(am__objects_114) lib512_OBJECTS = $(am_lib512_OBJECTS) lib512_LDADD = $(LDADD) lib512_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_100 = lib513-first.$(OBJEXT) -am_lib513_OBJECTS = lib513-lib513.$(OBJEXT) $(am__objects_100) +am__objects_115 = lib513-first.$(OBJEXT) +am_lib513_OBJECTS = lib513-lib513.$(OBJEXT) $(am__objects_115) lib513_OBJECTS = $(am_lib513_OBJECTS) lib513_LDADD = $(LDADD) lib513_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_101 = lib514-first.$(OBJEXT) -am_lib514_OBJECTS = lib514-lib514.$(OBJEXT) $(am__objects_101) +am__objects_116 = lib514-first.$(OBJEXT) +am_lib514_OBJECTS = lib514-lib514.$(OBJEXT) $(am__objects_116) lib514_OBJECTS = $(am_lib514_OBJECTS) lib514_LDADD = $(LDADD) lib514_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_102 = lib515-first.$(OBJEXT) -am_lib515_OBJECTS = lib515-lib515.$(OBJEXT) $(am__objects_102) +am__objects_117 = lib515-first.$(OBJEXT) +am_lib515_OBJECTS = lib515-lib515.$(OBJEXT) $(am__objects_117) lib515_OBJECTS = $(am_lib515_OBJECTS) lib515_LDADD = $(LDADD) lib515_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_103 = lib516-first.$(OBJEXT) -am_lib516_OBJECTS = lib516-lib516.$(OBJEXT) $(am__objects_103) +am__objects_118 = lib516-first.$(OBJEXT) +am_lib516_OBJECTS = lib516-lib516.$(OBJEXT) $(am__objects_118) lib516_OBJECTS = $(am_lib516_OBJECTS) lib516_LDADD = $(LDADD) lib516_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_104 = lib517-first.$(OBJEXT) -am_lib517_OBJECTS = lib517-lib517.$(OBJEXT) $(am__objects_104) +am__objects_119 = lib517-first.$(OBJEXT) +am_lib517_OBJECTS = lib517-lib517.$(OBJEXT) $(am__objects_119) lib517_OBJECTS = $(am_lib517_OBJECTS) lib517_LDADD = $(LDADD) lib517_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_105 = lib518-first.$(OBJEXT) -am__objects_106 = ../../lib/lib518-warnless.$(OBJEXT) -am_lib518_OBJECTS = lib518-lib518.$(OBJEXT) $(am__objects_105) \ - $(am__objects_106) +am__objects_120 = lib518-first.$(OBJEXT) +am__objects_121 = ../../lib/lib518-warnless.$(OBJEXT) +am_lib518_OBJECTS = lib518-lib518.$(OBJEXT) $(am__objects_120) \ + $(am__objects_121) lib518_OBJECTS = $(am_lib518_OBJECTS) lib518_LDADD = $(LDADD) lib518_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_107 = lib519-first.$(OBJEXT) -am_lib519_OBJECTS = lib519-lib519.$(OBJEXT) $(am__objects_107) +am__objects_122 = lib519-first.$(OBJEXT) +am_lib519_OBJECTS = lib519-lib519.$(OBJEXT) $(am__objects_122) lib519_OBJECTS = $(am_lib519_OBJECTS) lib519_LDADD = $(LDADD) lib519_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_108 = lib520-first.$(OBJEXT) -am_lib520_OBJECTS = lib520-lib520.$(OBJEXT) $(am__objects_108) +am__objects_123 = lib520-first.$(OBJEXT) +am_lib520_OBJECTS = lib520-lib520.$(OBJEXT) $(am__objects_123) lib520_OBJECTS = $(am_lib520_OBJECTS) lib520_LDADD = $(LDADD) lib520_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_109 = lib521-first.$(OBJEXT) -am_lib521_OBJECTS = lib521-lib521.$(OBJEXT) $(am__objects_109) +am__objects_124 = lib521-first.$(OBJEXT) +am_lib521_OBJECTS = lib521-lib521.$(OBJEXT) $(am__objects_124) lib521_OBJECTS = $(am_lib521_OBJECTS) lib521_LDADD = $(LDADD) lib521_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_110 = lib523-first.$(OBJEXT) -am_lib523_OBJECTS = lib523-lib523.$(OBJEXT) $(am__objects_110) +am__objects_125 = lib523-first.$(OBJEXT) +am_lib523_OBJECTS = lib523-lib523.$(OBJEXT) $(am__objects_125) lib523_OBJECTS = $(am_lib523_OBJECTS) lib523_LDADD = $(LDADD) lib523_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_111 = lib524-first.$(OBJEXT) -am_lib524_OBJECTS = lib524-lib524.$(OBJEXT) $(am__objects_111) +am__objects_126 = lib524-first.$(OBJEXT) +am_lib524_OBJECTS = lib524-lib524.$(OBJEXT) $(am__objects_126) lib524_OBJECTS = $(am_lib524_OBJECTS) lib524_LDADD = $(LDADD) lib524_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_112 = lib525-first.$(OBJEXT) -am__objects_113 = lib525-testutil.$(OBJEXT) -am__objects_114 = ../../lib/lib525-warnless.$(OBJEXT) -am_lib525_OBJECTS = lib525-lib525.$(OBJEXT) $(am__objects_112) \ - $(am__objects_113) $(am__objects_114) +am__objects_127 = lib525-first.$(OBJEXT) +am__objects_128 = lib525-testutil.$(OBJEXT) +am__objects_129 = ../../lib/lib525-warnless.$(OBJEXT) +am_lib525_OBJECTS = lib525-lib525.$(OBJEXT) $(am__objects_127) \ + $(am__objects_128) $(am__objects_129) lib525_OBJECTS = $(am_lib525_OBJECTS) lib525_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_115 = lib526-first.$(OBJEXT) -am__objects_116 = lib526-testutil.$(OBJEXT) -am__objects_117 = ../../lib/lib526-warnless.$(OBJEXT) -am_lib526_OBJECTS = lib526-lib526.$(OBJEXT) $(am__objects_115) \ - $(am__objects_116) $(am__objects_117) +am__objects_130 = lib526-first.$(OBJEXT) +am__objects_131 = lib526-testutil.$(OBJEXT) +am__objects_132 = ../../lib/lib526-warnless.$(OBJEXT) +am_lib526_OBJECTS = lib526-lib526.$(OBJEXT) $(am__objects_130) \ + $(am__objects_131) $(am__objects_132) lib526_OBJECTS = $(am_lib526_OBJECTS) lib526_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_118 = lib527-first.$(OBJEXT) -am__objects_119 = lib527-testutil.$(OBJEXT) -am__objects_120 = ../../lib/lib527-warnless.$(OBJEXT) -am_lib527_OBJECTS = lib527-lib526.$(OBJEXT) $(am__objects_118) \ - $(am__objects_119) $(am__objects_120) +am__objects_133 = lib527-first.$(OBJEXT) +am__objects_134 = lib527-testutil.$(OBJEXT) +am__objects_135 = ../../lib/lib527-warnless.$(OBJEXT) +am_lib527_OBJECTS = lib527-lib526.$(OBJEXT) $(am__objects_133) \ + $(am__objects_134) $(am__objects_135) lib527_OBJECTS = $(am_lib527_OBJECTS) lib527_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_121 = lib529-first.$(OBJEXT) -am__objects_122 = lib529-testutil.$(OBJEXT) -am__objects_123 = ../../lib/lib529-warnless.$(OBJEXT) -am_lib529_OBJECTS = lib529-lib525.$(OBJEXT) $(am__objects_121) \ - $(am__objects_122) $(am__objects_123) +am__objects_136 = lib529-first.$(OBJEXT) +am__objects_137 = lib529-testutil.$(OBJEXT) +am__objects_138 = ../../lib/lib529-warnless.$(OBJEXT) +am_lib529_OBJECTS = lib529-lib525.$(OBJEXT) $(am__objects_136) \ + $(am__objects_137) $(am__objects_138) lib529_OBJECTS = $(am_lib529_OBJECTS) lib529_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_124 = lib530-first.$(OBJEXT) -am__objects_125 = lib530-testutil.$(OBJEXT) -am__objects_126 = ../../lib/lib530-warnless.$(OBJEXT) -am_lib530_OBJECTS = lib530-lib530.$(OBJEXT) $(am__objects_124) \ - $(am__objects_125) $(am__objects_126) +am__objects_139 = lib530-first.$(OBJEXT) +am__objects_140 = lib530-testutil.$(OBJEXT) +am__objects_141 = ../../lib/lib530-warnless.$(OBJEXT) +am_lib530_OBJECTS = lib530-lib530.$(OBJEXT) $(am__objects_139) \ + $(am__objects_140) $(am__objects_141) lib530_OBJECTS = $(am_lib530_OBJECTS) lib530_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_127 = lib532-first.$(OBJEXT) -am__objects_128 = lib532-testutil.$(OBJEXT) -am__objects_129 = ../../lib/lib532-warnless.$(OBJEXT) -am_lib532_OBJECTS = lib532-lib526.$(OBJEXT) $(am__objects_127) \ - $(am__objects_128) $(am__objects_129) +am__objects_142 = lib532-first.$(OBJEXT) +am__objects_143 = lib532-testutil.$(OBJEXT) +am__objects_144 = ../../lib/lib532-warnless.$(OBJEXT) +am_lib532_OBJECTS = lib532-lib526.$(OBJEXT) $(am__objects_142) \ + $(am__objects_143) $(am__objects_144) lib532_OBJECTS = $(am_lib532_OBJECTS) lib532_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_130 = lib533-first.$(OBJEXT) -am__objects_131 = lib533-testutil.$(OBJEXT) -am__objects_132 = ../../lib/lib533-warnless.$(OBJEXT) -am_lib533_OBJECTS = lib533-lib533.$(OBJEXT) $(am__objects_130) \ - $(am__objects_131) $(am__objects_132) +am__objects_145 = lib533-first.$(OBJEXT) +am__objects_146 = lib533-testutil.$(OBJEXT) +am__objects_147 = ../../lib/lib533-warnless.$(OBJEXT) +am_lib533_OBJECTS = lib533-lib533.$(OBJEXT) $(am__objects_145) \ + $(am__objects_146) $(am__objects_147) lib533_OBJECTS = $(am_lib533_OBJECTS) lib533_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_133 = lib536-first.$(OBJEXT) -am__objects_134 = lib536-testutil.$(OBJEXT) -am__objects_135 = ../../lib/lib536-warnless.$(OBJEXT) -am_lib536_OBJECTS = lib536-lib536.$(OBJEXT) $(am__objects_133) \ - $(am__objects_134) $(am__objects_135) +am__objects_148 = lib536-first.$(OBJEXT) +am__objects_149 = lib536-testutil.$(OBJEXT) +am__objects_150 = ../../lib/lib536-warnless.$(OBJEXT) +am_lib536_OBJECTS = lib536-lib536.$(OBJEXT) $(am__objects_148) \ + $(am__objects_149) $(am__objects_150) lib536_OBJECTS = $(am_lib536_OBJECTS) lib536_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_136 = lib537-first.$(OBJEXT) -am__objects_137 = ../../lib/lib537-warnless.$(OBJEXT) -am_lib537_OBJECTS = lib537-lib537.$(OBJEXT) $(am__objects_136) \ - $(am__objects_137) +am__objects_151 = lib537-first.$(OBJEXT) +am__objects_152 = ../../lib/lib537-warnless.$(OBJEXT) +am_lib537_OBJECTS = lib537-lib537.$(OBJEXT) $(am__objects_151) \ + $(am__objects_152) lib537_OBJECTS = $(am_lib537_OBJECTS) lib537_LDADD = $(LDADD) lib537_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_138 = lib539-first.$(OBJEXT) -am_lib539_OBJECTS = lib539-lib539.$(OBJEXT) $(am__objects_138) +am__objects_153 = lib539-first.$(OBJEXT) +am_lib539_OBJECTS = lib539-lib539.$(OBJEXT) $(am__objects_153) lib539_OBJECTS = $(am_lib539_OBJECTS) lib539_LDADD = $(LDADD) lib539_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_139 = lib540-first.$(OBJEXT) -am__objects_140 = lib540-testutil.$(OBJEXT) -am__objects_141 = ../../lib/lib540-warnless.$(OBJEXT) -am_lib540_OBJECTS = lib540-lib540.$(OBJEXT) $(am__objects_139) \ - $(am__objects_140) $(am__objects_141) +am__objects_154 = lib540-first.$(OBJEXT) +am__objects_155 = lib540-testutil.$(OBJEXT) +am__objects_156 = ../../lib/lib540-warnless.$(OBJEXT) +am_lib540_OBJECTS = lib540-lib540.$(OBJEXT) $(am__objects_154) \ + $(am__objects_155) $(am__objects_156) lib540_OBJECTS = $(am_lib540_OBJECTS) lib540_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_142 = lib541-first.$(OBJEXT) -am_lib541_OBJECTS = lib541-lib541.$(OBJEXT) $(am__objects_142) +am__objects_157 = lib541-first.$(OBJEXT) +am_lib541_OBJECTS = lib541-lib541.$(OBJEXT) $(am__objects_157) lib541_OBJECTS = $(am_lib541_OBJECTS) lib541_LDADD = $(LDADD) lib541_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_143 = lib542-first.$(OBJEXT) -am_lib542_OBJECTS = lib542-lib542.$(OBJEXT) $(am__objects_143) +am__objects_158 = lib542-first.$(OBJEXT) +am_lib542_OBJECTS = lib542-lib542.$(OBJEXT) $(am__objects_158) lib542_OBJECTS = $(am_lib542_OBJECTS) lib542_LDADD = $(LDADD) lib542_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_144 = lib543-first.$(OBJEXT) -am_lib543_OBJECTS = lib543-lib543.$(OBJEXT) $(am__objects_144) +am__objects_159 = lib543-first.$(OBJEXT) +am_lib543_OBJECTS = lib543-lib543.$(OBJEXT) $(am__objects_159) lib543_OBJECTS = $(am_lib543_OBJECTS) lib543_LDADD = $(LDADD) lib543_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_145 = lib544-first.$(OBJEXT) -am_lib544_OBJECTS = lib544-lib544.$(OBJEXT) $(am__objects_145) +am__objects_160 = lib544-first.$(OBJEXT) +am_lib544_OBJECTS = lib544-lib544.$(OBJEXT) $(am__objects_160) lib544_OBJECTS = $(am_lib544_OBJECTS) lib544_LDADD = $(LDADD) lib544_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_146 = lib545-first.$(OBJEXT) -am_lib545_OBJECTS = lib545-lib544.$(OBJEXT) $(am__objects_146) +am__objects_161 = lib545-first.$(OBJEXT) +am_lib545_OBJECTS = lib545-lib544.$(OBJEXT) $(am__objects_161) lib545_OBJECTS = $(am_lib545_OBJECTS) lib545_LDADD = $(LDADD) lib545_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_147 = lib547-first.$(OBJEXT) -am_lib547_OBJECTS = lib547-lib547.$(OBJEXT) $(am__objects_147) +am__objects_162 = lib547-first.$(OBJEXT) +am_lib547_OBJECTS = lib547-lib547.$(OBJEXT) $(am__objects_162) lib547_OBJECTS = $(am_lib547_OBJECTS) lib547_LDADD = $(LDADD) lib547_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_148 = lib548-first.$(OBJEXT) -am_lib548_OBJECTS = lib548-lib547.$(OBJEXT) $(am__objects_148) +am__objects_163 = lib548-first.$(OBJEXT) +am_lib548_OBJECTS = lib548-lib547.$(OBJEXT) $(am__objects_163) lib548_OBJECTS = $(am_lib548_OBJECTS) lib548_LDADD = $(LDADD) lib548_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_149 = lib549-first.$(OBJEXT) -am_lib549_OBJECTS = lib549-lib549.$(OBJEXT) $(am__objects_149) +am__objects_164 = lib549-first.$(OBJEXT) +am_lib549_OBJECTS = lib549-lib549.$(OBJEXT) $(am__objects_164) lib549_OBJECTS = $(am_lib549_OBJECTS) lib549_LDADD = $(LDADD) lib549_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_150 = lib552-first.$(OBJEXT) -am__objects_151 = ../../lib/lib552-warnless.$(OBJEXT) -am_lib552_OBJECTS = lib552-lib552.$(OBJEXT) $(am__objects_150) \ - $(am__objects_151) +am__objects_165 = lib552-first.$(OBJEXT) +am__objects_166 = ../../lib/lib552-warnless.$(OBJEXT) +am_lib552_OBJECTS = lib552-lib552.$(OBJEXT) $(am__objects_165) \ + $(am__objects_166) lib552_OBJECTS = $(am_lib552_OBJECTS) lib552_LDADD = $(LDADD) lib552_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_152 = lib553-first.$(OBJEXT) -am_lib553_OBJECTS = lib553-lib553.$(OBJEXT) $(am__objects_152) +am__objects_167 = lib553-first.$(OBJEXT) +am_lib553_OBJECTS = lib553-lib553.$(OBJEXT) $(am__objects_167) lib553_OBJECTS = $(am_lib553_OBJECTS) lib553_LDADD = $(LDADD) lib553_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_153 = lib554-first.$(OBJEXT) -am_lib554_OBJECTS = lib554-lib554.$(OBJEXT) $(am__objects_153) +am__objects_168 = lib554-first.$(OBJEXT) +am_lib554_OBJECTS = lib554-lib554.$(OBJEXT) $(am__objects_168) lib554_OBJECTS = $(am_lib554_OBJECTS) lib554_LDADD = $(LDADD) lib554_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_154 = lib555-first.$(OBJEXT) -am__objects_155 = lib555-testutil.$(OBJEXT) -am__objects_156 = ../../lib/lib555-warnless.$(OBJEXT) -am_lib555_OBJECTS = lib555-lib555.$(OBJEXT) $(am__objects_154) \ - $(am__objects_155) $(am__objects_156) +am__objects_169 = lib555-first.$(OBJEXT) +am__objects_170 = lib555-testutil.$(OBJEXT) +am__objects_171 = ../../lib/lib555-warnless.$(OBJEXT) +am_lib555_OBJECTS = lib555-lib555.$(OBJEXT) $(am__objects_169) \ + $(am__objects_170) $(am__objects_171) lib555_OBJECTS = $(am_lib555_OBJECTS) lib555_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_157 = lib556-first.$(OBJEXT) -am__objects_158 = ../../lib/lib556-warnless.$(OBJEXT) -am_lib556_OBJECTS = lib556-lib556.$(OBJEXT) $(am__objects_157) \ - $(am__objects_158) +am__objects_172 = lib556-first.$(OBJEXT) +am__objects_173 = ../../lib/lib556-warnless.$(OBJEXT) +am_lib556_OBJECTS = lib556-lib556.$(OBJEXT) $(am__objects_172) \ + $(am__objects_173) lib556_OBJECTS = $(am_lib556_OBJECTS) lib556_LDADD = $(LDADD) lib556_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_159 = lib557-first.$(OBJEXT) -am_lib557_OBJECTS = lib557-lib557.$(OBJEXT) $(am__objects_159) +am__objects_174 = lib557-first.$(OBJEXT) +am_lib557_OBJECTS = lib557-lib557.$(OBJEXT) $(am__objects_174) lib557_OBJECTS = $(am_lib557_OBJECTS) lib557_LDADD = $(LDADD) lib557_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_160 = lib558-first.$(OBJEXT) -am_lib558_OBJECTS = lib558-lib558.$(OBJEXT) $(am__objects_160) +am__objects_175 = lib558-first.$(OBJEXT) +am_lib558_OBJECTS = lib558-lib558.$(OBJEXT) $(am__objects_175) lib558_OBJECTS = $(am_lib558_OBJECTS) lib558_LDADD = $(LDADD) lib558_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_161 = lib560-first.$(OBJEXT) -am__objects_162 = lib560-testutil.$(OBJEXT) -am__objects_163 = ../../lib/lib560-warnless.$(OBJEXT) -am_lib560_OBJECTS = lib560-lib560.$(OBJEXT) $(am__objects_161) \ - $(am__objects_162) $(am__objects_163) +am__objects_176 = lib560-first.$(OBJEXT) +am__objects_177 = lib560-testutil.$(OBJEXT) +am__objects_178 = ../../lib/lib560-warnless.$(OBJEXT) +am_lib560_OBJECTS = lib560-lib560.$(OBJEXT) $(am__objects_176) \ + $(am__objects_177) $(am__objects_178) lib560_OBJECTS = $(am_lib560_OBJECTS) lib560_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_164 = lib562-first.$(OBJEXT) -am_lib562_OBJECTS = lib562-lib562.$(OBJEXT) $(am__objects_164) +am__objects_179 = lib562-first.$(OBJEXT) +am_lib562_OBJECTS = lib562-lib562.$(OBJEXT) $(am__objects_179) lib562_OBJECTS = $(am_lib562_OBJECTS) lib562_LDADD = $(LDADD) lib562_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_165 = lib564-first.$(OBJEXT) -am__objects_166 = lib564-testutil.$(OBJEXT) -am__objects_167 = ../../lib/lib564-warnless.$(OBJEXT) -am_lib564_OBJECTS = lib564-lib564.$(OBJEXT) $(am__objects_165) \ - $(am__objects_166) $(am__objects_167) +am__objects_180 = lib564-first.$(OBJEXT) +am__objects_181 = lib564-testutil.$(OBJEXT) +am__objects_182 = ../../lib/lib564-warnless.$(OBJEXT) +am_lib564_OBJECTS = lib564-lib564.$(OBJEXT) $(am__objects_180) \ + $(am__objects_181) $(am__objects_182) lib564_OBJECTS = $(am_lib564_OBJECTS) lib564_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_168 = lib565-first.$(OBJEXT) -am_lib565_OBJECTS = lib565-lib510.$(OBJEXT) $(am__objects_168) +am__objects_183 = lib565-first.$(OBJEXT) +am_lib565_OBJECTS = lib565-lib510.$(OBJEXT) $(am__objects_183) lib565_OBJECTS = $(am_lib565_OBJECTS) lib565_LDADD = $(LDADD) lib565_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_169 = lib566-first.$(OBJEXT) -am_lib566_OBJECTS = lib566-lib566.$(OBJEXT) $(am__objects_169) +am__objects_184 = lib566-first.$(OBJEXT) +am_lib566_OBJECTS = lib566-lib566.$(OBJEXT) $(am__objects_184) lib566_OBJECTS = $(am_lib566_OBJECTS) lib566_LDADD = $(LDADD) lib566_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_170 = lib567-first.$(OBJEXT) -am_lib567_OBJECTS = lib567-lib567.$(OBJEXT) $(am__objects_170) +am__objects_185 = lib567-first.$(OBJEXT) +am_lib567_OBJECTS = lib567-lib567.$(OBJEXT) $(am__objects_185) lib567_OBJECTS = $(am_lib567_OBJECTS) lib567_LDADD = $(LDADD) lib567_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_171 = lib568-first.$(OBJEXT) -am_lib568_OBJECTS = lib568-lib568.$(OBJEXT) $(am__objects_171) +am__objects_186 = lib568-first.$(OBJEXT) +am_lib568_OBJECTS = lib568-lib568.$(OBJEXT) $(am__objects_186) lib568_OBJECTS = $(am_lib568_OBJECTS) lib568_LDADD = $(LDADD) lib568_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_172 = lib569-first.$(OBJEXT) -am_lib569_OBJECTS = lib569-lib569.$(OBJEXT) $(am__objects_172) +am__objects_187 = lib569-first.$(OBJEXT) +am_lib569_OBJECTS = lib569-lib569.$(OBJEXT) $(am__objects_187) lib569_OBJECTS = $(am_lib569_OBJECTS) lib569_LDADD = $(LDADD) lib569_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_173 = lib570-first.$(OBJEXT) -am_lib570_OBJECTS = lib570-lib570.$(OBJEXT) $(am__objects_173) +am__objects_188 = lib570-first.$(OBJEXT) +am_lib570_OBJECTS = lib570-lib570.$(OBJEXT) $(am__objects_188) lib570_OBJECTS = $(am_lib570_OBJECTS) lib570_LDADD = $(LDADD) lib570_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_174 = lib571-first.$(OBJEXT) -am__objects_175 = ../../lib/lib571-warnless.$(OBJEXT) -am_lib571_OBJECTS = lib571-lib571.$(OBJEXT) $(am__objects_174) \ - $(am__objects_175) +am__objects_189 = lib571-first.$(OBJEXT) +am__objects_190 = ../../lib/lib571-warnless.$(OBJEXT) +am_lib571_OBJECTS = lib571-lib571.$(OBJEXT) $(am__objects_189) \ + $(am__objects_190) lib571_OBJECTS = $(am_lib571_OBJECTS) lib571_LDADD = $(LDADD) lib571_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_176 = lib572-first.$(OBJEXT) -am_lib572_OBJECTS = lib572-lib572.$(OBJEXT) $(am__objects_176) +am__objects_191 = lib572-first.$(OBJEXT) +am_lib572_OBJECTS = lib572-lib572.$(OBJEXT) $(am__objects_191) lib572_OBJECTS = $(am_lib572_OBJECTS) lib572_LDADD = $(LDADD) lib572_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_177 = lib573-first.$(OBJEXT) -am__objects_178 = lib573-testutil.$(OBJEXT) -am__objects_179 = ../../lib/lib573-warnless.$(OBJEXT) -am__objects_180 = lib573-testtrace.$(OBJEXT) -am_lib573_OBJECTS = lib573-lib573.$(OBJEXT) $(am__objects_177) \ - $(am__objects_178) $(am__objects_179) $(am__objects_180) +am__objects_192 = lib573-first.$(OBJEXT) +am__objects_193 = lib573-testutil.$(OBJEXT) +am__objects_194 = ../../lib/lib573-warnless.$(OBJEXT) +am__objects_195 = lib573-testtrace.$(OBJEXT) +am_lib573_OBJECTS = lib573-lib573.$(OBJEXT) $(am__objects_192) \ + $(am__objects_193) $(am__objects_194) $(am__objects_195) lib573_OBJECTS = $(am_lib573_OBJECTS) lib573_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_181 = lib574-first.$(OBJEXT) -am_lib574_OBJECTS = lib574-lib574.$(OBJEXT) $(am__objects_181) +am__objects_196 = lib574-first.$(OBJEXT) +am_lib574_OBJECTS = lib574-lib574.$(OBJEXT) $(am__objects_196) lib574_OBJECTS = $(am_lib574_OBJECTS) lib574_LDADD = $(LDADD) lib574_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_182 = lib575-first.$(OBJEXT) -am__objects_183 = lib575-testutil.$(OBJEXT) -am__objects_184 = ../../lib/lib575-warnless.$(OBJEXT) -am_lib575_OBJECTS = lib575-lib575.$(OBJEXT) $(am__objects_182) \ - $(am__objects_183) $(am__objects_184) +am__objects_197 = lib575-first.$(OBJEXT) +am__objects_198 = lib575-testutil.$(OBJEXT) +am__objects_199 = ../../lib/lib575-warnless.$(OBJEXT) +am_lib575_OBJECTS = lib575-lib575.$(OBJEXT) $(am__objects_197) \ + $(am__objects_198) $(am__objects_199) lib575_OBJECTS = $(am_lib575_OBJECTS) lib575_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_185 = lib576-first.$(OBJEXT) -am_lib576_OBJECTS = lib576-lib576.$(OBJEXT) $(am__objects_185) +am__objects_200 = lib576-first.$(OBJEXT) +am_lib576_OBJECTS = lib576-lib576.$(OBJEXT) $(am__objects_200) lib576_OBJECTS = $(am_lib576_OBJECTS) lib576_LDADD = $(LDADD) lib576_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_186 = lib578-first.$(OBJEXT) -am_lib578_OBJECTS = lib578-lib578.$(OBJEXT) $(am__objects_186) +am__objects_201 = lib578-first.$(OBJEXT) +am_lib578_OBJECTS = lib578-lib578.$(OBJEXT) $(am__objects_201) lib578_OBJECTS = $(am_lib578_OBJECTS) lib578_LDADD = $(LDADD) lib578_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_187 = lib579-first.$(OBJEXT) -am_lib579_OBJECTS = lib579-lib579.$(OBJEXT) $(am__objects_187) +am__objects_202 = lib579-first.$(OBJEXT) +am_lib579_OBJECTS = lib579-lib579.$(OBJEXT) $(am__objects_202) lib579_OBJECTS = $(am_lib579_OBJECTS) lib579_LDADD = $(LDADD) lib579_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_188 = lib582-first.$(OBJEXT) -am__objects_189 = lib582-testutil.$(OBJEXT) -am__objects_190 = ../../lib/lib582-warnless.$(OBJEXT) -am_lib582_OBJECTS = lib582-lib582.$(OBJEXT) $(am__objects_188) \ - $(am__objects_189) $(am__objects_190) +am__objects_203 = lib582-first.$(OBJEXT) +am__objects_204 = lib582-testutil.$(OBJEXT) +am__objects_205 = ../../lib/lib582-warnless.$(OBJEXT) +am_lib582_OBJECTS = lib582-lib582.$(OBJEXT) $(am__objects_203) \ + $(am__objects_204) $(am__objects_205) lib582_OBJECTS = $(am_lib582_OBJECTS) lib582_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_191 = lib583-first.$(OBJEXT) -am_lib583_OBJECTS = lib583-lib583.$(OBJEXT) $(am__objects_191) +am__objects_206 = lib583-first.$(OBJEXT) +am_lib583_OBJECTS = lib583-lib583.$(OBJEXT) $(am__objects_206) lib583_OBJECTS = $(am_lib583_OBJECTS) lib583_LDADD = $(LDADD) lib583_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_192 = lib585-first.$(OBJEXT) -am__objects_193 = lib585-testutil.$(OBJEXT) -am__objects_194 = lib585-testtrace.$(OBJEXT) -am_lib585_OBJECTS = lib585-lib500.$(OBJEXT) $(am__objects_192) \ - $(am__objects_193) $(am__objects_194) +am__objects_207 = lib585-first.$(OBJEXT) +am__objects_208 = lib585-testutil.$(OBJEXT) +am__objects_209 = lib585-testtrace.$(OBJEXT) +am_lib585_OBJECTS = lib585-lib500.$(OBJEXT) $(am__objects_207) \ + $(am__objects_208) $(am__objects_209) lib585_OBJECTS = $(am_lib585_OBJECTS) lib585_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_195 = lib586-first.$(OBJEXT) -am_lib586_OBJECTS = lib586-lib586.$(OBJEXT) $(am__objects_195) +am__objects_210 = lib586-first.$(OBJEXT) +am_lib586_OBJECTS = lib586-lib586.$(OBJEXT) $(am__objects_210) lib586_OBJECTS = $(am_lib586_OBJECTS) lib586_LDADD = $(LDADD) lib586_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_196 = lib587-first.$(OBJEXT) -am_lib587_OBJECTS = lib587-lib554.$(OBJEXT) $(am__objects_196) +am__objects_211 = lib587-first.$(OBJEXT) +am_lib587_OBJECTS = lib587-lib554.$(OBJEXT) $(am__objects_211) lib587_OBJECTS = $(am_lib587_OBJECTS) lib587_LDADD = $(LDADD) lib587_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_197 = lib590-first.$(OBJEXT) -am_lib590_OBJECTS = lib590-lib590.$(OBJEXT) $(am__objects_197) +am__objects_212 = lib590-first.$(OBJEXT) +am_lib590_OBJECTS = lib590-lib590.$(OBJEXT) $(am__objects_212) lib590_OBJECTS = $(am_lib590_OBJECTS) lib590_LDADD = $(LDADD) lib590_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_198 = lib591-first.$(OBJEXT) -am__objects_199 = lib591-testutil.$(OBJEXT) -am__objects_200 = ../../lib/lib591-warnless.$(OBJEXT) -am_lib591_OBJECTS = lib591-lib591.$(OBJEXT) $(am__objects_198) \ - $(am__objects_199) $(am__objects_200) +am__objects_213 = lib591-first.$(OBJEXT) +am__objects_214 = lib591-testutil.$(OBJEXT) +am__objects_215 = ../../lib/lib591-warnless.$(OBJEXT) +am_lib591_OBJECTS = lib591-lib591.$(OBJEXT) $(am__objects_213) \ + $(am__objects_214) $(am__objects_215) lib591_OBJECTS = $(am_lib591_OBJECTS) lib591_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_201 = lib597-first.$(OBJEXT) -am__objects_202 = lib597-testutil.$(OBJEXT) -am__objects_203 = ../../lib/lib597-warnless.$(OBJEXT) -am_lib597_OBJECTS = lib597-lib597.$(OBJEXT) $(am__objects_201) \ - $(am__objects_202) $(am__objects_203) +am__objects_216 = lib597-first.$(OBJEXT) +am__objects_217 = lib597-testutil.$(OBJEXT) +am__objects_218 = ../../lib/lib597-warnless.$(OBJEXT) +am_lib597_OBJECTS = lib597-lib597.$(OBJEXT) $(am__objects_216) \ + $(am__objects_217) $(am__objects_218) lib597_OBJECTS = $(am_lib597_OBJECTS) lib597_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_204 = lib598-first.$(OBJEXT) -am_lib598_OBJECTS = lib598-lib598.$(OBJEXT) $(am__objects_204) +am__objects_219 = lib598-first.$(OBJEXT) +am_lib598_OBJECTS = lib598-lib598.$(OBJEXT) $(am__objects_219) lib598_OBJECTS = $(am_lib598_OBJECTS) lib598_LDADD = $(LDADD) lib598_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_205 = lib599-first.$(OBJEXT) -am_lib599_OBJECTS = lib599-lib599.$(OBJEXT) $(am__objects_205) +am__objects_220 = lib599-first.$(OBJEXT) +am_lib599_OBJECTS = lib599-lib599.$(OBJEXT) $(am__objects_220) lib599_OBJECTS = $(am_lib599_OBJECTS) lib599_LDADD = $(LDADD) lib599_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_206 = libauthretry-first.$(OBJEXT) +am__objects_221 = libauthretry-first.$(OBJEXT) am_libauthretry_OBJECTS = libauthretry-libauthretry.$(OBJEXT) \ - $(am__objects_206) + $(am__objects_221) libauthretry_OBJECTS = $(am_libauthretry_OBJECTS) libauthretry_LDADD = $(LDADD) libauthretry_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_207 = libntlmconnect-first.$(OBJEXT) -am__objects_208 = libntlmconnect-testutil.$(OBJEXT) -am__objects_209 = ../../lib/libntlmconnect-warnless.$(OBJEXT) +am__objects_222 = libntlmconnect-first.$(OBJEXT) +am__objects_223 = libntlmconnect-testutil.$(OBJEXT) +am__objects_224 = ../../lib/libntlmconnect-warnless.$(OBJEXT) am_libntlmconnect_OBJECTS = libntlmconnect-libntlmconnect.$(OBJEXT) \ - $(am__objects_207) $(am__objects_208) $(am__objects_209) + $(am__objects_222) $(am__objects_223) $(am__objects_224) libntlmconnect_OBJECTS = $(am_libntlmconnect_OBJECTS) libntlmconnect_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) @@ -860,33 +897,35 @@ SOURCES = $(libhostname_la_SOURCES) $(chkhostname_SOURCES) \ $(lib1515_SOURCES) $(lib1517_SOURCES) $(lib1520_SOURCES) \ $(lib1525_SOURCES) $(lib1526_SOURCES) $(lib1527_SOURCES) \ $(lib1528_SOURCES) $(lib1529_SOURCES) $(lib1530_SOURCES) \ - $(lib1531_SOURCES) $(lib1900_SOURCES) $(lib2033_SOURCES) \ - $(lib500_SOURCES) $(lib501_SOURCES) $(lib502_SOURCES) \ - $(lib503_SOURCES) $(lib504_SOURCES) $(lib505_SOURCES) \ - $(lib506_SOURCES) $(lib507_SOURCES) $(lib508_SOURCES) \ - $(lib509_SOURCES) $(lib510_SOURCES) $(lib511_SOURCES) \ - $(lib512_SOURCES) $(lib513_SOURCES) $(lib514_SOURCES) \ - $(lib515_SOURCES) $(lib516_SOURCES) $(lib517_SOURCES) \ - $(lib518_SOURCES) $(lib519_SOURCES) $(lib520_SOURCES) \ - $(lib521_SOURCES) $(lib523_SOURCES) $(lib524_SOURCES) \ - $(lib525_SOURCES) $(lib526_SOURCES) $(lib527_SOURCES) \ - $(lib529_SOURCES) $(lib530_SOURCES) $(lib532_SOURCES) \ - $(lib533_SOURCES) $(lib536_SOURCES) $(lib537_SOURCES) \ - $(lib539_SOURCES) $(lib540_SOURCES) $(lib541_SOURCES) \ - $(lib542_SOURCES) $(lib543_SOURCES) $(lib544_SOURCES) \ - $(lib545_SOURCES) $(lib547_SOURCES) $(lib548_SOURCES) \ - $(lib549_SOURCES) $(lib552_SOURCES) $(lib553_SOURCES) \ - $(lib554_SOURCES) $(lib555_SOURCES) $(lib556_SOURCES) \ - $(lib557_SOURCES) $(lib558_SOURCES) $(lib560_SOURCES) \ - $(lib562_SOURCES) $(lib564_SOURCES) $(lib565_SOURCES) \ - $(lib566_SOURCES) $(lib567_SOURCES) $(lib568_SOURCES) \ - $(lib569_SOURCES) $(lib570_SOURCES) $(lib571_SOURCES) \ - $(lib572_SOURCES) $(lib573_SOURCES) $(lib574_SOURCES) \ - $(lib575_SOURCES) $(lib576_SOURCES) $(lib578_SOURCES) \ - $(lib579_SOURCES) $(lib582_SOURCES) $(lib583_SOURCES) \ - $(lib585_SOURCES) $(lib586_SOURCES) $(lib587_SOURCES) \ - $(lib590_SOURCES) $(lib591_SOURCES) $(lib597_SOURCES) \ - $(lib598_SOURCES) $(lib599_SOURCES) $(libauthretry_SOURCES) \ + $(lib1531_SOURCES) $(lib1532_SOURCES) $(lib1533_SOURCES) \ + $(lib1534_SOURCES) $(lib1535_SOURCES) $(lib1536_SOURCES) \ + $(lib1900_SOURCES) $(lib2033_SOURCES) $(lib500_SOURCES) \ + $(lib501_SOURCES) $(lib502_SOURCES) $(lib503_SOURCES) \ + $(lib504_SOURCES) $(lib505_SOURCES) $(lib506_SOURCES) \ + $(lib507_SOURCES) $(lib508_SOURCES) $(lib509_SOURCES) \ + $(lib510_SOURCES) $(lib511_SOURCES) $(lib512_SOURCES) \ + $(lib513_SOURCES) $(lib514_SOURCES) $(lib515_SOURCES) \ + $(lib516_SOURCES) $(lib517_SOURCES) $(lib518_SOURCES) \ + $(lib519_SOURCES) $(lib520_SOURCES) $(lib521_SOURCES) \ + $(lib523_SOURCES) $(lib524_SOURCES) $(lib525_SOURCES) \ + $(lib526_SOURCES) $(lib527_SOURCES) $(lib529_SOURCES) \ + $(lib530_SOURCES) $(lib532_SOURCES) $(lib533_SOURCES) \ + $(lib536_SOURCES) $(lib537_SOURCES) $(lib539_SOURCES) \ + $(lib540_SOURCES) $(lib541_SOURCES) $(lib542_SOURCES) \ + $(lib543_SOURCES) $(lib544_SOURCES) $(lib545_SOURCES) \ + $(lib547_SOURCES) $(lib548_SOURCES) $(lib549_SOURCES) \ + $(lib552_SOURCES) $(lib553_SOURCES) $(lib554_SOURCES) \ + $(lib555_SOURCES) $(lib556_SOURCES) $(lib557_SOURCES) \ + $(lib558_SOURCES) $(lib560_SOURCES) $(lib562_SOURCES) \ + $(lib564_SOURCES) $(lib565_SOURCES) $(lib566_SOURCES) \ + $(lib567_SOURCES) $(lib568_SOURCES) $(lib569_SOURCES) \ + $(lib570_SOURCES) $(lib571_SOURCES) $(lib572_SOURCES) \ + $(lib573_SOURCES) $(lib574_SOURCES) $(lib575_SOURCES) \ + $(lib576_SOURCES) $(lib578_SOURCES) $(lib579_SOURCES) \ + $(lib582_SOURCES) $(lib583_SOURCES) $(lib585_SOURCES) \ + $(lib586_SOURCES) $(lib587_SOURCES) $(lib590_SOURCES) \ + $(lib591_SOURCES) $(lib597_SOURCES) $(lib598_SOURCES) \ + $(lib599_SOURCES) $(libauthretry_SOURCES) \ $(libntlmconnect_SOURCES) DIST_SOURCES = $(libhostname_la_SOURCES) $(chkhostname_SOURCES) \ $(lib1500_SOURCES) $(lib1501_SOURCES) $(lib1502_SOURCES) \ @@ -897,33 +936,35 @@ DIST_SOURCES = $(libhostname_la_SOURCES) $(chkhostname_SOURCES) \ $(lib1515_SOURCES) $(lib1517_SOURCES) $(lib1520_SOURCES) \ $(lib1525_SOURCES) $(lib1526_SOURCES) $(lib1527_SOURCES) \ $(lib1528_SOURCES) $(lib1529_SOURCES) $(lib1530_SOURCES) \ - $(lib1531_SOURCES) $(lib1900_SOURCES) $(lib2033_SOURCES) \ - $(lib500_SOURCES) $(lib501_SOURCES) $(lib502_SOURCES) \ - $(lib503_SOURCES) $(lib504_SOURCES) $(lib505_SOURCES) \ - $(lib506_SOURCES) $(lib507_SOURCES) $(lib508_SOURCES) \ - $(lib509_SOURCES) $(lib510_SOURCES) $(lib511_SOURCES) \ - $(lib512_SOURCES) $(lib513_SOURCES) $(lib514_SOURCES) \ - $(lib515_SOURCES) $(lib516_SOURCES) $(lib517_SOURCES) \ - $(lib518_SOURCES) $(lib519_SOURCES) $(lib520_SOURCES) \ - $(lib521_SOURCES) $(lib523_SOURCES) $(lib524_SOURCES) \ - $(lib525_SOURCES) $(lib526_SOURCES) $(lib527_SOURCES) \ - $(lib529_SOURCES) $(lib530_SOURCES) $(lib532_SOURCES) \ - $(lib533_SOURCES) $(lib536_SOURCES) $(lib537_SOURCES) \ - $(lib539_SOURCES) $(lib540_SOURCES) $(lib541_SOURCES) \ - $(lib542_SOURCES) $(lib543_SOURCES) $(lib544_SOURCES) \ - $(lib545_SOURCES) $(lib547_SOURCES) $(lib548_SOURCES) \ - $(lib549_SOURCES) $(lib552_SOURCES) $(lib553_SOURCES) \ - $(lib554_SOURCES) $(lib555_SOURCES) $(lib556_SOURCES) \ - $(lib557_SOURCES) $(lib558_SOURCES) $(lib560_SOURCES) \ - $(lib562_SOURCES) $(lib564_SOURCES) $(lib565_SOURCES) \ - $(lib566_SOURCES) $(lib567_SOURCES) $(lib568_SOURCES) \ - $(lib569_SOURCES) $(lib570_SOURCES) $(lib571_SOURCES) \ - $(lib572_SOURCES) $(lib573_SOURCES) $(lib574_SOURCES) \ - $(lib575_SOURCES) $(lib576_SOURCES) $(lib578_SOURCES) \ - $(lib579_SOURCES) $(lib582_SOURCES) $(lib583_SOURCES) \ - $(lib585_SOURCES) $(lib586_SOURCES) $(lib587_SOURCES) \ - $(lib590_SOURCES) $(lib591_SOURCES) $(lib597_SOURCES) \ - $(lib598_SOURCES) $(lib599_SOURCES) $(libauthretry_SOURCES) \ + $(lib1531_SOURCES) $(lib1532_SOURCES) $(lib1533_SOURCES) \ + $(lib1534_SOURCES) $(lib1535_SOURCES) $(lib1536_SOURCES) \ + $(lib1900_SOURCES) $(lib2033_SOURCES) $(lib500_SOURCES) \ + $(lib501_SOURCES) $(lib502_SOURCES) $(lib503_SOURCES) \ + $(lib504_SOURCES) $(lib505_SOURCES) $(lib506_SOURCES) \ + $(lib507_SOURCES) $(lib508_SOURCES) $(lib509_SOURCES) \ + $(lib510_SOURCES) $(lib511_SOURCES) $(lib512_SOURCES) \ + $(lib513_SOURCES) $(lib514_SOURCES) $(lib515_SOURCES) \ + $(lib516_SOURCES) $(lib517_SOURCES) $(lib518_SOURCES) \ + $(lib519_SOURCES) $(lib520_SOURCES) $(lib521_SOURCES) \ + $(lib523_SOURCES) $(lib524_SOURCES) $(lib525_SOURCES) \ + $(lib526_SOURCES) $(lib527_SOURCES) $(lib529_SOURCES) \ + $(lib530_SOURCES) $(lib532_SOURCES) $(lib533_SOURCES) \ + $(lib536_SOURCES) $(lib537_SOURCES) $(lib539_SOURCES) \ + $(lib540_SOURCES) $(lib541_SOURCES) $(lib542_SOURCES) \ + $(lib543_SOURCES) $(lib544_SOURCES) $(lib545_SOURCES) \ + $(lib547_SOURCES) $(lib548_SOURCES) $(lib549_SOURCES) \ + $(lib552_SOURCES) $(lib553_SOURCES) $(lib554_SOURCES) \ + $(lib555_SOURCES) $(lib556_SOURCES) $(lib557_SOURCES) \ + $(lib558_SOURCES) $(lib560_SOURCES) $(lib562_SOURCES) \ + $(lib564_SOURCES) $(lib565_SOURCES) $(lib566_SOURCES) \ + $(lib567_SOURCES) $(lib568_SOURCES) $(lib569_SOURCES) \ + $(lib570_SOURCES) $(lib571_SOURCES) $(lib572_SOURCES) \ + $(lib573_SOURCES) $(lib574_SOURCES) $(lib575_SOURCES) \ + $(lib576_SOURCES) $(lib578_SOURCES) $(lib579_SOURCES) \ + $(lib582_SOURCES) $(lib583_SOURCES) $(lib585_SOURCES) \ + $(lib586_SOURCES) $(lib587_SOURCES) $(lib590_SOURCES) \ + $(lib591_SOURCES) $(lib597_SOURCES) $(lib598_SOURCES) \ + $(lib599_SOURCES) $(libauthretry_SOURCES) \ $(libntlmconnect_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -1474,6 +1515,21 @@ lib1530_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1530 lib1531_SOURCES = lib1531.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1531_LDADD = $(TESTUTIL_LIBS) lib1531_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1531 +lib1532_SOURCES = lib1532.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1532_LDADD = $(TESTUTIL_LIBS) +lib1532_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1532 +lib1533_SOURCES = lib1533.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1533_LDADD = $(TESTUTIL_LIBS) +lib1533_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1533 +lib1534_SOURCES = lib1534.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1534_LDADD = $(TESTUTIL_LIBS) +lib1534_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1534 +lib1535_SOURCES = lib1535.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1535_LDADD = $(TESTUTIL_LIBS) +lib1535_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1535 +lib1536_SOURCES = lib1536.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1536_LDADD = $(TESTUTIL_LIBS) +lib1536_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1536 lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1900_LDADD = $(TESTUTIL_LIBS) lib1900_CPPFLAGS = $(AM_CPPFLAGS) @@ -1713,6 +1769,36 @@ lib1530$(EXEEXT): $(lib1530_OBJECTS) $(lib1530_DEPENDENCIES) $(EXTRA_lib1530_DEP lib1531$(EXEEXT): $(lib1531_OBJECTS) $(lib1531_DEPENDENCIES) $(EXTRA_lib1531_DEPENDENCIES) @rm -f lib1531$(EXEEXT) $(AM_V_CCLD)$(LINK) $(lib1531_OBJECTS) $(lib1531_LDADD) $(LIBS) +../../lib/lib1532-warnless.$(OBJEXT): ../../lib/$(am__dirstamp) \ + ../../lib/$(DEPDIR)/$(am__dirstamp) + +lib1532$(EXEEXT): $(lib1532_OBJECTS) $(lib1532_DEPENDENCIES) $(EXTRA_lib1532_DEPENDENCIES) + @rm -f lib1532$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(lib1532_OBJECTS) $(lib1532_LDADD) $(LIBS) +../../lib/lib1533-warnless.$(OBJEXT): ../../lib/$(am__dirstamp) \ + ../../lib/$(DEPDIR)/$(am__dirstamp) + +lib1533$(EXEEXT): $(lib1533_OBJECTS) $(lib1533_DEPENDENCIES) $(EXTRA_lib1533_DEPENDENCIES) + @rm -f lib1533$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(lib1533_OBJECTS) $(lib1533_LDADD) $(LIBS) +../../lib/lib1534-warnless.$(OBJEXT): ../../lib/$(am__dirstamp) \ + ../../lib/$(DEPDIR)/$(am__dirstamp) + +lib1534$(EXEEXT): $(lib1534_OBJECTS) $(lib1534_DEPENDENCIES) $(EXTRA_lib1534_DEPENDENCIES) + @rm -f lib1534$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(lib1534_OBJECTS) $(lib1534_LDADD) $(LIBS) +../../lib/lib1535-warnless.$(OBJEXT): ../../lib/$(am__dirstamp) \ + ../../lib/$(DEPDIR)/$(am__dirstamp) + +lib1535$(EXEEXT): $(lib1535_OBJECTS) $(lib1535_DEPENDENCIES) $(EXTRA_lib1535_DEPENDENCIES) + @rm -f lib1535$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(lib1535_OBJECTS) $(lib1535_LDADD) $(LIBS) +../../lib/lib1536-warnless.$(OBJEXT): ../../lib/$(am__dirstamp) \ + ../../lib/$(DEPDIR)/$(am__dirstamp) + +lib1536$(EXEEXT): $(lib1536_OBJECTS) $(lib1536_DEPENDENCIES) $(EXTRA_lib1536_DEPENDENCIES) + @rm -f lib1536$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(lib1536_OBJECTS) $(lib1536_LDADD) $(LIBS) ../../lib/lib1900-warnless.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) @@ -2126,6 +2212,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1529-warnless.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1530-warnless.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1531-warnless.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1532-warnless.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1533-warnless.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1534-warnless.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1535-warnless.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1536-warnless.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1900-warnless.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib2033-warnless.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib502-warnless.Po@am__quote@ @@ -2229,6 +2320,21 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1531-first.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1531-lib1531.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1531-testutil.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1532-first.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1532-lib1532.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1532-testutil.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1533-first.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1533-lib1533.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1533-testutil.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1534-first.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1534-lib1534.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1534-testutil.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1535-first.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1535-lib1535.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1535-testutil.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1536-first.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1536-lib1536.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1536-testutil.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1900-first.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1900-lib1900.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1900-testutil.Po@am__quote@ @@ -3811,6 +3917,286 @@ lib1531-testutil.obj: testutil.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1531_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1531-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` +lib1532-lib1532.o: lib1532.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1532-lib1532.o -MD -MP -MF $(DEPDIR)/lib1532-lib1532.Tpo -c -o lib1532-lib1532.o `test -f 'lib1532.c' || echo '$(srcdir)/'`lib1532.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1532-lib1532.Tpo $(DEPDIR)/lib1532-lib1532.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib1532.c' object='lib1532-lib1532.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1532-lib1532.o `test -f 'lib1532.c' || echo '$(srcdir)/'`lib1532.c + +lib1532-lib1532.obj: lib1532.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1532-lib1532.obj -MD -MP -MF $(DEPDIR)/lib1532-lib1532.Tpo -c -o lib1532-lib1532.obj `if test -f 'lib1532.c'; then $(CYGPATH_W) 'lib1532.c'; else $(CYGPATH_W) '$(srcdir)/lib1532.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1532-lib1532.Tpo $(DEPDIR)/lib1532-lib1532.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib1532.c' object='lib1532-lib1532.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1532-lib1532.obj `if test -f 'lib1532.c'; then $(CYGPATH_W) 'lib1532.c'; else $(CYGPATH_W) '$(srcdir)/lib1532.c'; fi` + +lib1532-first.o: first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1532-first.o -MD -MP -MF $(DEPDIR)/lib1532-first.Tpo -c -o lib1532-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1532-first.Tpo $(DEPDIR)/lib1532-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='first.c' object='lib1532-first.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1532-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c + +lib1532-first.obj: first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1532-first.obj -MD -MP -MF $(DEPDIR)/lib1532-first.Tpo -c -o lib1532-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1532-first.Tpo $(DEPDIR)/lib1532-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='first.c' object='lib1532-first.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1532-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi` + +lib1532-testutil.o: testutil.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1532-testutil.o -MD -MP -MF $(DEPDIR)/lib1532-testutil.Tpo -c -o lib1532-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1532-testutil.Tpo $(DEPDIR)/lib1532-testutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testutil.c' object='lib1532-testutil.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1532-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c + +lib1532-testutil.obj: testutil.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1532-testutil.obj -MD -MP -MF $(DEPDIR)/lib1532-testutil.Tpo -c -o lib1532-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1532-testutil.Tpo $(DEPDIR)/lib1532-testutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testutil.c' object='lib1532-testutil.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1532-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi` + +../../lib/lib1532-warnless.o: ../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../../lib/lib1532-warnless.o -MD -MP -MF ../../lib/$(DEPDIR)/lib1532-warnless.Tpo -c -o ../../lib/lib1532-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/lib1532-warnless.Tpo ../../lib/$(DEPDIR)/lib1532-warnless.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/warnless.c' object='../../lib/lib1532-warnless.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1532-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c + +../../lib/lib1532-warnless.obj: ../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../../lib/lib1532-warnless.obj -MD -MP -MF ../../lib/$(DEPDIR)/lib1532-warnless.Tpo -c -o ../../lib/lib1532-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/lib1532-warnless.Tpo ../../lib/$(DEPDIR)/lib1532-warnless.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/warnless.c' object='../../lib/lib1532-warnless.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1532_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1532-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` + +lib1533-lib1533.o: lib1533.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1533-lib1533.o -MD -MP -MF $(DEPDIR)/lib1533-lib1533.Tpo -c -o lib1533-lib1533.o `test -f 'lib1533.c' || echo '$(srcdir)/'`lib1533.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1533-lib1533.Tpo $(DEPDIR)/lib1533-lib1533.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib1533.c' object='lib1533-lib1533.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1533-lib1533.o `test -f 'lib1533.c' || echo '$(srcdir)/'`lib1533.c + +lib1533-lib1533.obj: lib1533.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1533-lib1533.obj -MD -MP -MF $(DEPDIR)/lib1533-lib1533.Tpo -c -o lib1533-lib1533.obj `if test -f 'lib1533.c'; then $(CYGPATH_W) 'lib1533.c'; else $(CYGPATH_W) '$(srcdir)/lib1533.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1533-lib1533.Tpo $(DEPDIR)/lib1533-lib1533.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib1533.c' object='lib1533-lib1533.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1533-lib1533.obj `if test -f 'lib1533.c'; then $(CYGPATH_W) 'lib1533.c'; else $(CYGPATH_W) '$(srcdir)/lib1533.c'; fi` + +lib1533-first.o: first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1533-first.o -MD -MP -MF $(DEPDIR)/lib1533-first.Tpo -c -o lib1533-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1533-first.Tpo $(DEPDIR)/lib1533-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='first.c' object='lib1533-first.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1533-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c + +lib1533-first.obj: first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1533-first.obj -MD -MP -MF $(DEPDIR)/lib1533-first.Tpo -c -o lib1533-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1533-first.Tpo $(DEPDIR)/lib1533-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='first.c' object='lib1533-first.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1533-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi` + +lib1533-testutil.o: testutil.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1533-testutil.o -MD -MP -MF $(DEPDIR)/lib1533-testutil.Tpo -c -o lib1533-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1533-testutil.Tpo $(DEPDIR)/lib1533-testutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testutil.c' object='lib1533-testutil.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1533-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c + +lib1533-testutil.obj: testutil.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1533-testutil.obj -MD -MP -MF $(DEPDIR)/lib1533-testutil.Tpo -c -o lib1533-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1533-testutil.Tpo $(DEPDIR)/lib1533-testutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testutil.c' object='lib1533-testutil.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1533-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi` + +../../lib/lib1533-warnless.o: ../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../../lib/lib1533-warnless.o -MD -MP -MF ../../lib/$(DEPDIR)/lib1533-warnless.Tpo -c -o ../../lib/lib1533-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/lib1533-warnless.Tpo ../../lib/$(DEPDIR)/lib1533-warnless.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/warnless.c' object='../../lib/lib1533-warnless.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1533-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c + +../../lib/lib1533-warnless.obj: ../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../../lib/lib1533-warnless.obj -MD -MP -MF ../../lib/$(DEPDIR)/lib1533-warnless.Tpo -c -o ../../lib/lib1533-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/lib1533-warnless.Tpo ../../lib/$(DEPDIR)/lib1533-warnless.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/warnless.c' object='../../lib/lib1533-warnless.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1533_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1533-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` + +lib1534-lib1534.o: lib1534.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1534-lib1534.o -MD -MP -MF $(DEPDIR)/lib1534-lib1534.Tpo -c -o lib1534-lib1534.o `test -f 'lib1534.c' || echo '$(srcdir)/'`lib1534.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1534-lib1534.Tpo $(DEPDIR)/lib1534-lib1534.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib1534.c' object='lib1534-lib1534.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1534-lib1534.o `test -f 'lib1534.c' || echo '$(srcdir)/'`lib1534.c + +lib1534-lib1534.obj: lib1534.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1534-lib1534.obj -MD -MP -MF $(DEPDIR)/lib1534-lib1534.Tpo -c -o lib1534-lib1534.obj `if test -f 'lib1534.c'; then $(CYGPATH_W) 'lib1534.c'; else $(CYGPATH_W) '$(srcdir)/lib1534.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1534-lib1534.Tpo $(DEPDIR)/lib1534-lib1534.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib1534.c' object='lib1534-lib1534.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1534-lib1534.obj `if test -f 'lib1534.c'; then $(CYGPATH_W) 'lib1534.c'; else $(CYGPATH_W) '$(srcdir)/lib1534.c'; fi` + +lib1534-first.o: first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1534-first.o -MD -MP -MF $(DEPDIR)/lib1534-first.Tpo -c -o lib1534-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1534-first.Tpo $(DEPDIR)/lib1534-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='first.c' object='lib1534-first.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1534-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c + +lib1534-first.obj: first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1534-first.obj -MD -MP -MF $(DEPDIR)/lib1534-first.Tpo -c -o lib1534-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1534-first.Tpo $(DEPDIR)/lib1534-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='first.c' object='lib1534-first.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1534-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi` + +lib1534-testutil.o: testutil.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1534-testutil.o -MD -MP -MF $(DEPDIR)/lib1534-testutil.Tpo -c -o lib1534-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1534-testutil.Tpo $(DEPDIR)/lib1534-testutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testutil.c' object='lib1534-testutil.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1534-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c + +lib1534-testutil.obj: testutil.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1534-testutil.obj -MD -MP -MF $(DEPDIR)/lib1534-testutil.Tpo -c -o lib1534-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1534-testutil.Tpo $(DEPDIR)/lib1534-testutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testutil.c' object='lib1534-testutil.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1534-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi` + +../../lib/lib1534-warnless.o: ../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../../lib/lib1534-warnless.o -MD -MP -MF ../../lib/$(DEPDIR)/lib1534-warnless.Tpo -c -o ../../lib/lib1534-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/lib1534-warnless.Tpo ../../lib/$(DEPDIR)/lib1534-warnless.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/warnless.c' object='../../lib/lib1534-warnless.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1534-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c + +../../lib/lib1534-warnless.obj: ../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../../lib/lib1534-warnless.obj -MD -MP -MF ../../lib/$(DEPDIR)/lib1534-warnless.Tpo -c -o ../../lib/lib1534-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/lib1534-warnless.Tpo ../../lib/$(DEPDIR)/lib1534-warnless.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/warnless.c' object='../../lib/lib1534-warnless.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1534_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1534-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` + +lib1535-lib1535.o: lib1535.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1535-lib1535.o -MD -MP -MF $(DEPDIR)/lib1535-lib1535.Tpo -c -o lib1535-lib1535.o `test -f 'lib1535.c' || echo '$(srcdir)/'`lib1535.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1535-lib1535.Tpo $(DEPDIR)/lib1535-lib1535.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib1535.c' object='lib1535-lib1535.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1535-lib1535.o `test -f 'lib1535.c' || echo '$(srcdir)/'`lib1535.c + +lib1535-lib1535.obj: lib1535.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1535-lib1535.obj -MD -MP -MF $(DEPDIR)/lib1535-lib1535.Tpo -c -o lib1535-lib1535.obj `if test -f 'lib1535.c'; then $(CYGPATH_W) 'lib1535.c'; else $(CYGPATH_W) '$(srcdir)/lib1535.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1535-lib1535.Tpo $(DEPDIR)/lib1535-lib1535.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib1535.c' object='lib1535-lib1535.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1535-lib1535.obj `if test -f 'lib1535.c'; then $(CYGPATH_W) 'lib1535.c'; else $(CYGPATH_W) '$(srcdir)/lib1535.c'; fi` + +lib1535-first.o: first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1535-first.o -MD -MP -MF $(DEPDIR)/lib1535-first.Tpo -c -o lib1535-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1535-first.Tpo $(DEPDIR)/lib1535-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='first.c' object='lib1535-first.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1535-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c + +lib1535-first.obj: first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1535-first.obj -MD -MP -MF $(DEPDIR)/lib1535-first.Tpo -c -o lib1535-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1535-first.Tpo $(DEPDIR)/lib1535-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='first.c' object='lib1535-first.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1535-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi` + +lib1535-testutil.o: testutil.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1535-testutil.o -MD -MP -MF $(DEPDIR)/lib1535-testutil.Tpo -c -o lib1535-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1535-testutil.Tpo $(DEPDIR)/lib1535-testutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testutil.c' object='lib1535-testutil.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1535-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c + +lib1535-testutil.obj: testutil.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1535-testutil.obj -MD -MP -MF $(DEPDIR)/lib1535-testutil.Tpo -c -o lib1535-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1535-testutil.Tpo $(DEPDIR)/lib1535-testutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testutil.c' object='lib1535-testutil.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1535-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi` + +../../lib/lib1535-warnless.o: ../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../../lib/lib1535-warnless.o -MD -MP -MF ../../lib/$(DEPDIR)/lib1535-warnless.Tpo -c -o ../../lib/lib1535-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/lib1535-warnless.Tpo ../../lib/$(DEPDIR)/lib1535-warnless.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/warnless.c' object='../../lib/lib1535-warnless.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1535-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c + +../../lib/lib1535-warnless.obj: ../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../../lib/lib1535-warnless.obj -MD -MP -MF ../../lib/$(DEPDIR)/lib1535-warnless.Tpo -c -o ../../lib/lib1535-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/lib1535-warnless.Tpo ../../lib/$(DEPDIR)/lib1535-warnless.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/warnless.c' object='../../lib/lib1535-warnless.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1535_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1535-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` + +lib1536-lib1536.o: lib1536.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1536-lib1536.o -MD -MP -MF $(DEPDIR)/lib1536-lib1536.Tpo -c -o lib1536-lib1536.o `test -f 'lib1536.c' || echo '$(srcdir)/'`lib1536.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1536-lib1536.Tpo $(DEPDIR)/lib1536-lib1536.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib1536.c' object='lib1536-lib1536.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1536-lib1536.o `test -f 'lib1536.c' || echo '$(srcdir)/'`lib1536.c + +lib1536-lib1536.obj: lib1536.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1536-lib1536.obj -MD -MP -MF $(DEPDIR)/lib1536-lib1536.Tpo -c -o lib1536-lib1536.obj `if test -f 'lib1536.c'; then $(CYGPATH_W) 'lib1536.c'; else $(CYGPATH_W) '$(srcdir)/lib1536.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1536-lib1536.Tpo $(DEPDIR)/lib1536-lib1536.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib1536.c' object='lib1536-lib1536.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1536-lib1536.obj `if test -f 'lib1536.c'; then $(CYGPATH_W) 'lib1536.c'; else $(CYGPATH_W) '$(srcdir)/lib1536.c'; fi` + +lib1536-first.o: first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1536-first.o -MD -MP -MF $(DEPDIR)/lib1536-first.Tpo -c -o lib1536-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1536-first.Tpo $(DEPDIR)/lib1536-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='first.c' object='lib1536-first.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1536-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c + +lib1536-first.obj: first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1536-first.obj -MD -MP -MF $(DEPDIR)/lib1536-first.Tpo -c -o lib1536-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1536-first.Tpo $(DEPDIR)/lib1536-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='first.c' object='lib1536-first.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1536-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi` + +lib1536-testutil.o: testutil.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1536-testutil.o -MD -MP -MF $(DEPDIR)/lib1536-testutil.Tpo -c -o lib1536-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1536-testutil.Tpo $(DEPDIR)/lib1536-testutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testutil.c' object='lib1536-testutil.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1536-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c + +lib1536-testutil.obj: testutil.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1536-testutil.obj -MD -MP -MF $(DEPDIR)/lib1536-testutil.Tpo -c -o lib1536-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1536-testutil.Tpo $(DEPDIR)/lib1536-testutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testutil.c' object='lib1536-testutil.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1536-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi` + +../../lib/lib1536-warnless.o: ../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../../lib/lib1536-warnless.o -MD -MP -MF ../../lib/$(DEPDIR)/lib1536-warnless.Tpo -c -o ../../lib/lib1536-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/lib1536-warnless.Tpo ../../lib/$(DEPDIR)/lib1536-warnless.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/warnless.c' object='../../lib/lib1536-warnless.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1536-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c + +../../lib/lib1536-warnless.obj: ../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../../lib/lib1536-warnless.obj -MD -MP -MF ../../lib/$(DEPDIR)/lib1536-warnless.Tpo -c -o ../../lib/lib1536-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/lib1536-warnless.Tpo ../../lib/$(DEPDIR)/lib1536-warnless.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/warnless.c' object='../../lib/lib1536-warnless.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1536_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1536-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` + lib1900-lib1900.o: lib1900.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1900_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1900-lib1900.o -MD -MP -MF $(DEPDIR)/lib1900-lib1900.Tpo -c -o lib1900-lib1900.o `test -f 'lib1900.c' || echo '$(srcdir)/'`lib1900.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1900-lib1900.Tpo $(DEPDIR)/lib1900-lib1900.Po diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 7ae66d797..66628aae1 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -23,7 +23,8 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506 lib1507 lib1508 \ lib1509 lib1510 lib1511 lib1512 lib1513 lib1514 lib1515 lib1517 \ lib1520 \ - lib1525 lib1526 lib1527 lib1528 lib1529 lib1530 lib1531 \ + lib1525 lib1526 lib1527 lib1528 lib1529 lib1530 lib1531 lib1532 lib1533 \ + lib1534 lib1535 lib1536 \ lib1900 \ lib2033 @@ -391,6 +392,26 @@ lib1531_SOURCES = lib1531.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1531_LDADD = $(TESTUTIL_LIBS) lib1531_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1531 +lib1532_SOURCES = lib1532.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1532_LDADD = $(TESTUTIL_LIBS) +lib1532_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1532 + +lib1533_SOURCES = lib1533.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1533_LDADD = $(TESTUTIL_LIBS) +lib1533_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1533 + +lib1534_SOURCES = lib1534.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1534_LDADD = $(TESTUTIL_LIBS) +lib1534_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1534 + +lib1535_SOURCES = lib1535.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1535_LDADD = $(TESTUTIL_LIBS) +lib1535_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1535 + +lib1536_SOURCES = lib1536.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1536_LDADD = $(TESTUTIL_LIBS) +lib1536_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1536 + lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1900_LDADD = $(TESTUTIL_LIBS) lib1900_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/tests/libtest/lib1500.c b/tests/libtest/lib1500.c index f3c495869..73d23a1b7 100644 --- a/tests/libtest/lib1500.c +++ b/tests/libtest/lib1500.c @@ -29,8 +29,8 @@ int test(char *URL) { - CURL* curls = NULL; - CURLM* multi = NULL; + CURL *curls = NULL; + CURLM *multi = NULL; int still_running; int i = TEST_ERR_FAILURE; int res = 0; diff --git a/tests/libtest/lib1502.c b/tests/libtest/lib1502.c index e4e1a162a..bd555cbaf 100644 --- a/tests/libtest/lib1502.c +++ b/tests/libtest/lib1502.c @@ -41,8 +41,8 @@ int test(char *URL) { - CURL* easy = NULL; - CURLM* multi = NULL; + CURL *easy = NULL; + CURLM *multi = NULL; int still_running; int res = 0; diff --git a/tests/libtest/lib1507.c b/tests/libtest/lib1507.c index 5a7994ebd..7ab305711 100644 --- a/tests/libtest/lib1507.c +++ b/tests/libtest/lib1507.c @@ -68,7 +68,7 @@ int test(char *URL) CURLM *mcurl = NULL; int still_running = 1; struct timeval mp_start; - struct curl_slist* rcpt_list = NULL; + struct curl_slist *rcpt_list = NULL; curl_global_init(CURL_GLOBAL_DEFAULT); diff --git a/tests/libtest/lib1511.c b/tests/libtest/lib1511.c index bec316711..e1840e76f 100644 --- a/tests/libtest/lib1511.c +++ b/tests/libtest/lib1511.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -26,7 +26,7 @@ int test(char *URL) { long unmet; - CURL* curl = NULL; + CURL *curl = NULL; int res = 0; global_init(CURL_GLOBAL_ALL); diff --git a/tests/libtest/lib1515.c b/tests/libtest/lib1515.c index 2fd19bb7b..7763c2233 100644 --- a/tests/libtest/lib1515.c +++ b/tests/libtest/lib1515.c @@ -113,7 +113,7 @@ test_cleanup: int test(char *URL) { - CURLM* multi = NULL; + CURLM *multi = NULL; int res = 0; char *address = libtest_arg2; char *port = libtest_arg3; @@ -136,7 +136,8 @@ int test(char *URL) "http://testserver.example.com:%s/%s%04d", port, path, i); /* second request must succeed like the first one */ - if((res = do_one_request(multi, target_url, dns_entry))) + res = do_one_request(multi, target_url, dns_entry); + if(res) goto test_cleanup; if(i < count) diff --git a/tests/libtest/lib1520.c b/tests/libtest/lib1520.c index a4ce79b50..4d5b0c88c 100644 --- a/tests/libtest/lib1520.c +++ b/tests/libtest/lib1520.c @@ -81,7 +81,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib1525.c b/tests/libtest/lib1525.c index c58ebeda9..39d51bb11 100644 --- a/tests/libtest/lib1525.c +++ b/tests/libtest/lib1525.c @@ -56,7 +56,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib1526.c b/tests/libtest/lib1526.c index ef66a484d..b2d2a4118 100644 --- a/tests/libtest/lib1526.c +++ b/tests/libtest/lib1526.c @@ -54,7 +54,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib1527.c b/tests/libtest/lib1527.c index f008cf1e4..5dec7fcc0 100644 --- a/tests/libtest/lib1527.c +++ b/tests/libtest/lib1527.c @@ -55,7 +55,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib1528.c b/tests/libtest/lib1528.c index 09af481f4..a130c49af 100644 --- a/tests/libtest/lib1528.c +++ b/tests/libtest/lib1528.c @@ -37,7 +37,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib1529.c b/tests/libtest/lib1529.c index 3333ae698..c63a109b8 100644 --- a/tests/libtest/lib1529.c +++ b/tests/libtest/lib1529.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -36,7 +36,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib1530.c b/tests/libtest/lib1530.c index d1ca34c2a..6fc69f251 100644 --- a/tests/libtest/lib1530.c +++ b/tests/libtest/lib1530.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -46,7 +46,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib1532.c b/tests/libtest/lib1532.c new file mode 100644 index 000000000..4a3ff3245 --- /dev/null +++ b/tests/libtest/lib1532.c @@ -0,0 +1,80 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "test.h" + +#include "memdebug.h" + +/* Test CURLINFO_RESPONSE_CODE */ + +int test(char *URL) +{ + CURL *curl; + long httpcode; + int res = CURLE_OK; + + global_init(CURL_GLOBAL_ALL); + + easy_init(curl); + + easy_setopt(curl, CURLOPT_URL, URL); + + res = curl_easy_perform(curl); + if(res) { + fprintf(stderr, "%s:%d curl_easy_perform() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + + res = curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpcode); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(httpcode != 200) { + fprintf(stderr, "%s:%d unexpected response code %ld\n", + __FILE__, __LINE__, httpcode); + res = CURLE_HTTP_RETURNED_ERROR; + goto test_cleanup; + } + + /* Test for a regression of github bug 1017 (response code does not reset) */ + curl_easy_reset(curl); + + res = curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpcode); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(httpcode != 0) { + fprintf(stderr, "%s:%d curl_easy_reset failed to zero the response code\n" + "possible regression of github bug 1017\n", __FILE__, __LINE__); + res = CURLE_HTTP_RETURNED_ERROR; + goto test_cleanup; + } + +test_cleanup: + curl_easy_cleanup(curl); + curl_global_cleanup(); + return res; +} diff --git a/tests/libtest/lib1533.c b/tests/libtest/lib1533.c new file mode 100644 index 000000000..ada94b940 --- /dev/null +++ b/tests/libtest/lib1533.c @@ -0,0 +1,200 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ + +/* + * This test sends data with CURLOPT_KEEP_SENDING_ON_ERROR. + * The server responds with an early error response. + * The test is successful if the connection can be reused for the next request, + * because this implies that the data has been sent completely to the server. + */ + +#include "test.h" + +#include "memdebug.h" + +struct cb_data { + CURL *easy_handle; + int response_received; + int paused; + size_t remaining_bytes; +}; + + +static void reset_data(struct cb_data *data, CURL *curl) +{ + data->easy_handle = curl; + data->response_received = 0; + data->paused = 0; + data->remaining_bytes = 3; +} + + +static size_t read_callback(void *ptr, size_t size, size_t nitems, + void *userdata) +{ + struct cb_data *data = (struct cb_data *)userdata; + + /* wait until the server has sent all response headers */ + if(data->response_received) { + size_t totalsize = nitems * size; + + size_t bytes_to_send = data->remaining_bytes; + if(bytes_to_send > totalsize) { + bytes_to_send = totalsize; + } + + memset(ptr, 'a', bytes_to_send); + data->remaining_bytes -= bytes_to_send; + + return bytes_to_send; + } + else { + data->paused = 1; + return CURL_READFUNC_PAUSE; + } +} + + +static size_t write_callback(char *ptr, size_t size, size_t nmemb, + void *userdata) +{ + struct cb_data *data = (struct cb_data *)userdata; + size_t totalsize = nmemb * size; + + /* unused parameter */ + (void)ptr; + + /* all response headers have been received */ + data->response_received = 1; + + if(data->paused) { + /* continue to send request body data */ + data->paused = 0; + curl_easy_pause(data->easy_handle, CURLPAUSE_CONT); + } + + return totalsize; +} + + +static int perform_and_check_connections(CURL *curl, const char *description, + long expected_connections) +{ + CURLcode res; + long connections = 0; + + res = curl_easy_perform(curl); + if(res != CURLE_OK) { + fprintf(stderr, "curl_easy_perform() failed\n"); + return TEST_ERR_MAJOR_BAD; + } + + res = curl_easy_getinfo(curl, CURLINFO_NUM_CONNECTS, &connections); + if(res != CURLE_OK) { + fprintf(stderr, "curl_easy_getinfo() failed\n"); + return TEST_ERR_MAJOR_BAD; + } + + fprintf(stderr, "%s: expected: %ld connections; actual: %ld connections\n", + description, expected_connections, connections); + + if(connections != expected_connections) { + return TEST_ERR_FAILURE; + } + + return TEST_ERR_SUCCESS; +} + + +int test(char *URL) +{ + struct cb_data data; + CURL *curl = NULL; + CURLcode res = CURLE_FAILED_INIT; + + if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { + fprintf(stderr, "curl_global_init() failed\n"); + return TEST_ERR_MAJOR_BAD; + } + + curl = curl_easy_init(); + if(curl == NULL) { + fprintf(stderr, "curl_easy_init() failed\n"); + curl_global_cleanup(); + return TEST_ERR_MAJOR_BAD; + } + + reset_data(&data, curl); + + test_setopt(curl, CURLOPT_URL, URL); + test_setopt(curl, CURLOPT_POST, 1L); + test_setopt(curl, CURLOPT_POSTFIELDSIZE_LARGE, + (curl_off_t)data.remaining_bytes); + test_setopt(curl, CURLOPT_VERBOSE, 1L); + test_setopt(curl, CURLOPT_READFUNCTION, read_callback); + test_setopt(curl, CURLOPT_READDATA, &data); + test_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback); + test_setopt(curl, CURLOPT_WRITEDATA, &data); + + res = perform_and_check_connections(curl, + "First request without CURLOPT_KEEP_SENDING_ON_ERROR", 1); + if(res != TEST_ERR_SUCCESS) { + goto test_cleanup; + } + + reset_data(&data, curl); + + res = perform_and_check_connections(curl, + "Second request without CURLOPT_KEEP_SENDING_ON_ERROR", 1); + if(res != TEST_ERR_SUCCESS) { + goto test_cleanup; + } + + test_setopt(curl, CURLOPT_KEEP_SENDING_ON_ERROR, 1L); + + reset_data(&data, curl); + + res = perform_and_check_connections(curl, + "First request with CURLOPT_KEEP_SENDING_ON_ERROR", 1); + if(res != TEST_ERR_SUCCESS) { + goto test_cleanup; + } + + reset_data(&data, curl); + + res = perform_and_check_connections(curl, + "Second request with CURLOPT_KEEP_SENDING_ON_ERROR", 0); + if(res != TEST_ERR_SUCCESS) { + goto test_cleanup; + } + + res = TEST_ERR_SUCCESS; + +test_cleanup: + + curl_easy_cleanup(curl); + + curl_global_cleanup(); + + return (int)res; +} + diff --git a/tests/libtest/lib1534.c b/tests/libtest/lib1534.c new file mode 100644 index 000000000..61e72abb0 --- /dev/null +++ b/tests/libtest/lib1534.c @@ -0,0 +1,129 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "test.h" + +#include "memdebug.h" + +/* Test CURLINFO_FILETIME */ + +int test(char *URL) +{ + CURL *curl, *dupe = NULL; + long filetime; + int res = CURLE_OK; + + global_init(CURL_GLOBAL_ALL); + + easy_init(curl); + + /* Test that a filetime is properly initialized on curl_easy_init. + */ + + res = curl_easy_getinfo(curl, CURLINFO_FILETIME, &filetime); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(filetime != -1) { + fprintf(stderr, "%s:%d filetime init failed; expected -1 but is %ld\n", + __FILE__, __LINE__, filetime); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + easy_setopt(curl, CURLOPT_URL, URL); + easy_setopt(curl, CURLOPT_FILETIME, 1L); + + res = curl_easy_perform(curl); + if(res) { + fprintf(stderr, "%s:%d curl_easy_perform() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + + /* Test that a filetime is properly set after receiving an HTTP resource. + */ + + res = curl_easy_getinfo(curl, CURLINFO_FILETIME, &filetime); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(filetime != 30) { + fprintf(stderr, "%s:%d filetime of http resource is incorrect; " + "expected 30 but is %ld\n", + __FILE__, __LINE__, filetime); + res = CURLE_HTTP_RETURNED_ERROR; + goto test_cleanup; + } + + /* Test that a filetime is properly initialized on curl_easy_duphandle. + */ + + dupe = curl_easy_duphandle(curl); + if(!dupe) { + fprintf(stderr, "%s:%d curl_easy_duphandle() failed\n", + __FILE__, __LINE__); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + res = curl_easy_getinfo(dupe, CURLINFO_FILETIME, &filetime); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(filetime != -1) { + fprintf(stderr, "%s:%d filetime init failed; expected -1 but is %ld\n", + __FILE__, __LINE__, filetime); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + + /* Test that a filetime is properly initialized on curl_easy_reset. + */ + + curl_easy_reset(curl); + + res = curl_easy_getinfo(curl, CURLINFO_FILETIME, &filetime); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(filetime != -1) { + fprintf(stderr, "%s:%d filetime init failed; expected -1 but is %ld\n", + __FILE__, __LINE__, filetime); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + +test_cleanup: + curl_easy_cleanup(curl); + curl_easy_cleanup(dupe); + curl_global_cleanup(); + return res; +} diff --git a/tests/libtest/lib1535.c b/tests/libtest/lib1535.c new file mode 100644 index 000000000..32519f206 --- /dev/null +++ b/tests/libtest/lib1535.c @@ -0,0 +1,128 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "test.h" + +#include "memdebug.h" + +/* Test CURLINFO_PROTOCOL */ + +int test(char *URL) +{ + CURL *curl, *dupe = NULL; + long protocol; + int res = CURLE_OK; + + global_init(CURL_GLOBAL_ALL); + + easy_init(curl); + + /* Test that protocol is properly initialized on curl_easy_init. + */ + + res = curl_easy_getinfo(curl, CURLINFO_PROTOCOL, &protocol); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(protocol != 0) { + fprintf(stderr, "%s:%d protocol init failed; expected 0 but is %ld\n", + __FILE__, __LINE__, protocol); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + easy_setopt(curl, CURLOPT_URL, URL); + + res = curl_easy_perform(curl); + if(res) { + fprintf(stderr, "%s:%d curl_easy_perform() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + + /* Test that a protocol is properly set after receiving an HTTP resource. + */ + + res = curl_easy_getinfo(curl, CURLINFO_PROTOCOL, &protocol); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(protocol != CURLPROTO_HTTP) { + fprintf(stderr, "%s:%d protocol of http resource is incorrect; " + "expected %ld but is %ld\n", + __FILE__, __LINE__, CURLPROTO_HTTP, protocol); + res = CURLE_HTTP_RETURNED_ERROR; + goto test_cleanup; + } + + /* Test that a protocol is properly initialized on curl_easy_duphandle. + */ + + dupe = curl_easy_duphandle(curl); + if(!dupe) { + fprintf(stderr, "%s:%d curl_easy_duphandle() failed\n", + __FILE__, __LINE__); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + res = curl_easy_getinfo(dupe, CURLINFO_PROTOCOL, &protocol); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(protocol != 0) { + fprintf(stderr, "%s:%d protocol init failed; expected 0 but is %ld\n", + __FILE__, __LINE__, protocol); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + + /* Test that a protocol is properly initialized on curl_easy_reset. + */ + + curl_easy_reset(curl); + + res = curl_easy_getinfo(curl, CURLINFO_PROTOCOL, &protocol); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(protocol != 0) { + fprintf(stderr, "%s:%d protocol init failed; expected 0 but is %ld\n", + __FILE__, __LINE__, protocol); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + +test_cleanup: + curl_easy_cleanup(curl); + curl_easy_cleanup(dupe); + curl_global_cleanup(); + return res; +} diff --git a/tests/libtest/lib1536.c b/tests/libtest/lib1536.c new file mode 100644 index 000000000..7f5b61499 --- /dev/null +++ b/tests/libtest/lib1536.c @@ -0,0 +1,129 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "test.h" + +#include "memdebug.h" + +/* Test CURLINFO_SCHEME */ + +int test(char *URL) +{ + CURL *curl, *dupe = NULL; + char *scheme; + int res = CURLE_OK; + + global_init(CURL_GLOBAL_ALL); + + easy_init(curl); + + /* Test that scheme is properly initialized on curl_easy_init. + */ + + res = curl_easy_getinfo(curl, CURLINFO_SCHEME, &scheme); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(scheme != NULL) { + fprintf(stderr, "%s:%d scheme init failed; expected NULL\n", + __FILE__, __LINE__); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + easy_setopt(curl, CURLOPT_URL, URL); + + res = curl_easy_perform(curl); + if(res) { + fprintf(stderr, "%s:%d curl_easy_perform() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + + /* Test that a scheme is properly set after receiving an HTTP resource. + */ + + res = curl_easy_getinfo(curl, CURLINFO_SCHEME, &scheme); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(memcmp(scheme, "HTTP", 5) != 0) { + fprintf(stderr, "%s:%d scheme of http resource is incorrect; " + "expected 'HTTP' but is %s\n", + __FILE__, __LINE__, CURLPROTO_HTTP, + (scheme == NULL ? "NULL" : "invalid")); + res = CURLE_HTTP_RETURNED_ERROR; + goto test_cleanup; + } + + /* Test that a scheme is properly initialized on curl_easy_duphandle. + */ + + dupe = curl_easy_duphandle(curl); + if(!dupe) { + fprintf(stderr, "%s:%d curl_easy_duphandle() failed\n", + __FILE__, __LINE__); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + res = curl_easy_getinfo(dupe, CURLINFO_SCHEME, &scheme); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(scheme != 0) { + fprintf(stderr, "%s:%d scheme init failed; expected NULL\n", + __FILE__, __LINE__); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + + + /* Test that a scheme is properly initialized on curl_easy_reset. + */ + + curl_easy_reset(curl); + + res = curl_easy_getinfo(curl, CURLINFO_SCHEME, &scheme); + if(res) { + fprintf(stderr, "%s:%d curl_easy_getinfo() failed with code %d (%s)\n", + __FILE__, __LINE__, res, curl_easy_strerror(res)); + goto test_cleanup; + } + if(scheme != 0) { + fprintf(stderr, "%s:%d scheme init failed; expected NULL\n", + __FILE__, __LINE__); + res = CURLE_FAILED_INIT; + goto test_cleanup; + } + +test_cleanup: + curl_easy_cleanup(curl); + curl_easy_cleanup(dupe); + curl_global_cleanup(); + return res; +} diff --git a/tests/libtest/lib500.c b/tests/libtest/lib500.c index 43b05982c..d17b24b20 100644 --- a/tests/libtest/lib500.c +++ b/tests/libtest/lib500.c @@ -68,7 +68,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c index 2a105f0cd..7a2341246 100644 --- a/tests/libtest/lib501.c +++ b/tests/libtest/lib501.c @@ -35,7 +35,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c index 8de30c20b..b8db83cb6 100644 --- a/tests/libtest/lib506.c +++ b/tests/libtest/lib506.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -37,7 +37,7 @@ struct userdata { int counter; }; -int lock[3]; +static int locks[3]; /* lock callback */ static void my_lock(CURL *handle, curl_lock_data data, @@ -50,7 +50,7 @@ static void my_lock(CURL *handle, curl_lock_data data, (void)handle; (void)laccess; - switch (data) { + switch(data) { case CURL_LOCK_DATA_SHARE: what = "share"; locknum = 0; @@ -69,11 +69,11 @@ static void my_lock(CURL *handle, curl_lock_data data, } /* detect locking of locked locks */ - if(lock[locknum]) { + if(locks[locknum]) { printf("lock: double locked %s\n", what); return; } - lock[locknum]++; + locks[locknum]++; printf("lock: %-6s [%s]: %d\n", what, user->text, user->counter); user->counter++; @@ -86,7 +86,7 @@ static void my_unlock(CURL *handle, curl_lock_data data, void *useptr) struct userdata *user = (struct userdata *)useptr; int locknum; (void)handle; - switch (data) { + switch(data) { case CURL_LOCK_DATA_SHARE: what = "share"; locknum = 0; @@ -105,11 +105,11 @@ static void my_unlock(CURL *handle, curl_lock_data data, void *useptr) } /* detect unlocking of unlocked locks */ - if(!lock[locknum]) { + if(!locks[locknum]) { printf("unlock: double unlocked %s\n", what); return; } - lock[locknum]--; + locks[locknum]--; printf("unlock: %-6s [%s]: %d\n", what, user->text, user->counter); user->counter++; @@ -195,7 +195,8 @@ int test(char *URL) /* prepare share */ printf("SHARE_INIT\n"); - if((share = curl_share_init()) == NULL) { + share = curl_share_init(); + if(!share) { fprintf(stderr, "curl_share_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; @@ -230,7 +231,8 @@ int test(char *URL) } /* initial cookie manipulation */ - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_share_cleanup(share); curl_global_cleanup(); @@ -275,7 +277,8 @@ int test(char *URL) /* fetch a another one and save cookies */ printf("*** run %d\n", i); - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_share_cleanup(share); curl_global_cleanup(); @@ -302,7 +305,8 @@ int test(char *URL) curl_slist_free_all(headers); /* load cookies */ - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_share_cleanup(share); curl_global_cleanup(); diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c index 74879929b..ebe897ac8 100644 --- a/tests/libtest/lib507.c +++ b/tests/libtest/lib507.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -29,8 +29,8 @@ int test(char *URL) { - CURL* curls = NULL; - CURLM* multi = NULL; + CURL *curls = NULL; + CURLM *multi = NULL; int still_running; int i = -1; int res = 0; diff --git a/tests/libtest/lib508.c b/tests/libtest/lib508.c index cb60ce1bd..1f6c6838a 100644 --- a/tests/libtest/lib508.c +++ b/tests/libtest/lib508.c @@ -62,7 +62,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib509.c b/tests/libtest/lib509.c index 085a9753e..a2522eb85 100644 --- a/tests/libtest/lib509.c +++ b/tests/libtest/lib509.c @@ -122,7 +122,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib510.c b/tests/libtest/lib510.c index cb5296ec3..68588cfe6 100644 --- a/tests/libtest/lib510.c +++ b/tests/libtest/lib510.c @@ -68,7 +68,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib511.c b/tests/libtest/lib511.c index 0b7ae6f43..2467bf0b0 100644 --- a/tests/libtest/lib511.c +++ b/tests/libtest/lib511.c @@ -33,7 +33,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c index 58091ef6a..7c34bc4db 100644 --- a/tests/libtest/lib513.c +++ b/tests/libtest/lib513.c @@ -42,7 +42,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib514.c b/tests/libtest/lib514.c index f516d0942..7b33d52f9 100644 --- a/tests/libtest/lib514.c +++ b/tests/libtest/lib514.c @@ -33,7 +33,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib515.c b/tests/libtest/lib515.c index d3e6e446a..6fb178720 100644 --- a/tests/libtest/lib515.c +++ b/tests/libtest/lib515.c @@ -33,7 +33,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib516.c b/tests/libtest/lib516.c index 9faf262c6..00c54c450 100644 --- a/tests/libtest/lib516.c +++ b/tests/libtest/lib516.c @@ -33,7 +33,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib517.c b/tests/libtest/lib517.c index 2f68ebd24..22162ff1e 100644 --- a/tests/libtest/lib517.c +++ b/tests/libtest/lib517.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -116,6 +116,12 @@ static const char * const dates[]={ "20111323 12:34:56", "20110623 12:34:79", "Wed, 31 Dec 2008 23:59:60 GMT", /* leap second */ + "20110623 12:3", + "20110623 1:3", + "20110623 1:30", + "20110623 12:12:3", + "20110623 01:12:3", + "20110623 01:99:30", NULL }; diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c index e37a7771d..960fcfca2 100644 --- a/tests/libtest/lib518.c +++ b/tests/libtest/lib518.c @@ -489,7 +489,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); close_file_descriptors(); curl_global_cleanup(); diff --git a/tests/libtest/lib519.c b/tests/libtest/lib519.c index 6e3059892..5c55aebe6 100644 --- a/tests/libtest/lib519.c +++ b/tests/libtest/lib519.c @@ -33,7 +33,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib520.c b/tests/libtest/lib520.c index b5a71da27..72b0875ed 100644 --- a/tests/libtest/lib520.c +++ b/tests/libtest/lib520.c @@ -33,7 +33,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib521.c b/tests/libtest/lib521.c index 40f4def4f..b7efca0be 100644 --- a/tests/libtest/lib521.c +++ b/tests/libtest/lib521.c @@ -33,7 +33,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib523.c b/tests/libtest/lib523.c index f3264690d..44aa2e2e9 100644 --- a/tests/libtest/lib523.c +++ b/tests/libtest/lib523.c @@ -33,7 +33,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib524.c b/tests/libtest/lib524.c index 3440562b2..08fd34dfc 100644 --- a/tests/libtest/lib524.c +++ b/tests/libtest/lib524.c @@ -33,7 +33,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index c1561419a..6d7c3e40f 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -491,7 +491,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); close_file_descriptors(); curl_global_cleanup(); diff --git a/tests/libtest/lib539.c b/tests/libtest/lib539.c index 9f0f8fabf..7c03dd2fd 100644 --- a/tests/libtest/lib539.c +++ b/tests/libtest/lib539.c @@ -35,14 +35,15 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; } /* - * Begin with cURL set to use a single CWD to the URL's directory. + * Begin with curl set to use a single CWD to the URL's directory. */ test_setopt(curl, CURLOPT_URL, URL); test_setopt(curl, CURLOPT_VERBOSE, 1L); @@ -53,7 +54,7 @@ int test(char *URL) /* * Change the FTP_FILEMETHOD option to use full paths rather than a CWD * command. Alter the URL's path a bit, appending a "./". Use an innocuous - * QUOTE command, after which cURL will CWD to ftp_conn->entrypath and then + * QUOTE command, after which curl will CWD to ftp_conn->entrypath and then * (on the next call to ftp_statemach_act) find a non-zero ftpconn->dirdepth * even though no directories are stored in the ftpconn->dirs array (after a * call to freedirs). @@ -65,7 +66,7 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - slist = curl_slist_append (NULL, "SYST"); + slist = curl_slist_append(NULL, "SYST"); if(slist == NULL) { free(newURL); curl_easy_cleanup(curl); diff --git a/tests/libtest/lib540.c b/tests/libtest/lib540.c index 9b3b5a40e..f5d89c41d 100644 --- a/tests/libtest/lib540.c +++ b/tests/libtest/lib540.c @@ -48,7 +48,7 @@ CURL *eh[NUM_HANDLES]; -static int init(int num, CURLM *cm, const char* url, const char* userpwd, +static int init(int num, CURLM *cm, const char *url, const char *userpwd, struct curl_slist *headers) { int res = 0; @@ -99,7 +99,7 @@ init_failed: return res; /* failure */ } -static int loop(int num, CURLM *cm, const char* url, const char* userpwd, +static int loop(int num, CURLM *cm, const char *url, const char *userpwd, struct curl_slist *headers) { CURLMsg *msg; diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c index 604446a2e..3e9cb3ccd 100644 --- a/tests/libtest/lib541.c +++ b/tests/libtest/lib541.c @@ -79,7 +79,8 @@ int test(char *URL) } /* get a curl handle */ - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); fclose(hd_src); diff --git a/tests/libtest/lib542.c b/tests/libtest/lib542.c index c82ccd5b7..4016874e1 100644 --- a/tests/libtest/lib542.c +++ b/tests/libtest/lib542.c @@ -42,7 +42,8 @@ int test(char *URL) } /* get a curl handle */ - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib543.c b/tests/libtest/lib543.c index 8fec052d2..6d2532d12 100644 --- a/tests/libtest/lib543.c +++ b/tests/libtest/lib543.c @@ -36,14 +36,15 @@ int test(char *URL) char *s; (void)URL; - if((easy = curl_easy_init()) == NULL) { + easy = curl_easy_init(); + if(!easy) { fprintf(stderr, "curl_easy_init() failed\n"); return TEST_ERR_MAJOR_BAD; } asize = (int)sizeof(a); - s = curl_easy_escape(easy, (char*)a, asize); + s = curl_easy_escape(easy, (char *)a, asize); if(s) printf("%s\n", s); diff --git a/tests/libtest/lib544.c b/tests/libtest/lib544.c index 4b08a0a76..28eacdaf6 100644 --- a/tests/libtest/lib544.c +++ b/tests/libtest/lib544.c @@ -47,7 +47,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib547.c b/tests/libtest/lib547.c index 4ec42a330..ce967c085 100644 --- a/tests/libtest/lib547.c +++ b/tests/libtest/lib547.c @@ -90,7 +90,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c index 137029548..1d832b536 100644 --- a/tests/libtest/lib549.c +++ b/tests/libtest/lib549.c @@ -38,7 +38,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c index 9fe4a7168..c1266c763 100644 --- a/tests/libtest/lib552.c +++ b/tests/libtest/lib552.c @@ -89,7 +89,7 @@ int my_trace(CURL *handle, curl_infotype type, const char *text; (void)handle; /* prevent compiler warning */ - switch (type) { + switch(type) { case CURLINFO_TEXT: fprintf(stderr, "== Info: %s", (char *)data); default: /* in case a new one is introduced to shock us */ @@ -147,11 +147,11 @@ static size_t write_callback(void *ptr, size_t size, size_t nmemb, } -static curlioerr ioctl_callback(CURL * handle, int cmd, void *clientp) +static curlioerr ioctl_callback(CURL *handle, int cmd, void *clientp) { (void)clientp; if(cmd == CURLIOCMD_RESTARTREAD) { - printf("APPLICATION: recieved a CURLIOCMD_RESTARTREAD request\n"); + printf("APPLICATION: received a CURLIOCMD_RESTARTREAD request\n"); printf("APPLICATION: ** REWINDING! **\n"); current_offset = 0; return CURLIOE_OK; @@ -172,7 +172,8 @@ int test(char *URL) config.trace_ascii = 1; /* enable ascii tracing */ - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib553.c b/tests/libtest/lib553.c index 9afaad48f..288f4c1d1 100644 --- a/tests/libtest/lib553.c +++ b/tests/libtest/lib553.c @@ -67,7 +67,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib554.c b/tests/libtest/lib554.c index 803df26d1..083746243 100644 --- a/tests/libtest/lib554.c +++ b/tests/libtest/lib554.c @@ -162,7 +162,8 @@ static int once(char *URL, bool oldstyle) if(formrc) printf("curl_formadd(4) = %d\n", (int)formrc); - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_formfree(formpost); curl_global_cleanup(); diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c index 527935396..f06c5299c 100644 --- a/tests/libtest/lib556.c +++ b/tests/libtest/lib556.c @@ -45,7 +45,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; @@ -76,11 +77,10 @@ int test(char *URL) if(!res) { /* we assume that sending always work */ - size_t total=0; do { /* busy-read like crazy */ - res = curl_easy_recv(curl, buf, 1024, &iolen); + res = curl_easy_recv(curl, buf, sizeof(buf), &iolen); #ifdef TPF sleep(1); /* avoid ctl-10 dump */ @@ -91,10 +91,12 @@ int test(char *URL) if(!write(STDOUT_FILENO, buf, iolen)) break; } - total += iolen; - } while(((res == CURLE_OK) || (res == CURLE_AGAIN)) && (total < 129)); + } while((res == CURLE_OK && iolen != 0) || (res == CURLE_AGAIN)); } + + if(res != CURLE_OK || iolen != 0) + return TEST_ERR_FAILURE; } test_cleanup: diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c index 5bdb8abe0..68fdfa2b1 100644 --- a/tests/libtest/lib557.c +++ b/tests/libtest/lib557.c @@ -1345,7 +1345,6 @@ static int test_curl_off_t_formatting(void) num_cofft_tests = i; #endif - /* !checksrc! enable LONGLINE */ for(i=1; i<=num_cofft_tests; i++) { @@ -1374,16 +1373,31 @@ static int test_curl_off_t_formatting(void) return failed; } -static int string_check(char *buf, const char *buf2) +static int _string_check(int linenumber, char *buf, const char *buf2) { if(strcmp(buf, buf2)) { /* they shouldn't differ */ - printf("sprintf failed:\nwe '%s'\nsystem: '%s'\n", - buf, buf2); + printf("sprintf line %d failed:\nwe '%s'\nsystem: '%s'\n", + linenumber, buf, buf2); return 1; } return 0; } +#define string_check(x,y) _string_check(__LINE__, x, y) + +static int _strlen_check(int linenumber, char *buf, size_t len) +{ + size_t buflen = strlen(buf); + if(len != buflen) { + /* they shouldn't differ */ + printf("sprintf strlen:%d failed:\nwe '%d'\nsystem: '%d'\n", + linenumber, buflen, len); + return 1; + } + return 0; +} + +#define strlen_check(x,y) _strlen_check(__LINE__, x, y) /* * The output strings in this test need to have been verified with a system @@ -1422,11 +1436,228 @@ static int test_string_formatting(void) return errors; } +static int test_weird_arguments(void) +{ + int errors = 0; + char buf[256]; + int rc; + + /* MAX_PARAMETERS is 128, try exact 128! */ + rc = curl_msnprintf(buf, sizeof(buf), + "%d%d%d%d%d%d%d%d%d%d" /* 10 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 1 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 2 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 3 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 4 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 5 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 6 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 7 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 8 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 9 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 10 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 11 */ + "%d%d%d%d%d%d%d%d" /* 8 */ + , + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 1 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 2 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 3 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 4 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 5 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 6 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 7 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 8 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 9 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 10 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 11 */ + 0, 1, 2, 3, 4, 5, 6, 7); /* 8 */ + + if(rc != 128) { + printf("curl_mprintf() returned %d and not 128!\n", rc); + errors++; + } + + errors += string_check(buf, + "0123456789" /* 10 */ + "0123456789" /* 10 1 */ + "0123456789" /* 10 2 */ + "0123456789" /* 10 3 */ + "0123456789" /* 10 4 */ + "0123456789" /* 10 5 */ + "0123456789" /* 10 6 */ + "0123456789" /* 10 7 */ + "0123456789" /* 10 8 */ + "0123456789" /* 10 9 */ + "0123456789" /* 10 10*/ + "0123456789" /* 10 11 */ + "01234567" /* 8 */ + ); + + /* MAX_PARAMETERS is 128, try more! */ + buf[0] = 0; + rc = curl_msnprintf(buf, sizeof(buf), + "%d%d%d%d%d%d%d%d%d%d" /* 10 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 1 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 2 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 3 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 4 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 5 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 6 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 7 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 8 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 9 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 10 */ + "%d%d%d%d%d%d%d%d%d%d" /* 10 11 */ + "%d%d%d%d%d%d%d%d%d" /* 9 */ + , + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 1 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 2 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 3 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 4 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 5 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 6 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 7 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 8 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 9 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 10 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, /* 10 11 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8); /* 9 */ + + if(rc != -1) { + printf("curl_mprintf() returned %d and not -1!\n", rc); + errors++; + } + + errors += string_check(buf, ""); + + if(errors) + printf("Some curl_mprintf() weird arguments tests failed!\n"); + + return errors; +} + +/* DBL_MAX value from Linux */ +#define MAXIMIZE -1.7976931348623157081452E+308 + +static int test_float_formatting(void) +{ + int errors = 0; + char buf[512]; /* larger than max float size */ + curl_msnprintf(buf, sizeof(buf), "%f", 9.0); + errors += string_check(buf, "9.000000"); + + curl_msnprintf(buf, sizeof(buf), "%.1f", 9.1); + errors += string_check(buf, "9.1"); + + curl_msnprintf(buf, sizeof(buf), "%.2f", 9.1); + errors += string_check(buf, "9.10"); + + curl_msnprintf(buf, sizeof(buf), "%.0f", 9.1); + errors += string_check(buf, "9"); + + curl_msnprintf(buf, sizeof(buf), "%0f", 9.1); + errors += string_check(buf, "9.100000"); + + curl_msnprintf(buf, sizeof(buf), "%10f", 9.1); + errors += string_check(buf, " 9.100000"); + + curl_msnprintf(buf, sizeof(buf), "%10.3f", 9.1); + errors += string_check(buf, " 9.100"); + + curl_msnprintf(buf, sizeof(buf), "%-10.3f", 9.1); + errors += string_check(buf, "9.100 "); + + curl_msnprintf(buf, sizeof(buf), "%-10.3f", 9.123456); + errors += string_check(buf, "9.123 "); + + curl_msnprintf(buf, sizeof(buf), "%.-2f", 9.1); + errors += string_check(buf, "9.100000"); + + curl_msnprintf(buf, sizeof(buf), "%*f", 10, 9.1); + errors += string_check(buf, " 9.100000"); + + curl_msnprintf(buf, sizeof(buf), "%*f", 3, 9.1); + errors += string_check(buf, "9.100000"); + + curl_msnprintf(buf, sizeof(buf), "%*f", 6, 9.2987654); + errors += string_check(buf, "9.298765"); + + curl_msnprintf(buf, sizeof(buf), "%*f", 6, 9.298765); + errors += string_check(buf, "9.298765"); + + curl_msnprintf(buf, sizeof(buf), "%*f", 6, 9.29876); + errors += string_check(buf, "9.298760"); + + curl_msnprintf(buf, sizeof(buf), "%.*f", 6, 9.2987654); + errors += string_check(buf, "9.298765"); + curl_msnprintf(buf, sizeof(buf), "%.*f", 5, 9.2987654); + errors += string_check(buf, "9.29877"); + curl_msnprintf(buf, sizeof(buf), "%.*f", 4, 9.2987654); + errors += string_check(buf, "9.2988"); + curl_msnprintf(buf, sizeof(buf), "%.*f", 3, 9.2987654); + errors += string_check(buf, "9.299"); + curl_msnprintf(buf, sizeof(buf), "%.*f", 2, 9.2987654); + errors += string_check(buf, "9.30"); + curl_msnprintf(buf, sizeof(buf), "%.*f", 1, 9.2987654); + errors += string_check(buf, "9.3"); + curl_msnprintf(buf, sizeof(buf), "%.*f", 0, 9.2987654); + errors += string_check(buf, "9"); + + /* very large precisions easily turn into system specific outputs so we only + check the output buffer length here as we know the internal limit */ + + curl_msnprintf(buf, sizeof(buf), "%.*f", (1<<30), 9.2987654); + errors += strlen_check(buf, 325); + + curl_msnprintf(buf, sizeof(buf), "%10000.10000f", 9.2987654); + errors += strlen_check(buf, 325); + + curl_msnprintf(buf, sizeof(buf), "%240.10000f", + 123456789123456789123456789.2987654); + errors += strlen_check(buf, 325); + + /* 1<<31 turns negative (-2147483648) when used signed */ + curl_msnprintf(buf, sizeof(buf), "%*f", (1<<31), 9.1); + errors += string_check(buf, "9.100000"); + + /* curl_msnprintf() limits a single float output to 325 bytes maximum + width */ + curl_msnprintf(buf, sizeof(buf), "%*f", (1<<30), 9.1); + errors += string_check(buf, " 9.100000"); + curl_msnprintf(buf, sizeof(buf), "%100000f", 9.1); + errors += string_check(buf, " 9.100000"); + + curl_msnprintf(buf, sizeof(buf), "%f", MAXIMIZE); + errors += strlen_check(buf, 317); + + curl_msnprintf(buf, 2, "%f", MAXIMIZE); + errors += strlen_check(buf, 1); + curl_msnprintf(buf, 3, "%f", MAXIMIZE); + errors += strlen_check(buf, 2); + curl_msnprintf(buf, 4, "%f", MAXIMIZE); + errors += strlen_check(buf, 3); + curl_msnprintf(buf, 5, "%f", MAXIMIZE); + errors += strlen_check(buf, 4); + curl_msnprintf(buf, 6, "%f", MAXIMIZE); + errors += strlen_check(buf, 5); + + if(!errors) + printf("All float strings tests OK!\n"); + else + printf("test_float_formatting Failed!\n"); + + return errors; +} +/* !checksrc! enable LONGLINE */ + int test(char *URL) { int errors = 0; (void)URL; /* not used */ + errors += test_weird_arguments(); + errors += test_unsigned_short_formatting(); errors += test_signed_short_formatting(); @@ -1443,6 +1674,8 @@ int test(char *URL) errors += test_string_formatting(); + errors += test_float_formatting(); + if(errors) return TEST_ERR_MAJOR_BAD; else diff --git a/tests/libtest/lib562.c b/tests/libtest/lib562.c index 819b50759..285b9f5d0 100644 --- a/tests/libtest/lib562.c +++ b/tests/libtest/lib562.c @@ -46,7 +46,8 @@ int test(char *URL) } /* get a curl handle */ - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib566.c b/tests/libtest/lib566.c index 94a91d5dd..ecf8c5530 100644 --- a/tests/libtest/lib566.c +++ b/tests/libtest/lib566.c @@ -35,7 +35,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib567.c b/tests/libtest/lib567.c index 38e0c0b78..f9f55e3c0 100644 --- a/tests/libtest/lib567.c +++ b/tests/libtest/lib567.c @@ -37,7 +37,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c index 9b3a07787..0cdef812b 100644 --- a/tests/libtest/lib568.c +++ b/tests/libtest/lib568.c @@ -55,7 +55,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; @@ -66,7 +67,8 @@ int test(char *URL) test_setopt(curl, CURLOPT_URL, URL); - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } @@ -100,7 +102,8 @@ int test(char *URL) sdpf = NULL; /* Make sure we can do a normal request now */ - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } @@ -115,7 +118,8 @@ int test(char *URL) /* Now do a POST style one */ - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } @@ -144,7 +148,8 @@ int test(char *URL) custom_headers = NULL; /* Make sure we can do a normal request now */ - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c index 55282b69b..d7381d9a2 100644 --- a/tests/libtest/lib569.c +++ b/tests/libtest/lib569.c @@ -53,7 +53,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); fclose(idfile); @@ -77,7 +78,8 @@ int test(char *URL) /* Go through the various Session IDs */ for(i = 0; i < 3; i++) { - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } @@ -96,7 +98,8 @@ int test(char *URL) fprintf(idfile, "Got Session ID: [%s]\n", rtsp_session_id); rtsp_session_id = NULL; - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c index 2dc57b761..9d9b5a134 100644 --- a/tests/libtest/lib570.c +++ b/tests/libtest/lib570.c @@ -40,7 +40,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; @@ -54,7 +55,8 @@ int test(char *URL) test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_OPTIONS); - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } @@ -74,7 +76,8 @@ int test(char *URL) "RAW/RAW/UDP;unicast;client_port=3056-3057"); test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_SETUP); - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } @@ -88,7 +91,8 @@ int test(char *URL) test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_PLAY); - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c index ad6c366b4..40a78fa84 100644 --- a/tests/libtest/lib571.c +++ b/tests/libtest/lib571.c @@ -50,7 +50,8 @@ static const char *RTP_DATA = "$_1234\n\0asdf"; static int rtp_packet_count = 0; -static size_t rtp_write(void *ptr, size_t size, size_t nmemb, void *stream) { +static size_t rtp_write(void *ptr, size_t size, size_t nmemb, void *stream) +{ char *data = (char *)ptr; int channel = RTP_PKT_CHANNEL(data); int message_size; @@ -117,7 +118,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); fclose(protofile); curl_global_cleanup(); @@ -125,7 +127,8 @@ int test(char *URL) } test_setopt(curl, CURLOPT_URL, URL); - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } @@ -146,7 +149,8 @@ int test(char *URL) goto test_cleanup; /* This PLAY starts the interleave */ - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } @@ -160,7 +164,8 @@ int test(char *URL) goto test_cleanup; /* The DESCRIBE request will try to consume data after the Content */ - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } @@ -173,7 +178,8 @@ int test(char *URL) if(res) goto test_cleanup; - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } diff --git a/tests/libtest/lib572.c b/tests/libtest/lib572.c index 3475e8060..47a9da535 100644 --- a/tests/libtest/lib572.c +++ b/tests/libtest/lib572.c @@ -55,7 +55,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; @@ -69,7 +70,8 @@ int test(char *URL) test_setopt(curl, CURLOPT_URL, URL); /* SETUP */ - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } @@ -83,7 +85,8 @@ int test(char *URL) if(res) goto test_cleanup; - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } @@ -117,7 +120,8 @@ int test(char *URL) paramsf = NULL; /* Heartbeat GET_PARAMETERS */ - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } @@ -131,7 +135,8 @@ int test(char *URL) /* POST GET_PARAMETERS */ - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } @@ -149,7 +154,8 @@ int test(char *URL) test_setopt(curl, CURLOPT_POSTFIELDS, NULL); /* Make sure we can do a normal request now */ - if((stream_uri = suburl(URL, request++)) == NULL) { + stream_uri = suburl(URL, request++); + if(!stream_uri) { res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } diff --git a/tests/libtest/lib574.c b/tests/libtest/lib574.c index 9f9222b39..a51cda05f 100644 --- a/tests/libtest/lib574.c +++ b/tests/libtest/lib574.c @@ -40,7 +40,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib578.c b/tests/libtest/lib578.c index 5e01d36e0..9603b58d7 100644 --- a/tests/libtest/lib578.c +++ b/tests/libtest/lib578.c @@ -58,7 +58,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib579.c b/tests/libtest/lib579.c index aae299ccc..61aa4f5df 100644 --- a/tests/libtest/lib579.c +++ b/tests/libtest/lib579.c @@ -97,7 +97,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c index 444b416ff..eec0455f6 100644 --- a/tests/libtest/lib582.c +++ b/tests/libtest/lib582.c @@ -145,10 +145,10 @@ static int curlTimerCallback(CURLM *multi, long timeout_ms, void *userp) /** * Check for curl completion. */ -static int checkForCompletion(CURLM* curl, int* success) +static int checkForCompletion(CURLM *curl, int *success) { int numMessages; - CURLMsg* message; + CURLMsg *message; int result = 0; *success = 0; while((message = curl_multi_info_read(curl, &numMessages)) != NULL) { diff --git a/tests/libtest/lib583.c b/tests/libtest/lib583.c index 9af48d280..5b11fab2b 100644 --- a/tests/libtest/lib583.c +++ b/tests/libtest/lib583.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -33,8 +33,8 @@ int test(char *URL) { int stillRunning; - CURLM* multiHandle = NULL; - CURL* curl = NULL; + CURLM *multiHandle = NULL; + CURL *curl = NULL; int res = 0; global_init(CURL_GLOBAL_ALL); diff --git a/tests/libtest/lib586.c b/tests/libtest/lib586.c index eb7cfa0a9..a4fc6feee 100644 --- a/tests/libtest/lib586.c +++ b/tests/libtest/lib586.c @@ -45,7 +45,7 @@ static void my_lock(CURL *handle, curl_lock_data data, (void)handle; (void)laccess; - switch (data) { + switch(data) { case CURL_LOCK_DATA_SHARE: what = "share"; break; @@ -72,7 +72,7 @@ static void my_unlock(CURL *handle, curl_lock_data data, void *useptr) const char *what; struct userdata *user = (struct userdata *)useptr; (void)handle; - switch ( data) { + switch(data) { case CURL_LOCK_DATA_SHARE: what = "share"; break; @@ -101,7 +101,8 @@ static void *fire(void *ptr) CURL *curl; int i=0; - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); return NULL; } @@ -148,7 +149,8 @@ int test(char *URL) /* prepare share */ printf("SHARE_INIT\n"); - if((share = curl_share_init()) == NULL) { + share = curl_share_init(); + if(!share) { fprintf(stderr, "curl_share_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; @@ -197,7 +199,8 @@ int test(char *URL) /* fetch a another one */ printf("*** run %d\n", i); - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_share_cleanup(share); curl_global_cleanup(); diff --git a/tests/libtest/lib590.c b/tests/libtest/lib590.c index 7b863cc3f..cc3afdf06 100644 --- a/tests/libtest/lib590.c +++ b/tests/libtest/lib590.c @@ -46,7 +46,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib598.c b/tests/libtest/lib598.c index b107f29d4..c27e60b14 100644 --- a/tests/libtest/lib598.c +++ b/tests/libtest/lib598.c @@ -33,7 +33,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/lib599.c b/tests/libtest/lib599.c index 1dee0b978..843fb2121 100644 --- a/tests/libtest/lib599.c +++ b/tests/libtest/lib599.c @@ -50,7 +50,8 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/libauthretry.c b/tests/libtest/libauthretry.c index 994f9de06..139dab974 100644 --- a/tests/libtest/libauthretry.c +++ b/tests/libtest/libauthretry.c @@ -25,7 +25,6 @@ */ #include "test.h" -#include "strequal.h" #include "memdebug.h" static CURLcode send_request(CURL *curl, const char *url, int seq, @@ -33,7 +32,7 @@ static CURLcode send_request(CURL *curl, const char *url, int seq, { CURLcode res; size_t len = strlen(url) + 4 + 1; - char* full_url = malloc(len); + char *full_url = malloc(len); if(!full_url) { fprintf(stderr, "Not enough memory for full url\n"); return CURLE_OUT_OF_MEMORY; @@ -72,11 +71,11 @@ static long parse_auth_name(const char *arg) { if(!arg) return CURLAUTH_NONE; - if(strequal(arg, "basic")) + if(curl_strequal(arg, "basic")) return CURLAUTH_BASIC; - if(strequal(arg, "digest")) + if(curl_strequal(arg, "digest")) return CURLAUTH_DIGEST; - if(strequal(arg, "ntlm")) + if(curl_strequal(arg, "ntlm")) return CURLAUTH_NTLM; return CURLAUTH_NONE; } @@ -102,7 +101,8 @@ int test(char *url) /* Send wrong password, then right password */ - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; @@ -121,8 +121,8 @@ int test(char *url) curl_easy_cleanup(curl); /* Send wrong password twice, then right password */ - - if((curl = curl_easy_init()) == NULL) { + curl = curl_easy_init(); + if(!curl) { fprintf(stderr, "curl_easy_init() failed\n"); curl_global_cleanup(); return TEST_ERR_MAJOR_BAD; diff --git a/tests/libtest/libntlmconnect.c b/tests/libtest/libntlmconnect.c index 736222dc6..40a837ca6 100644 --- a/tests/libtest/libntlmconnect.c +++ b/tests/libtest/libntlmconnect.c @@ -37,7 +37,7 @@ static CURL *easy[MAX_EASY_HANDLES]; static curl_socket_t sockets[MAX_EASY_HANDLES]; static int res = 0; -static size_t callback(char* ptr, size_t size, size_t nmemb, void* data) +static size_t callback(char *ptr, size_t size, size_t nmemb, void *data) { ssize_t idx = ((CURL **) data) - easy; curl_socket_t sock; @@ -104,7 +104,7 @@ int test(char *url) int num_handles = 0; enum HandleState state = ReadyForNewHandle; size_t urllen = strlen(url) + 4 + 1; - char* full_url = malloc(urllen); + char *full_url = malloc(urllen); start_test_timing(); diff --git a/tests/libtest/test.h b/tests/libtest/test.h index 9fd33aa72..3da03b838 100644 --- a/tests/libtest/test.h +++ b/tests/libtest/test.h @@ -20,6 +20,8 @@ * ***************************************************************************/ +/* !checksrc! disable ASSIGNWITHINCONDITION all */ + /* Now include the curl_setup.h file from libcurl's private libdir (the source version, but that might include "curl_config.h" from the build dir so we need both of them in the include path), so that we get good in-depth diff --git a/tests/libtest/testtrace.c b/tests/libtest/testtrace.c index 958719f61..5eeeeb65d 100644 --- a/tests/libtest/testtrace.c +++ b/tests/libtest/testtrace.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -110,7 +110,7 @@ int libtest_debug_cb(CURL *handle, curl_infotype type, now->tm_hour, now->tm_min, now->tm_sec, (long)tv.tv_usec); } - switch (type) { + switch(type) { case CURLINFO_TEXT: fprintf(stderr, "%s== Info: %s", timestr, (char *)data); default: /* in case a new one is introduced to shock us */ diff --git a/tests/manpage-scan.pl b/tests/manpage-scan.pl index fc6e1e3f0..1cc47eb31 100644 --- a/tests/manpage-scan.pl +++ b/tests/manpage-scan.pl @@ -39,8 +39,9 @@ use strict; use warnings; -# we may get the dir root pointed out +# we may get the dir roots pointed out my $root=$ARGV[0] || "."; +my $buildroot=$ARGV[1] || "."; my $syms = "$root/docs/libcurl/symbols-in-versions"; my $curlh = "$root/include/curl/curl.h"; my $errors=0; @@ -147,10 +148,10 @@ my %opts = ( '-N, --buffer' => 6, '--sessionid' => 6, - # deprecated options do not need to be in curl -h output - '--krb4' => 4, - '--ftp-ssl' => 4, - '--ftp-ssl-reqd' => 4, + # deprecated options do not need to be in tool_help.c nor curl.1 + '--krb4' => 6, + '--ftp-ssl' => 6, + '--ftp-ssl-reqd' => 6, # for tests and debug only, can remain hidden '--test-event' => 6, @@ -196,7 +197,7 @@ close(R); ######################################################################### # parse the curl.1 man page, extract all documented command line options -open(R, "<$root/docs/curl.1") || +open(R, "<$buildroot/docs/curl.1") || die "no input file"; my @manpage; # store all parsed parameters while(<R>) { diff --git a/tests/pathhelp.pm b/tests/pathhelp.pm index 391ef6c25..10a87aaf9 100644 --- a/tests/pathhelp.pm +++ b/tests/pathhelp.pm @@ -20,7 +20,7 @@ # ########################################################################### -# This Perl package helps with path transforming when running cURL tests on +# This Perl package helps with path transforming when running curl tests on # Win32 platform with Msys or Cygwin. # Three main functions 'sys_native_abs_path', 'sys_native_path' and # 'build_sys_abs_path' autodetect format of given pathnames. Following formats diff --git a/tests/runtests.pdf b/tests/runtests.pdf Binary files differindex 48b1b20fa..692e11dcf 100644 --- a/tests/runtests.pdf +++ b/tests/runtests.pdf diff --git a/tests/runtests.pl b/tests/runtests.pl index b8497f9c2..583ba3b7f 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -2653,7 +2653,7 @@ sub checksystem { logmsg sprintf("* Servers: %s", $stunnel?"SSL ":""); logmsg sprintf("%s", $http_ipv6?"HTTP-IPv6 ":""); logmsg sprintf("%s", $http_unix?"HTTP-unix ":""); - logmsg sprintf("%s\n", $ftp_ipv6?"FTP-IPv6 ":"OFF"); + logmsg sprintf("%s\n", $ftp_ipv6?"FTP-IPv6 ":""); logmsg sprintf("* Env: %s%s", $valgrind?"Valgrind ":"", $run_event_based?"event-based ":""); @@ -3594,7 +3594,7 @@ sub singletest { $usevalgrind = 1; my $valgrindcmd = "$valgrind "; $valgrindcmd .= "$valgrind_tool " if($valgrind_tool); - $valgrindcmd .= "--leak-check=yes "; + $valgrindcmd .= "--quiet --leak-check=yes "; $valgrindcmd .= "--suppressions=$srcdir/valgrind.supp "; # $valgrindcmd .= "--gen-suppressions=all "; $valgrindcmd .= "--num-callers=16 "; diff --git a/tests/server/Makefile.in b/tests/server/Makefile.in index 77fbc31e0..798197527 100644 --- a/tests/server/Makefile.in +++ b/tests/server/Makefile.in @@ -123,7 +123,6 @@ PROGRAMS = $(noinst_PROGRAMS) am__dirstamp = $(am__leading_dot)dirstamp am__objects_1 = ../../lib/fake_ntlm-mprintf.$(OBJEXT) \ ../../lib/fake_ntlm-nonblock.$(OBJEXT) \ - ../../lib/fake_ntlm-strequal.$(OBJEXT) \ ../../lib/fake_ntlm-strtoofft.$(OBJEXT) \ ../../lib/fake_ntlm-timeval.$(OBJEXT) \ ../../lib/fake_ntlm-warnless.$(OBJEXT) @@ -146,7 +145,6 @@ fake_ntlm_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am__objects_5 = ../../lib/getpart-mprintf.$(OBJEXT) \ ../../lib/getpart-nonblock.$(OBJEXT) \ - ../../lib/getpart-strequal.$(OBJEXT) \ ../../lib/getpart-strtoofft.$(OBJEXT) \ ../../lib/getpart-timeval.$(OBJEXT) \ ../../lib/getpart-warnless.$(OBJEXT) @@ -162,7 +160,6 @@ getpart_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am__objects_7 = ../../lib/resolve-mprintf.$(OBJEXT) \ ../../lib/resolve-nonblock.$(OBJEXT) \ - ../../lib/resolve-strequal.$(OBJEXT) \ ../../lib/resolve-strtoofft.$(OBJEXT) \ ../../lib/resolve-timeval.$(OBJEXT) \ ../../lib/resolve-warnless.$(OBJEXT) @@ -179,7 +176,6 @@ resolve_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am__objects_10 = ../../lib/rtspd-mprintf.$(OBJEXT) \ ../../lib/rtspd-nonblock.$(OBJEXT) \ - ../../lib/rtspd-strequal.$(OBJEXT) \ ../../lib/rtspd-strtoofft.$(OBJEXT) \ ../../lib/rtspd-timeval.$(OBJEXT) \ ../../lib/rtspd-warnless.$(OBJEXT) @@ -196,7 +192,6 @@ rtspd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ am__objects_13 = ../../lib/sockfilt-mprintf.$(OBJEXT) \ ../../lib/sockfilt-nonblock.$(OBJEXT) \ - ../../lib/sockfilt-strequal.$(OBJEXT) \ ../../lib/sockfilt-strtoofft.$(OBJEXT) \ ../../lib/sockfilt-timeval.$(OBJEXT) \ ../../lib/sockfilt-warnless.$(OBJEXT) @@ -215,7 +210,6 @@ sockfilt_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am__objects_16 = ../../lib/sws-mprintf.$(OBJEXT) \ ../../lib/sws-nonblock.$(OBJEXT) \ - ../../lib/sws-strequal.$(OBJEXT) \ ../../lib/sws-strtoofft.$(OBJEXT) \ ../../lib/sws-timeval.$(OBJEXT) \ ../../lib/sws-warnless.$(OBJEXT) @@ -232,7 +226,6 @@ sws_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ am__objects_19 = ../../lib/tftpd-mprintf.$(OBJEXT) \ ../../lib/tftpd-nonblock.$(OBJEXT) \ - ../../lib/tftpd-strequal.$(OBJEXT) \ ../../lib/tftpd-strtoofft.$(OBJEXT) \ ../../lib/tftpd-timeval.$(OBJEXT) \ ../../lib/tftpd-warnless.$(OBJEXT) @@ -557,7 +550,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc CURLX_SRCS = \ ../../lib/mprintf.c \ ../../lib/nonblock.c \ - ../../lib/strequal.c \ ../../lib/strtoofft.c \ ../../lib/timeval.c \ ../../lib/warnless.c @@ -565,7 +557,6 @@ CURLX_SRCS = \ CURLX_HDRS = \ ../../lib/curlx.h \ ../../lib/nonblock.h \ - ../../lib/strequal.h \ ../../lib/strtoofft.h \ ../../lib/timeval.h \ ../../lib/warnless.h @@ -681,8 +672,6 @@ clean-noinstPROGRAMS: ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/fake_ntlm-nonblock.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) -../../lib/fake_ntlm-strequal.$(OBJEXT): ../../lib/$(am__dirstamp) \ - ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/fake_ntlm-strtoofft.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/fake_ntlm-timeval.$(OBJEXT): ../../lib/$(am__dirstamp) \ @@ -701,8 +690,6 @@ fake_ntlm$(EXEEXT): $(fake_ntlm_OBJECTS) $(fake_ntlm_DEPENDENCIES) $(EXTRA_fake_ ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/getpart-nonblock.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) -../../lib/getpart-strequal.$(OBJEXT): ../../lib/$(am__dirstamp) \ - ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/getpart-strtoofft.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/getpart-timeval.$(OBJEXT): ../../lib/$(am__dirstamp) \ @@ -721,8 +708,6 @@ getpart$(EXEEXT): $(getpart_OBJECTS) $(getpart_DEPENDENCIES) $(EXTRA_getpart_DEP ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/resolve-nonblock.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) -../../lib/resolve-strequal.$(OBJEXT): ../../lib/$(am__dirstamp) \ - ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/resolve-strtoofft.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/resolve-timeval.$(OBJEXT): ../../lib/$(am__dirstamp) \ @@ -741,8 +726,6 @@ resolve$(EXEEXT): $(resolve_OBJECTS) $(resolve_DEPENDENCIES) $(EXTRA_resolve_DEP ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/rtspd-nonblock.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) -../../lib/rtspd-strequal.$(OBJEXT): ../../lib/$(am__dirstamp) \ - ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/rtspd-strtoofft.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/rtspd-timeval.$(OBJEXT): ../../lib/$(am__dirstamp) \ @@ -761,8 +744,6 @@ rtspd$(EXEEXT): $(rtspd_OBJECTS) $(rtspd_DEPENDENCIES) $(EXTRA_rtspd_DEPENDENCIE ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/sockfilt-nonblock.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) -../../lib/sockfilt-strequal.$(OBJEXT): ../../lib/$(am__dirstamp) \ - ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/sockfilt-strtoofft.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/sockfilt-timeval.$(OBJEXT): ../../lib/$(am__dirstamp) \ @@ -783,8 +764,6 @@ sockfilt$(EXEEXT): $(sockfilt_OBJECTS) $(sockfilt_DEPENDENCIES) $(EXTRA_sockfilt ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/sws-nonblock.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) -../../lib/sws-strequal.$(OBJEXT): ../../lib/$(am__dirstamp) \ - ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/sws-strtoofft.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/sws-timeval.$(OBJEXT): ../../lib/$(am__dirstamp) \ @@ -805,8 +784,6 @@ sws$(EXEEXT): $(sws_OBJECTS) $(sws_DEPENDENCIES) $(EXTRA_sws_DEPENDENCIES) ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/tftpd-nonblock.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) -../../lib/tftpd-strequal.$(OBJEXT): ../../lib/$(am__dirstamp) \ - ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/tftpd-strtoofft.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) ../../lib/tftpd-timeval.$(OBJEXT): ../../lib/$(am__dirstamp) \ @@ -833,7 +810,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/fake_ntlm-memdebug.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/fake_ntlm-mprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/fake_ntlm-nonblock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/fake_ntlm-strequal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/fake_ntlm-strtoofft.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/fake_ntlm-timeval.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/fake_ntlm-warnless.Po@am__quote@ @@ -841,7 +817,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/getpart-memdebug.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/getpart-mprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/getpart-nonblock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/getpart-strequal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/getpart-strtoofft.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/getpart-timeval.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/getpart-warnless.Po@am__quote@ @@ -849,7 +824,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/resolve-memdebug.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/resolve-mprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/resolve-nonblock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/resolve-strequal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/resolve-strtoofft.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/resolve-timeval.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/resolve-warnless.Po@am__quote@ @@ -857,7 +831,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/rtspd-memdebug.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/rtspd-mprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/rtspd-nonblock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/rtspd-strequal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/rtspd-strtoofft.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/rtspd-timeval.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/rtspd-warnless.Po@am__quote@ @@ -866,7 +839,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sockfilt-memdebug.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sockfilt-mprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sockfilt-nonblock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sockfilt-strequal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sockfilt-strtoofft.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sockfilt-timeval.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sockfilt-warnless.Po@am__quote@ @@ -875,7 +847,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sws-memdebug.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sws-mprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sws-nonblock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sws-strequal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sws-strtoofft.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sws-timeval.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/sws-warnless.Po@am__quote@ @@ -883,7 +854,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/tftpd-memdebug.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/tftpd-mprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/tftpd-nonblock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/tftpd-strequal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/tftpd-strtoofft.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/tftpd-timeval.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/tftpd-warnless.Po@am__quote@ @@ -960,20 +930,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fake_ntlm_CFLAGS) $(CFLAGS) -c -o ../../lib/fake_ntlm-nonblock.obj `if test -f '../../lib/nonblock.c'; then $(CYGPATH_W) '../../lib/nonblock.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/nonblock.c'; fi` -../../lib/fake_ntlm-strequal.o: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fake_ntlm_CFLAGS) $(CFLAGS) -MT ../../lib/fake_ntlm-strequal.o -MD -MP -MF ../../lib/$(DEPDIR)/fake_ntlm-strequal.Tpo -c -o ../../lib/fake_ntlm-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/fake_ntlm-strequal.Tpo ../../lib/$(DEPDIR)/fake_ntlm-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/fake_ntlm-strequal.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fake_ntlm_CFLAGS) $(CFLAGS) -c -o ../../lib/fake_ntlm-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c - -../../lib/fake_ntlm-strequal.obj: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fake_ntlm_CFLAGS) $(CFLAGS) -MT ../../lib/fake_ntlm-strequal.obj -MD -MP -MF ../../lib/$(DEPDIR)/fake_ntlm-strequal.Tpo -c -o ../../lib/fake_ntlm-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/fake_ntlm-strequal.Tpo ../../lib/$(DEPDIR)/fake_ntlm-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/fake_ntlm-strequal.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fake_ntlm_CFLAGS) $(CFLAGS) -c -o ../../lib/fake_ntlm-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` - ../../lib/fake_ntlm-strtoofft.o: ../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fake_ntlm_CFLAGS) $(CFLAGS) -MT ../../lib/fake_ntlm-strtoofft.o -MD -MP -MF ../../lib/$(DEPDIR)/fake_ntlm-strtoofft.Tpo -c -o ../../lib/fake_ntlm-strtoofft.o `test -f '../../lib/strtoofft.c' || echo '$(srcdir)/'`../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/fake_ntlm-strtoofft.Tpo ../../lib/$(DEPDIR)/fake_ntlm-strtoofft.Po @@ -1114,20 +1070,6 @@ fake_ntlm-fake_ntlm.obj: fake_ntlm.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getpart_CFLAGS) $(CFLAGS) -c -o ../../lib/getpart-nonblock.obj `if test -f '../../lib/nonblock.c'; then $(CYGPATH_W) '../../lib/nonblock.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/nonblock.c'; fi` -../../lib/getpart-strequal.o: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getpart_CFLAGS) $(CFLAGS) -MT ../../lib/getpart-strequal.o -MD -MP -MF ../../lib/$(DEPDIR)/getpart-strequal.Tpo -c -o ../../lib/getpart-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/getpart-strequal.Tpo ../../lib/$(DEPDIR)/getpart-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/getpart-strequal.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getpart_CFLAGS) $(CFLAGS) -c -o ../../lib/getpart-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c - -../../lib/getpart-strequal.obj: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getpart_CFLAGS) $(CFLAGS) -MT ../../lib/getpart-strequal.obj -MD -MP -MF ../../lib/$(DEPDIR)/getpart-strequal.Tpo -c -o ../../lib/getpart-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/getpart-strequal.Tpo ../../lib/$(DEPDIR)/getpart-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/getpart-strequal.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getpart_CFLAGS) $(CFLAGS) -c -o ../../lib/getpart-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` - ../../lib/getpart-strtoofft.o: ../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(getpart_CFLAGS) $(CFLAGS) -MT ../../lib/getpart-strtoofft.o -MD -MP -MF ../../lib/$(DEPDIR)/getpart-strtoofft.Tpo -c -o ../../lib/getpart-strtoofft.o `test -f '../../lib/strtoofft.c' || echo '$(srcdir)/'`../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/getpart-strtoofft.Tpo ../../lib/$(DEPDIR)/getpart-strtoofft.Po @@ -1254,20 +1196,6 @@ getpart-testpart.obj: testpart.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(resolve_CFLAGS) $(CFLAGS) -c -o ../../lib/resolve-nonblock.obj `if test -f '../../lib/nonblock.c'; then $(CYGPATH_W) '../../lib/nonblock.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/nonblock.c'; fi` -../../lib/resolve-strequal.o: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(resolve_CFLAGS) $(CFLAGS) -MT ../../lib/resolve-strequal.o -MD -MP -MF ../../lib/$(DEPDIR)/resolve-strequal.Tpo -c -o ../../lib/resolve-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/resolve-strequal.Tpo ../../lib/$(DEPDIR)/resolve-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/resolve-strequal.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(resolve_CFLAGS) $(CFLAGS) -c -o ../../lib/resolve-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c - -../../lib/resolve-strequal.obj: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(resolve_CFLAGS) $(CFLAGS) -MT ../../lib/resolve-strequal.obj -MD -MP -MF ../../lib/$(DEPDIR)/resolve-strequal.Tpo -c -o ../../lib/resolve-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/resolve-strequal.Tpo ../../lib/$(DEPDIR)/resolve-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/resolve-strequal.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(resolve_CFLAGS) $(CFLAGS) -c -o ../../lib/resolve-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` - ../../lib/resolve-strtoofft.o: ../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(resolve_CFLAGS) $(CFLAGS) -MT ../../lib/resolve-strtoofft.o -MD -MP -MF ../../lib/$(DEPDIR)/resolve-strtoofft.Tpo -c -o ../../lib/resolve-strtoofft.o `test -f '../../lib/strtoofft.c' || echo '$(srcdir)/'`../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/resolve-strtoofft.Tpo ../../lib/$(DEPDIR)/resolve-strtoofft.Po @@ -1408,20 +1336,6 @@ resolve-resolve.obj: resolve.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtspd_CFLAGS) $(CFLAGS) -c -o ../../lib/rtspd-nonblock.obj `if test -f '../../lib/nonblock.c'; then $(CYGPATH_W) '../../lib/nonblock.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/nonblock.c'; fi` -../../lib/rtspd-strequal.o: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtspd_CFLAGS) $(CFLAGS) -MT ../../lib/rtspd-strequal.o -MD -MP -MF ../../lib/$(DEPDIR)/rtspd-strequal.Tpo -c -o ../../lib/rtspd-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/rtspd-strequal.Tpo ../../lib/$(DEPDIR)/rtspd-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/rtspd-strequal.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtspd_CFLAGS) $(CFLAGS) -c -o ../../lib/rtspd-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c - -../../lib/rtspd-strequal.obj: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtspd_CFLAGS) $(CFLAGS) -MT ../../lib/rtspd-strequal.obj -MD -MP -MF ../../lib/$(DEPDIR)/rtspd-strequal.Tpo -c -o ../../lib/rtspd-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/rtspd-strequal.Tpo ../../lib/$(DEPDIR)/rtspd-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/rtspd-strequal.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtspd_CFLAGS) $(CFLAGS) -c -o ../../lib/rtspd-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` - ../../lib/rtspd-strtoofft.o: ../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtspd_CFLAGS) $(CFLAGS) -MT ../../lib/rtspd-strtoofft.o -MD -MP -MF ../../lib/$(DEPDIR)/rtspd-strtoofft.Tpo -c -o ../../lib/rtspd-strtoofft.o `test -f '../../lib/strtoofft.c' || echo '$(srcdir)/'`../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/rtspd-strtoofft.Tpo ../../lib/$(DEPDIR)/rtspd-strtoofft.Po @@ -1562,20 +1476,6 @@ rtspd-rtspd.obj: rtspd.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sockfilt_CFLAGS) $(CFLAGS) -c -o ../../lib/sockfilt-nonblock.obj `if test -f '../../lib/nonblock.c'; then $(CYGPATH_W) '../../lib/nonblock.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/nonblock.c'; fi` -../../lib/sockfilt-strequal.o: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sockfilt_CFLAGS) $(CFLAGS) -MT ../../lib/sockfilt-strequal.o -MD -MP -MF ../../lib/$(DEPDIR)/sockfilt-strequal.Tpo -c -o ../../lib/sockfilt-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/sockfilt-strequal.Tpo ../../lib/$(DEPDIR)/sockfilt-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/sockfilt-strequal.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sockfilt_CFLAGS) $(CFLAGS) -c -o ../../lib/sockfilt-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c - -../../lib/sockfilt-strequal.obj: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sockfilt_CFLAGS) $(CFLAGS) -MT ../../lib/sockfilt-strequal.obj -MD -MP -MF ../../lib/$(DEPDIR)/sockfilt-strequal.Tpo -c -o ../../lib/sockfilt-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/sockfilt-strequal.Tpo ../../lib/$(DEPDIR)/sockfilt-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/sockfilt-strequal.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sockfilt_CFLAGS) $(CFLAGS) -c -o ../../lib/sockfilt-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` - ../../lib/sockfilt-strtoofft.o: ../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sockfilt_CFLAGS) $(CFLAGS) -MT ../../lib/sockfilt-strtoofft.o -MD -MP -MF ../../lib/$(DEPDIR)/sockfilt-strtoofft.Tpo -c -o ../../lib/sockfilt-strtoofft.o `test -f '../../lib/strtoofft.c' || echo '$(srcdir)/'`../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/sockfilt-strtoofft.Tpo ../../lib/$(DEPDIR)/sockfilt-strtoofft.Po @@ -1730,20 +1630,6 @@ sockfilt-sockfilt.obj: sockfilt.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sws_CFLAGS) $(CFLAGS) -c -o ../../lib/sws-nonblock.obj `if test -f '../../lib/nonblock.c'; then $(CYGPATH_W) '../../lib/nonblock.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/nonblock.c'; fi` -../../lib/sws-strequal.o: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sws_CFLAGS) $(CFLAGS) -MT ../../lib/sws-strequal.o -MD -MP -MF ../../lib/$(DEPDIR)/sws-strequal.Tpo -c -o ../../lib/sws-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/sws-strequal.Tpo ../../lib/$(DEPDIR)/sws-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/sws-strequal.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sws_CFLAGS) $(CFLAGS) -c -o ../../lib/sws-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c - -../../lib/sws-strequal.obj: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sws_CFLAGS) $(CFLAGS) -MT ../../lib/sws-strequal.obj -MD -MP -MF ../../lib/$(DEPDIR)/sws-strequal.Tpo -c -o ../../lib/sws-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/sws-strequal.Tpo ../../lib/$(DEPDIR)/sws-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/sws-strequal.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sws_CFLAGS) $(CFLAGS) -c -o ../../lib/sws-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` - ../../lib/sws-strtoofft.o: ../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sws_CFLAGS) $(CFLAGS) -MT ../../lib/sws-strtoofft.o -MD -MP -MF ../../lib/$(DEPDIR)/sws-strtoofft.Tpo -c -o ../../lib/sws-strtoofft.o `test -f '../../lib/strtoofft.c' || echo '$(srcdir)/'`../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/sws-strtoofft.Tpo ../../lib/$(DEPDIR)/sws-strtoofft.Po @@ -1898,20 +1784,6 @@ sws-sws.obj: sws.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tftpd_CFLAGS) $(CFLAGS) -c -o ../../lib/tftpd-nonblock.obj `if test -f '../../lib/nonblock.c'; then $(CYGPATH_W) '../../lib/nonblock.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/nonblock.c'; fi` -../../lib/tftpd-strequal.o: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tftpd_CFLAGS) $(CFLAGS) -MT ../../lib/tftpd-strequal.o -MD -MP -MF ../../lib/$(DEPDIR)/tftpd-strequal.Tpo -c -o ../../lib/tftpd-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/tftpd-strequal.Tpo ../../lib/$(DEPDIR)/tftpd-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/tftpd-strequal.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tftpd_CFLAGS) $(CFLAGS) -c -o ../../lib/tftpd-strequal.o `test -f '../../lib/strequal.c' || echo '$(srcdir)/'`../../lib/strequal.c - -../../lib/tftpd-strequal.obj: ../../lib/strequal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tftpd_CFLAGS) $(CFLAGS) -MT ../../lib/tftpd-strequal.obj -MD -MP -MF ../../lib/$(DEPDIR)/tftpd-strequal.Tpo -c -o ../../lib/tftpd-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/tftpd-strequal.Tpo ../../lib/$(DEPDIR)/tftpd-strequal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/strequal.c' object='../../lib/tftpd-strequal.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tftpd_CFLAGS) $(CFLAGS) -c -o ../../lib/tftpd-strequal.obj `if test -f '../../lib/strequal.c'; then $(CYGPATH_W) '../../lib/strequal.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/strequal.c'; fi` - ../../lib/tftpd-strtoofft.o: ../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tftpd_CFLAGS) $(CFLAGS) -MT ../../lib/tftpd-strtoofft.o -MD -MP -MF ../../lib/$(DEPDIR)/tftpd-strtoofft.Tpo -c -o ../../lib/tftpd-strtoofft.o `test -f '../../lib/strtoofft.c' || echo '$(srcdir)/'`../../lib/strtoofft.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/tftpd-strtoofft.Tpo ../../lib/$(DEPDIR)/tftpd-strtoofft.Po diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc index 6e81dfdbc..c3ea664b6 100644 --- a/tests/server/Makefile.inc +++ b/tests/server/Makefile.inc @@ -3,7 +3,6 @@ noinst_PROGRAMS = getpart resolve rtspd sockfilt sws tftpd fake_ntlm CURLX_SRCS = \ ../../lib/mprintf.c \ ../../lib/nonblock.c \ - ../../lib/strequal.c \ ../../lib/strtoofft.c \ ../../lib/timeval.c \ ../../lib/warnless.c @@ -11,7 +10,6 @@ CURLX_SRCS = \ CURLX_HDRS = \ ../../lib/curlx.h \ ../../lib/nonblock.h \ - ../../lib/strequal.h \ ../../lib/strtoofft.h \ ../../lib/timeval.h \ ../../lib/warnless.h diff --git a/tests/server/getpart.c b/tests/server/getpart.c index 1952fbbe5..25758bd4e 100644 --- a/tests/server/getpart.c +++ b/tests/server/getpart.c @@ -309,7 +309,8 @@ int getpart(char **outbuf, size_t *outlen, ptr++; end = ptr; EAT_WORD(end); - if((len.sig = end - ptr) > MAX_TAG_LEN) { + len.sig = end - ptr; + if(len.sig > MAX_TAG_LEN) { error = GPE_NO_BUFFER_SPACE; break; } @@ -370,7 +371,8 @@ int getpart(char **outbuf, size_t *outlen, /* get potential tag */ end = ptr; EAT_WORD(end); - if((len.sig = end - ptr) > MAX_TAG_LEN) { + len.sig = end - ptr; + if(len.sig > MAX_TAG_LEN) { error = GPE_NO_BUFFER_SPACE; break; } @@ -389,7 +391,8 @@ int getpart(char **outbuf, size_t *outlen, end = ptr; while(*end && ('>' != *end)) end++; - if((len.sig = end - ptr) > MAX_TAG_LEN) { + len.sig = end - ptr; + if(len.sig > MAX_TAG_LEN) { error = GPE_NO_BUFFER_SPACE; break; } diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 91ef6c62b..ea231da3d 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -129,7 +129,7 @@ static void storerequest(char *reqbuf, size_t totalsize); const char *serverlogfile = DEFAULT_LOGFILE; -#define RTSPDVERSION "cURL test suite RTSP server/0.1" +#define RTSPDVERSION "curl test suite RTSP server/0.1" #define REQUEST_DUMP "log/server.input" #define RESPONSE_DUMP "log/server.response" @@ -260,36 +260,42 @@ static void install_signal_handlers(void) { #ifdef SIGHUP /* ignore SIGHUP signal */ - if((old_sighup_handler = signal(SIGHUP, SIG_IGN)) == SIG_ERR) + old_sighup_handler = signal(SIGHUP, SIG_IGN); + if(old_sighup_handler == SIG_ERR) logmsg("cannot install SIGHUP handler: %s", strerror(errno)); #endif #ifdef SIGPIPE /* ignore SIGPIPE signal */ - if((old_sigpipe_handler = signal(SIGPIPE, SIG_IGN)) == SIG_ERR) + old_sigpipe_handler = signal(SIGPIPE, SIG_IGN); + if(old_sigpipe_handler == SIG_ERR) logmsg("cannot install SIGPIPE handler: %s", strerror(errno)); #endif #ifdef SIGALRM /* ignore SIGALRM signal */ - if((old_sigalrm_handler = signal(SIGALRM, SIG_IGN)) == SIG_ERR) + old_sigalrm_handler = signal(SIGALRM, SIG_IGN); + if(old_sigalrm_handler == SIG_ERR) logmsg("cannot install SIGALRM handler: %s", strerror(errno)); #endif #ifdef SIGINT /* handle SIGINT signal with our exit_signal_handler */ - if((old_sigint_handler = signal(SIGINT, exit_signal_handler)) == SIG_ERR) + old_sigint_handler = signal(SIGINT, exit_signal_handler); + if(old_sigint_handler == SIG_ERR) logmsg("cannot install SIGINT handler: %s", strerror(errno)); else siginterrupt(SIGINT, 1); #endif #ifdef SIGTERM /* handle SIGTERM signal with our exit_signal_handler */ - if((old_sigterm_handler = signal(SIGTERM, exit_signal_handler)) == SIG_ERR) + old_sigterm_handler = signal(SIGTERM, exit_signal_handler); + if(old_sigterm_handler == SIG_ERR) logmsg("cannot install SIGTERM handler: %s", strerror(errno)); else siginterrupt(SIGTERM, 1); #endif #if defined(SIGBREAK) && defined(WIN32) /* handle SIGBREAK signal with our exit_signal_handler */ - if((old_sigbreak_handler = signal(SIGBREAK, exit_signal_handler)) == SIG_ERR) + old_sigbreak_handler = signal(SIGBREAK, exit_signal_handler); + if(old_sigbreak_handler == SIG_ERR) logmsg("cannot install SIGBREAK handler: %s", strerror(errno)); else siginterrupt(SIGBREAK, 1); @@ -590,7 +596,7 @@ static int ProcessRequest(struct httprequest *req) if(got_exit_signal) return 1; /* done */ - if((req->cl==0) && curlx_strnequal("Content-Length:", line, 15)) { + if((req->cl==0) && strncasecompare("Content-Length:", line, 15)) { /* If we don't ignore content-length, we read it and we read the whole request including the body before we return. If we've been told to ignore the content-length, we will return as soon as all headers @@ -616,7 +622,7 @@ static int ProcessRequest(struct httprequest *req) logmsg("... but will abort after %zu bytes", req->cl); break; } - else if(curlx_strnequal("Transfer-Encoding: chunked", line, + else if(strncasecompare("Transfer-Encoding: chunked", line, strlen("Transfer-Encoding: chunked"))) { /* chunked data coming in */ chunked = TRUE; diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 38aa51e67..78588d3ab 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -206,36 +206,42 @@ static void install_signal_handlers(void) { #ifdef SIGHUP /* ignore SIGHUP signal */ - if((old_sighup_handler = signal(SIGHUP, SIG_IGN)) == SIG_ERR) + old_sighup_handler = signal(SIGHUP, SIG_IGN); + if(old_sighup_handler == SIG_ERR) logmsg("cannot install SIGHUP handler: %s", strerror(errno)); #endif #ifdef SIGPIPE /* ignore SIGPIPE signal */ - if((old_sigpipe_handler = signal(SIGPIPE, SIG_IGN)) == SIG_ERR) + old_sigpipe_handler = signal(SIGPIPE, SIG_IGN); + if(old_sigpipe_handler == SIG_ERR) logmsg("cannot install SIGPIPE handler: %s", strerror(errno)); #endif #ifdef SIGALRM /* ignore SIGALRM signal */ - if((old_sigalrm_handler = signal(SIGALRM, SIG_IGN)) == SIG_ERR) + old_sigalrm_handler = signal(SIGALRM, SIG_IGN); + if(old_sigalrm_handler == SIG_ERR) logmsg("cannot install SIGALRM handler: %s", strerror(errno)); #endif #ifdef SIGINT /* handle SIGINT signal with our exit_signal_handler */ - if((old_sigint_handler = signal(SIGINT, exit_signal_handler)) == SIG_ERR) + old_sigint_handler = signal(SIGINT, exit_signal_handler); + if(old_sigint_handler == SIG_ERR) logmsg("cannot install SIGINT handler: %s", strerror(errno)); else siginterrupt(SIGINT, 1); #endif #ifdef SIGTERM /* handle SIGTERM signal with our exit_signal_handler */ - if((old_sigterm_handler = signal(SIGTERM, exit_signal_handler)) == SIG_ERR) + old_sigterm_handler = signal(SIGTERM, exit_signal_handler); + if(old_sigterm_handler == SIG_ERR) logmsg("cannot install SIGTERM handler: %s", strerror(errno)); else siginterrupt(SIGTERM, 1); #endif #if defined(SIGBREAK) && defined(WIN32) /* handle SIGBREAK signal with our exit_signal_handler */ - if((old_sigbreak_handler = signal(SIGBREAK, exit_signal_handler)) == SIG_ERR) + old_sigbreak_handler = signal(SIGBREAK, exit_signal_handler); + if(old_sigbreak_handler == SIG_ERR) logmsg("cannot install SIGBREAK handler: %s", strerror(errno)); else siginterrupt(SIGBREAK, 1); @@ -1283,7 +1289,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock, sclose(sock); return CURL_SOCKET_BAD; } - switch (localaddr.sa.sa_family) { + switch(localaddr.sa.sa_family) { case AF_INET: *listenport = ntohs(localaddr.sa4.sin_port); break; diff --git a/tests/server/sws.c b/tests/server/sws.c index 27c86e013..5646f965b 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -140,7 +140,7 @@ static void storerequest(char *reqbuf, size_t totalsize); const char *serverlogfile = DEFAULT_LOGFILE; -#define SWSVERSION "cURL test suite HTTP server/0.1" +#define SWSVERSION "curl test suite HTTP server/0.1" #define REQUEST_DUMP "log/server.input" #define RESPONSE_DUMP "log/server.response" @@ -265,36 +265,42 @@ static void install_signal_handlers(void) { #ifdef SIGHUP /* ignore SIGHUP signal */ - if((old_sighup_handler = signal(SIGHUP, SIG_IGN)) == SIG_ERR) + old_sighup_handler = signal(SIGHUP, SIG_IGN); + if(old_sighup_handler == SIG_ERR) logmsg("cannot install SIGHUP handler: %s", strerror(errno)); #endif #ifdef SIGPIPE /* ignore SIGPIPE signal */ - if((old_sigpipe_handler = signal(SIGPIPE, SIG_IGN)) == SIG_ERR) + old_sigpipe_handler = signal(SIGPIPE, SIG_IGN); + if(old_sigpipe_handler == SIG_ERR) logmsg("cannot install SIGPIPE handler: %s", strerror(errno)); #endif #ifdef SIGALRM /* ignore SIGALRM signal */ - if((old_sigalrm_handler = signal(SIGALRM, SIG_IGN)) == SIG_ERR) + old_sigalrm_handler = signal(SIGALRM, SIG_IGN); + if(old_sigalrm_handler == SIG_ERR) logmsg("cannot install SIGALRM handler: %s", strerror(errno)); #endif #ifdef SIGINT /* handle SIGINT signal with our exit_signal_handler */ - if((old_sigint_handler = signal(SIGINT, exit_signal_handler)) == SIG_ERR) + old_sigint_handler = signal(SIGINT, exit_signal_handler); + if(old_sigint_handler == SIG_ERR) logmsg("cannot install SIGINT handler: %s", strerror(errno)); else siginterrupt(SIGINT, 1); #endif #ifdef SIGTERM /* handle SIGTERM signal with our exit_signal_handler */ - if((old_sigterm_handler = signal(SIGTERM, exit_signal_handler)) == SIG_ERR) + old_sigterm_handler = signal(SIGTERM, exit_signal_handler); + if(old_sigterm_handler == SIG_ERR) logmsg("cannot install SIGTERM handler: %s", strerror(errno)); else siginterrupt(SIGTERM, 1); #endif #if defined(SIGBREAK) && defined(WIN32) /* handle SIGBREAK signal with our exit_signal_handler */ - if((old_sigbreak_handler = signal(SIGBREAK, exit_signal_handler)) == SIG_ERR) + old_sigbreak_handler = signal(SIGBREAK, exit_signal_handler); + if(old_sigbreak_handler == SIG_ERR) logmsg("cannot install SIGBREAK handler: %s", strerror(errno)); else siginterrupt(SIGBREAK, 1); @@ -697,7 +703,7 @@ static int ProcessRequest(struct httprequest *req) if(got_exit_signal) return 1; /* done */ - if((req->cl==0) && curlx_strnequal("Content-Length:", line, 15)) { + if((req->cl==0) && strncasecompare("Content-Length:", line, 15)) { /* If we don't ignore content-length, we read it and we read the whole request including the body before we return. If we've been told to ignore the content-length, we will return as soon as all headers @@ -723,7 +729,7 @@ static int ProcessRequest(struct httprequest *req) logmsg("... but will abort after %zu bytes", req->cl); break; } - else if(curlx_strnequal("Transfer-Encoding: chunked", line, + else if(strncasecompare("Transfer-Encoding: chunked", line, strlen("Transfer-Encoding: chunked"))) { /* chunked data coming in */ chunked = TRUE; @@ -1194,14 +1200,21 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) size_t num = count; if(num > 200) num = 200; + + retry: written = swrite(sock, buffer, num); if(written < 0) { + if((EWOULDBLOCK == SOCKERRNO) || (EAGAIN == SOCKERRNO)) { + wait_ms(10); + goto retry; + } sendfailure = TRUE; break; } else { logmsg("Sent off %zd bytes", written); } + /* write to file as well */ fwrite(buffer, 1, (size_t)written, dump); @@ -2231,9 +2244,9 @@ int main(int argc, char *argv[]) /* Clear out closed sockets */ for(socket_idx = num_sockets - 1; socket_idx >= 1; --socket_idx) { if(CURL_SOCKET_BAD == all_sockets[socket_idx]) { - char* dst = (char *) (all_sockets + socket_idx); - char* src = (char *) (all_sockets + socket_idx + 1); - char* end = (char *) (all_sockets + num_sockets); + char *dst = (char *) (all_sockets + socket_idx); + char *src = (char *) (all_sockets + socket_idx + 1); + char *end = (char *) (all_sockets + num_sockets); memmove(dst, src, end - src); num_sockets -= 1; } diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index afc0884e0..c8667437e 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -15,7 +15,7 @@ */ /* - * Copyright (c) 1983 Regents of the University of California. + * Copyright (c) 1983, 2016 Regents of the University of California. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -367,31 +367,36 @@ static void install_signal_handlers(void) { #ifdef SIGHUP /* ignore SIGHUP signal */ - if((old_sighup_handler = signal(SIGHUP, SIG_IGN)) == SIG_ERR) + old_sighup_handler = signal(SIGHUP, SIG_IGN); + if(old_sighup_handler == SIG_ERR) logmsg("cannot install SIGHUP handler: %s", strerror(errno)); #endif #ifdef SIGPIPE /* ignore SIGPIPE signal */ - if((old_sigpipe_handler = signal(SIGPIPE, SIG_IGN)) == SIG_ERR) + old_sigpipe_handler = signal(SIGPIPE, SIG_IGN); + if(old_sigpipe_handler == SIG_ERR) logmsg("cannot install SIGPIPE handler: %s", strerror(errno)); #endif #ifdef SIGINT /* handle SIGINT signal with our exit_signal_handler */ - if((old_sigint_handler = signal(SIGINT, exit_signal_handler)) == SIG_ERR) + old_sigint_handler = signal(SIGINT, exit_signal_handler); + if(old_sigint_handler == SIG_ERR) logmsg("cannot install SIGINT handler: %s", strerror(errno)); else siginterrupt(SIGINT, 1); #endif #ifdef SIGTERM /* handle SIGTERM signal with our exit_signal_handler */ - if((old_sigterm_handler = signal(SIGTERM, exit_signal_handler)) == SIG_ERR) + old_sigterm_handler = signal(SIGTERM, exit_signal_handler); + if(old_sigterm_handler == SIG_ERR) logmsg("cannot install SIGTERM handler: %s", strerror(errno)); else siginterrupt(SIGTERM, 1); #endif #if defined(SIGBREAK) && defined(WIN32) /* handle SIGBREAK signal with our exit_signal_handler */ - if((old_sigbreak_handler = signal(SIGBREAK, exit_signal_handler)) == SIG_ERR) + old_sigbreak_handler = signal(SIGBREAK, exit_signal_handler); + if(old_sigbreak_handler == SIG_ERR) logmsg("cannot install SIGBREAK handler: %s", strerror(errno)); else siginterrupt(SIGBREAK, 1); @@ -1040,10 +1045,10 @@ static int do_tftp(struct testcase *test, struct tftphdr *tp, ssize_t size) #ifdef USE_WINSOCK recvtimeout = sizeof(recvtimeoutbak); getsockopt(peer, SOL_SOCKET, SO_RCVTIMEO, - (char*)&recvtimeoutbak, (int*)&recvtimeout); + (char *)&recvtimeoutbak, (int *)&recvtimeout); recvtimeout = TIMEOUT*1000; setsockopt(peer, SOL_SOCKET, SO_RCVTIMEO, - (const char*)&recvtimeout, sizeof(recvtimeout)); + (const char *)&recvtimeout, sizeof(recvtimeout)); #endif if(tp->th_opcode == opcode_WRQ) @@ -1054,7 +1059,7 @@ static int do_tftp(struct testcase *test, struct tftphdr *tp, ssize_t size) #ifdef USE_WINSOCK recvtimeout = recvtimeoutbak; setsockopt(peer, SOL_SOCKET, SO_RCVTIMEO, - (const char*)&recvtimeout, sizeof(recvtimeout)); + (const char *)&recvtimeout, sizeof(recvtimeout)); #endif return 0; @@ -1232,19 +1237,17 @@ static void sendtftp(struct testcase *test, struct formats *pf) { int size; ssize_t n; - /* This is volatile to live through a siglongjmp */ + /* These are volatile to live through a siglongjmp */ volatile unsigned short sendblock; /* block count */ - struct tftphdr *sdp; /* data buffer */ - struct tftphdr *sap; /* ack buffer */ + struct tftphdr * volatile sdp = r_init(); /* data buffer */ + struct tftphdr * const sap = &ackbuf.hdr; /* ack buffer */ sendblock = 1; #if defined(HAVE_ALARM) && defined(SIGALRM) mysignal(SIGALRM, timer); #endif - sdp = r_init(); - sap = &ackbuf.hdr; do { - size = readit(test, &sdp, pf->f_convert); + size = readit(test, (struct tftphdr **)&sdp, pf->f_convert); if(size < 0) { nak(errno + 100); return; diff --git a/tests/server/util.c b/tests/server/util.c index d99336397..8465cd9c3 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -135,7 +135,7 @@ void logmsg(const char *msg, ...) #ifdef WIN32 /* use instead of perror() on generic windows */ -void win32_perror (const char *msg) +void win32_perror(const char *msg) { char buf[512]; DWORD err = SOCKERRNO; @@ -305,3 +305,87 @@ void clear_advisor_read_lock(const char *filename) logmsg("Error removing lock file %s error: %d %s", filename, error, strerror(error)); } + + +/* Portable, consistent toupper (remember EBCDIC). Do not use toupper() because + its behavior is altered by the current locale. */ +static char raw_toupper(char in) +{ +#if !defined(CURL_DOES_CONVERSIONS) + if(in >= 'a' && in <= 'z') + return (char)('A' + in - 'a'); +#else + switch(in) { + case 'a': + return 'A'; + case 'b': + return 'B'; + case 'c': + return 'C'; + case 'd': + return 'D'; + case 'e': + return 'E'; + case 'f': + return 'F'; + case 'g': + return 'G'; + case 'h': + return 'H'; + case 'i': + return 'I'; + case 'j': + return 'J'; + case 'k': + return 'K'; + case 'l': + return 'L'; + case 'm': + return 'M'; + case 'n': + return 'N'; + case 'o': + return 'O'; + case 'p': + return 'P'; + case 'q': + return 'Q'; + case 'r': + return 'R'; + case 's': + return 'S'; + case 't': + return 'T'; + case 'u': + return 'U'; + case 'v': + return 'V'; + case 'w': + return 'W'; + case 'x': + return 'X'; + case 'y': + return 'Y'; + case 'z': + return 'Z'; + } +#endif + + return in; +} + +int strncasecompare(const char *first, const char *second, size_t max) +{ + while(*first && *second && max) { + if(raw_toupper(*first) != raw_toupper(*second)) { + break; + } + max--; + first++; + second++; + } + if(0 == max) + return 1; /* they are equal this far */ + + return raw_toupper(*first) == raw_toupper(*second); +} diff --git a/tests/server/util.h b/tests/server/util.h index 2a19a613b..a2a56badd 100644 --- a/tests/server/util.h +++ b/tests/server/util.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -44,7 +44,7 @@ extern const char *serverlogfile; #undef perror #define perror(m) win32_perror(m) -void win32_perror (const char *msg); +void win32_perror(const char *msg); #endif /* WIN32 */ #ifdef USE_WINSOCK @@ -63,4 +63,6 @@ void set_advisor_read_lock(const char *filename); void clear_advisor_read_lock(const char *filename); +int strncasecompare(const char *first, const char *second, size_t max); + #endif /* HEADER_CURL_SERVER_UTIL_H */ diff --git a/tests/testcurl.1 b/tests/testcurl.1 index 509f5dcc9..ee07d64fe 100644 --- a/tests/testcurl.1 +++ b/tests/testcurl.1 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -32,7 +32,7 @@ crontab job or similar at a regular interval. The output is suitable to be mailed to curl-autocompile@haxx.se to be dealt with automatically (make sure the subject includes the word "autobuild" as the mail gets silently discarded otherwise). The most current build status (with a reasonable backlog) will be -published on the curl site, at https://curl.haxx.se/auto/ +published on the curl site, at https://curl.haxx.se/dev/builds.html \fIoptions\fP may be omitted. See \fI--setup\fP for what happens then. @@ -78,13 +78,13 @@ Specify your target environment. Recognized strings include 'vc', 'mingw32', \&'borland' and 'netware'. .SH "INITIAL SETUP" First you make a checkout from git (or you write a script that downloads daily -snapshots automatically, find inspiration at -https://curl.haxx.se/auto/autocurl.txt): +snapshots automatically, find inspiration in +https://curl.haxx.se/dev/autocurl.txt ): .nf $ mkdir daily-curl $ cd daily-curl - $ git clone git://github.com/curl/curl.git + $ git clone https://github.com/curl/curl.git .fi With the curl sources checked out, or downloaded, you can start testing right diff --git a/tests/testcurl.html b/tests/testcurl.html index 200b8fd53..73d38cf79 100644 --- a/tests/testcurl.html +++ b/tests/testcurl.html @@ -53,7 +53,7 @@ p.roffit { <p class="level0"><a name="NAME"></a><h2 class="nroffsh">NAME</h2> <p class="level0">testcurl.pl - (automatically) test curl <a name="SYNOPSIS"></a><h2 class="nroffsh">SYNOPSIS</h2> <p class="level0"><span Class="bold">testcurl.pl [options] [dir] > output</span> <a name="DESCRIPTION"></a><h2 class="nroffsh">DESCRIPTION</h2> -<p class="level0"><span Class="emphasis">testcurl.pl</span> is the master script to use for automatic testing of curl off git or daily snapshots. It is written for the purpose of being run from a crontab job or similar at a regular interval. The output is suitable to be mailed to curl-autocompile@haxx.se to be dealt with automatically (make sure the subject includes the word "autobuild" as the mail gets silently discarded otherwise). The most current build status (with a reasonable backlog) will be published on the curl site, at <a href="https://curl.haxx.se/auto/">https://curl.haxx.se/auto/</a> +<p class="level0"><span Class="emphasis">testcurl.pl</span> is the master script to use for automatic testing of curl off git or daily snapshots. It is written for the purpose of being run from a crontab job or similar at a regular interval. The output is suitable to be mailed to curl-autocompile@haxx.se to be dealt with automatically (make sure the subject includes the word "autobuild" as the mail gets silently discarded otherwise). The most current build status (with a reasonable backlog) will be published on the curl site, at <a href="https://curl.haxx.se/dev/builds.html">https://curl.haxx.se/dev/builds.html</a> <p class="level0"><span Class="emphasis">options</span> may be omitted. See <span Class="emphasis">--setup</span> for what happens then. <p class="level0"><span Class="emphasis">dir</span> is a curl source dir, possibly a daily snapshot one. Using this will make testcurl.pl skip the 'buildconf' stage and thus it removes the dependency on automake, autoconf, libtool, GNU m4 and possibly a few other things. <p class="level0">testcurl.pl will run 'buildconf' (or similar), run configure, build curl and libcurl in a separate build directory and then run 'make test' to test the fresh build. <a name="OPTIONS"></a><h2 class="nroffsh">OPTIONS</h2> @@ -80,11 +80,11 @@ p.roffit { <p class="level1">File name to read setup from (deprecated). The old style of providing info. If info is missing when testcurl.pl is started, it will prompt you and then store the info in a 'setup' file, which it will look for on each invoke. Use <span Class="emphasis">--name</span>, <span Class="emphasis">--email</span>, <span Class="emphasis">--configure</span> and <span Class="emphasis">--desc</span> instead. <p class="level0"><a name="--targetyour"></a><span class="nroffip">--target=[your os]</span> <p class="level1">Specify your target environment. Recognized strings include 'vc', 'mingw32', 'borland' and 'netware'. <a name="INITIAL"></a><h2 class="nroffsh">INITIAL SETUP</h2> -<p class="level0">First you make a checkout from git (or you write a script that downloads daily snapshots automatically, find inspiration at <a href="https://curl.haxx.se/auto/autocurl.txt):">https://curl.haxx.se/auto/autocurl.txt):</a> +<p class="level0">First you make a checkout from git (or you write a script that downloads daily snapshots automatically, find inspiration in <a href="https://curl.haxx.se/dev/autocurl.txt">https://curl.haxx.se/dev/autocurl.txt</a> ): <p class="level0"><pre class="level0"> $ mkdir daily-curl $ cd daily-curl - $ git clone git://github.com/curl/curl.git + $ git clone https://github.com/curl/curl.git </pre> <p class="level0"> diff --git a/tests/testcurl.pdf b/tests/testcurl.pdf Binary files differindex 4d81d7f33..e691666a6 100644 --- a/tests/testcurl.pdf +++ b/tests/testcurl.pdf diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt new file mode 100644 index 000000000..14589d68d --- /dev/null +++ b/tests/unit/CMakeLists.txt @@ -0,0 +1,54 @@ + +set(UT_SRC + unit1300.c + unit1301.c + unit1302.c + unit1303.c + unit1304.c + unit1305.c + unit1307.c + unit1308.c + unit1309.c + unit1330.c +# Broken link on Linux +# unit1394.c + unit1395.c + unit1396.c + unit1397.c + unit1398.c + unit1600.c + unit1601.c + unit1603.c +# Broken link on Linux +# unit1604.c + ) + +set(UT_COMMON_FILES ../libtest/first.c ../libtest/test.h curlcheck.h) +include_directories( + ${CURL_SOURCE_DIR}/lib # To be able to reach "curl_setup_once.h" + ${CURL_SOURCE_DIR}/tests/libtest + ${CURL_SOURCE_DIR}/src + ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h" + ${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h" +) + +foreach(_testfile ${UT_SRC}) + + get_filename_component(_testname ${_testfile} NAME_WE) + add_executable(${_testname} ${_testfile} ${UT_COMMON_FILES}) + target_link_libraries(${_testname} libcurl ${CURL_LIBS}) + set_target_properties(${_testname} + PROPERTIES COMPILE_DEFINITIONS "UNITTESTS") + + if(HIDES_CURL_PRIVATE_SYMBOLS) + set_target_properties(${_testname} + PROPERTIES + EXCLUDE_FROM_ALL TRUE + EXCLUDE_FROM_DEFAULT_BUILD TRUE + ) + else() + add_test(NAME ${_testname} + COMMAND ${_testname} "http://www.google.com" + ) + endif() +endforeach() diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index d4987d69d..7075f8c3a 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -54,7 +54,7 @@ AM_CPPFLAGS = -I$(top_builddir)/include/curl \ -I$(top_srcdir)/tests/libtest endif -EXTRA_DIST = Makefile.inc +EXTRA_DIST = Makefile.inc CMakeLists.txt # Prevent LIBS from being used for all link targets LIBS = $(BLANK_AT_MAKETIME) diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in index e4ef7852f..cb00b4f02 100644 --- a/tests/unit/Makefile.in +++ b/tests/unit/Makefile.in @@ -124,7 +124,7 @@ am__EXEEXT_1 = unit1300$(EXEEXT) unit1301$(EXEEXT) unit1302$(EXEEXT) \ unit1330$(EXEEXT) unit1394$(EXEEXT) unit1395$(EXEEXT) \ unit1396$(EXEEXT) unit1397$(EXEEXT) unit1398$(EXEEXT) \ unit1600$(EXEEXT) unit1601$(EXEEXT) unit1602$(EXEEXT) \ - unit1603$(EXEEXT) unit1604$(EXEEXT) + unit1603$(EXEEXT) unit1604$(EXEEXT) unit1605$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) am__dirstamp = $(am__leading_dot)dirstamp am__objects_1 = ../libtest/unit1300-first.$(OBJEXT) @@ -252,6 +252,12 @@ unit1604_OBJECTS = $(am_unit1604_OBJECTS) unit1604_LDADD = $(LDADD) unit1604_DEPENDENCIES = $(top_builddir)/src/libcurltool.la \ $(top_builddir)/lib/libcurlu.la +am__objects_21 = ../libtest/unit1605-first.$(OBJEXT) +am_unit1605_OBJECTS = unit1605-unit1605.$(OBJEXT) $(am__objects_21) +unit1605_OBJECTS = $(am_unit1605_OBJECTS) +unit1605_LDADD = $(LDADD) +unit1605_DEPENDENCIES = $(top_builddir)/src/libcurltool.la \ + $(top_builddir)/lib/libcurlu.la AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -292,14 +298,15 @@ SOURCES = $(unit1300_SOURCES) $(unit1301_SOURCES) $(unit1302_SOURCES) \ $(unit1330_SOURCES) $(unit1394_SOURCES) $(unit1395_SOURCES) \ $(unit1396_SOURCES) $(unit1397_SOURCES) $(unit1398_SOURCES) \ $(unit1600_SOURCES) $(unit1601_SOURCES) $(unit1602_SOURCES) \ - $(unit1603_SOURCES) $(unit1604_SOURCES) + $(unit1603_SOURCES) $(unit1604_SOURCES) $(unit1605_SOURCES) DIST_SOURCES = $(unit1300_SOURCES) $(unit1301_SOURCES) \ $(unit1302_SOURCES) $(unit1303_SOURCES) $(unit1304_SOURCES) \ $(unit1305_SOURCES) $(unit1307_SOURCES) $(unit1308_SOURCES) \ $(unit1309_SOURCES) $(unit1330_SOURCES) $(unit1394_SOURCES) \ $(unit1395_SOURCES) $(unit1396_SOURCES) $(unit1397_SOURCES) \ $(unit1398_SOURCES) $(unit1600_SOURCES) $(unit1601_SOURCES) \ - $(unit1602_SOURCES) $(unit1603_SOURCES) $(unit1604_SOURCES) + $(unit1602_SOURCES) $(unit1603_SOURCES) $(unit1604_SOURCES) \ + $(unit1605_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -573,7 +580,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc @USE_EMBEDDED_ARES_TRUE@ -I$(top_builddir)/ares \ @USE_EMBEDDED_ARES_TRUE@ -I$(top_srcdir)/ares -DCURL_STATICLIB \ @USE_EMBEDDED_ARES_TRUE@ -DUNITTESTS -EXTRA_DIST = Makefile.inc +EXTRA_DIST = Makefile.inc CMakeLists.txt LDADD = $(top_builddir)/src/libcurltool.la \ $(top_builddir)/lib/libcurlu.la \ @LDFLAGS@ @LIBCURL_LIBS@ @@ -589,7 +596,7 @@ UNITFILES = curlcheck.h \ # These are all unit test programs UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 \ unit1308 unit1309 unit1330 unit1394 unit1395 unit1396 unit1397 unit1398 \ - unit1600 unit1601 unit1602 unit1603 unit1604 + unit1600 unit1601 unit1602 unit1603 unit1604 unit1605 unit1300_SOURCES = unit1300.c $(UNITFILES) unit1300_CPPFLAGS = $(AM_CPPFLAGS) @@ -634,6 +641,8 @@ unit1603_SOURCES = unit1603.c $(UNITFILES) unit1603_CPPFLAGS = $(AM_CPPFLAGS) unit1604_SOURCES = unit1604.c $(UNITFILES) unit1604_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS) +unit1605_SOURCES = unit1605.c $(UNITFILES) +unit1605_CPPFLAGS = $(AM_CPPFLAGS) all: all-am .SUFFIXES: @@ -803,6 +812,12 @@ unit1603$(EXEEXT): $(unit1603_OBJECTS) $(unit1603_DEPENDENCIES) $(EXTRA_unit1603 unit1604$(EXEEXT): $(unit1604_OBJECTS) $(unit1604_DEPENDENCIES) $(EXTRA_unit1604_DEPENDENCIES) @rm -f unit1604$(EXEEXT) $(AM_V_CCLD)$(LINK) $(unit1604_OBJECTS) $(unit1604_LDADD) $(LIBS) +../libtest/unit1605-first.$(OBJEXT): ../libtest/$(am__dirstamp) \ + ../libtest/$(DEPDIR)/$(am__dirstamp) + +unit1605$(EXEEXT): $(unit1605_OBJECTS) $(unit1605_DEPENDENCIES) $(EXTRA_unit1605_DEPENDENCIES) + @rm -f unit1605$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(unit1605_OBJECTS) $(unit1605_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -831,6 +846,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@../libtest/$(DEPDIR)/unit1602-first.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../libtest/$(DEPDIR)/unit1603-first.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@../libtest/$(DEPDIR)/unit1604-first.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@../libtest/$(DEPDIR)/unit1605-first.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unit1300-unit1300.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unit1301-unit1301.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unit1302-unit1302.Po@am__quote@ @@ -851,6 +867,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unit1602-unit1602.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unit1603-unit1603.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unit1604-unit1604.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unit1605-unit1605.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -1436,6 +1453,34 @@ unit1604-unit1604.obj: unit1604.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(unit1604_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../libtest/unit1604-first.obj `if test -f '../libtest/first.c'; then $(CYGPATH_W) '../libtest/first.c'; else $(CYGPATH_W) '$(srcdir)/../libtest/first.c'; fi` +unit1605-unit1605.o: unit1605.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(unit1605_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unit1605-unit1605.o -MD -MP -MF $(DEPDIR)/unit1605-unit1605.Tpo -c -o unit1605-unit1605.o `test -f 'unit1605.c' || echo '$(srcdir)/'`unit1605.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unit1605-unit1605.Tpo $(DEPDIR)/unit1605-unit1605.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unit1605.c' object='unit1605-unit1605.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(unit1605_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unit1605-unit1605.o `test -f 'unit1605.c' || echo '$(srcdir)/'`unit1605.c + +unit1605-unit1605.obj: unit1605.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(unit1605_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unit1605-unit1605.obj -MD -MP -MF $(DEPDIR)/unit1605-unit1605.Tpo -c -o unit1605-unit1605.obj `if test -f 'unit1605.c'; then $(CYGPATH_W) 'unit1605.c'; else $(CYGPATH_W) '$(srcdir)/unit1605.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/unit1605-unit1605.Tpo $(DEPDIR)/unit1605-unit1605.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unit1605.c' object='unit1605-unit1605.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(unit1605_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unit1605-unit1605.obj `if test -f 'unit1605.c'; then $(CYGPATH_W) 'unit1605.c'; else $(CYGPATH_W) '$(srcdir)/unit1605.c'; fi` + +../libtest/unit1605-first.o: ../libtest/first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(unit1605_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../libtest/unit1605-first.o -MD -MP -MF ../libtest/$(DEPDIR)/unit1605-first.Tpo -c -o ../libtest/unit1605-first.o `test -f '../libtest/first.c' || echo '$(srcdir)/'`../libtest/first.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../libtest/$(DEPDIR)/unit1605-first.Tpo ../libtest/$(DEPDIR)/unit1605-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../libtest/first.c' object='../libtest/unit1605-first.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(unit1605_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../libtest/unit1605-first.o `test -f '../libtest/first.c' || echo '$(srcdir)/'`../libtest/first.c + +../libtest/unit1605-first.obj: ../libtest/first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(unit1605_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../libtest/unit1605-first.obj -MD -MP -MF ../libtest/$(DEPDIR)/unit1605-first.Tpo -c -o ../libtest/unit1605-first.obj `if test -f '../libtest/first.c'; then $(CYGPATH_W) '../libtest/first.c'; else $(CYGPATH_W) '$(srcdir)/../libtest/first.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../libtest/$(DEPDIR)/unit1605-first.Tpo ../libtest/$(DEPDIR)/unit1605-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../libtest/first.c' object='../libtest/unit1605-first.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(unit1605_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../libtest/unit1605-first.obj `if test -f '../libtest/first.c'; then $(CYGPATH_W) '../libtest/first.c'; else $(CYGPATH_W) '$(srcdir)/../libtest/first.c'; fi` + mostlyclean-libtool: -rm -f *.lo diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc index c5a152373..e7db96f50 100644 --- a/tests/unit/Makefile.inc +++ b/tests/unit/Makefile.inc @@ -7,7 +7,7 @@ UNITFILES = curlcheck.h \ # These are all unit test programs UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 \ unit1308 unit1309 unit1330 unit1394 unit1395 unit1396 unit1397 unit1398 \ - unit1600 unit1601 unit1602 unit1603 unit1604 + unit1600 unit1601 unit1602 unit1603 unit1604 unit1605 unit1300_SOURCES = unit1300.c $(UNITFILES) unit1300_CPPFLAGS = $(AM_CPPFLAGS) @@ -72,3 +72,5 @@ unit1603_CPPFLAGS = $(AM_CPPFLAGS) unit1604_SOURCES = unit1604.c $(UNITFILES) unit1604_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS) +unit1605_SOURCES = unit1605.c $(UNITFILES) +unit1605_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/tests/unit/unit1301.c b/tests/unit/unit1301.c index 928076e29..aa8610113 100644 --- a/tests/unit/unit1301.c +++ b/tests/unit/unit1301.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -#include "strequal.h" +#include "strcase.h" static CURLcode unit_setup(void) {return CURLE_OK;} static void unit_stop(void) {} diff --git a/tests/unit/unit1303.c b/tests/unit/unit1303.c index a4bd59826..c39e147aa 100644 --- a/tests/unit/unit1303.c +++ b/tests/unit/unit1303.c @@ -69,12 +69,12 @@ struct timetest { }; UNITTEST_START +{ + struct timeval now; + long timeout; + unsigned int i; -struct timeval now; -long timeout; -unsigned int i; - -const struct timetest run[] = { + const struct timetest run[] = { /* both timeouts set, not connecting */ {BASE + 4, 0, 10000, 8000, FALSE, 6000, "6 seconds should be left"}, {BASE + 4, 990000, 10000, 8000, FALSE, 5010, "5010 ms should be left"}, @@ -126,21 +126,20 @@ const struct timetest run[] = { /* both timeouts set, connecting, connect timeout the longer one */ {BASE + 4, 0, 10000, 12000, TRUE, 6000, "6 seconds should be left"}, -}; - -/* this is the pretended start time of the transfer */ -data->progress.t_startsingle.tv_sec = BASE; -data->progress.t_startsingle.tv_usec = 0; -data->progress.t_startop.tv_sec = BASE; -data->progress.t_startop.tv_usec = 0; - -for(i=0; i < sizeof(run)/sizeof(run[0]); i++) { - NOW(run[i].now_s, run[i].now_us); - TIMEOUTS(run[i].timeout_ms, run[i].connecttimeout_ms); - timeout = Curl_timeleft(data, &now, run[i].connecting); - if(timeout != run[i].result) - fail(run[i].comment); + }; + + /* this is the pretended start time of the transfer */ + data->progress.t_startsingle.tv_sec = BASE; + data->progress.t_startsingle.tv_usec = 0; + data->progress.t_startop.tv_sec = BASE; + data->progress.t_startop.tv_usec = 0; + + for(i=0; i < sizeof(run)/sizeof(run[0]); i++) { + NOW(run[i].now_s, run[i].now_us); + TIMEOUTS(run[i].timeout_ms, run[i].connecttimeout_ms); + timeout = Curl_timeleft(data, &now, run[i].connecting); + if(timeout != run[i].result) + fail(run[i].comment); + } } - - UNITTEST_STOP diff --git a/tests/unit/unit1304.c b/tests/unit/unit1304.c index 11bba390f..83375f55d 100644 --- a/tests/unit/unit1304.c +++ b/tests/unit/unit1304.c @@ -48,7 +48,7 @@ static void unit_stop(void) UNITTEST_START int result; - static const char* const filename1 = "log/netrc1304"; + static const char * const filename1 = "log/netrc1304"; memcpy(filename, filename1, strlen(filename1)); /* diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c index ad270f565..db0a44c5f 100644 --- a/tests/unit/unit1305.c +++ b/tests/unit/unit1305.c @@ -78,17 +78,20 @@ static Curl_addrinfo *fake_ai(void) static Curl_addrinfo *ai; int ss_size; - ss_size = sizeof (struct sockaddr_in); + ss_size = sizeof(struct sockaddr_in); - if((ai = calloc(1, sizeof(Curl_addrinfo))) == NULL) + ai = calloc(1, sizeof(Curl_addrinfo)); + if(!ai) return NULL; - if((ai->ai_canonname = strdup("dummy")) == NULL) { + ai->ai_canonname = strdup("dummy"); + if(!ai->ai_canonname) { free(ai); return NULL; } - if((ai->ai_addr = calloc(1, ss_size)) == NULL) { + ai->ai_addr = calloc(1, ss_size); + if(!ai->ai_addr) { free(ai->ai_canonname); free(ai); return NULL; diff --git a/tests/unit/unit1308.c b/tests/unit/unit1308.c index 968bcff21..5c1a00867 100644 --- a/tests/unit/unit1308.c +++ b/tests/unit/unit1308.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -42,8 +42,8 @@ static size_t print_httppost_callback(void *arg, const char *buf, size_t len) UNITTEST_START int rc; - struct curl_httppost* post = NULL; - struct curl_httppost* last = NULL; + struct curl_httppost *post = NULL; + struct curl_httppost *last = NULL; size_t total_size = 0; char buffer[] = "test buffer"; diff --git a/tests/unit/unit1602.c b/tests/unit/unit1602.c index c67c0a555..5f1ee9f47 100644 --- a/tests/unit/unit1602.c +++ b/tests/unit/unit1602.c @@ -32,7 +32,7 @@ static struct curl_hash hash_static; static void mydtor(void *p) { - int *ptr = (int*)p; + int *ptr = (int *)p; free(ptr); } diff --git a/tests/unit/unit1604.c b/tests/unit/unit1604.c index 242be0005..5f1ea9518 100644 --- a/tests/unit/unit1604.c +++ b/tests/unit/unit1604.c @@ -42,7 +42,8 @@ static void unit_stop(void) #if defined(MSDOS) || defined(WIN32) -static char *getflagstr(int flags) { +static char *getflagstr(int flags) +{ char *buf = malloc(256); fail_unless(buf, "out of memory"); snprintf(buf, 256, "%s,%s,%s,%s", @@ -53,7 +54,8 @@ static char *getflagstr(int flags) { return buf; } -static char *getcurlcodestr(int cc) { +static char *getcurlcodestr(int cc) +{ char *buf = malloc(256); fail_unless(buf, "out of memory"); snprintf(buf, 256, "%s (%d)", diff --git a/tests/unit/unit1605.c b/tests/unit/unit1605.c new file mode 100644 index 000000000..c807cb3f2 --- /dev/null +++ b/tests/unit/unit1605.c @@ -0,0 +1,49 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "curlcheck.h" + +#include "llist.h" + +static CURLcode unit_setup(void) +{ + return CURLE_OK; +} + +static void unit_stop(void) +{ + +} + +UNITTEST_START + CURL *easy = curl_easy_init(); + int len; + char *esc; + + esc = curl_easy_escape(easy, "", -1); + fail_unless(esc == NULL, "negative string length can't work"); + + esc = curl_easy_unescape(easy, "%41%41%41%41", -1, &len); + fail_unless(esc == NULL, "negative string length can't work"); + + curl_easy_cleanup(easy); + +UNITTEST_STOP diff --git a/tests/valgrind.pm b/tests/valgrind.pm index 838183b44..e6f66fd50 100644 --- a/tests/valgrind.pm +++ b/tests/valgrind.pm @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -26,90 +26,9 @@ sub valgrindparse { my ($srcdir, # the dir in which the runtests script resides $sslenabled, $file) = @_; - my $leak; - my $invalidread; - my $uninitedvar; - my $error; - my $partial; - my $us; - my @o; - - my $bt=0; - my $nssinit=0; - open(VAL, "<$file"); - while(<VAL>) { - if($bt) { - # back trace parsing - if($_ =~ /^==(\d+)== *(at|by) 0x([0-9A-F]+): (.*)/) { - my $w = $4; - if($w =~ /(.*) \(([^:]*):(\d+)/) { - my ($func, $source, $line)=($1, $2, $3); - my $sourcename = basename($source); - if(-f "$srcdir/../src/$sourcename" || - -f "$srcdir/../lib/$sourcename") { - # this is our source - # print "$func() at $source:$line\n"; - $us++; - } #else {print "Not our source: $func, $source, $line\n";} - } - - # the memory leakage within NSS_InitContext is not a bug of curl - if($w =~ /NSS_InitContext/) { - $nssinit++; - } - } - else { - if($us and not $nssinit) { - # the stack trace included source details about us - - $error++; - if($leak) { - push @o, "\n Leaked $leak bytes\n"; - } - if($invalidread) { - push @o, "\n Read $invalidread invalid bytes\n"; - } - if($uninitedvar) { - push @o, "\n Conditional jump or move depends on uninitialised value(s)\n"; - } - } - $bt = 0; # no more backtrace - $us = 0; - $nssinit = 0; - } - } - else { - if($_ =~ /(\d+) bytes in (\d+) blocks are definitely lost/) { - $leak = $1; - if($leak) { - $error++; - } - $bt = 1; - } - elsif($_ =~ /Invalid read of size (\d+)/) { - $invalidread = $1; - $error++; - $bt = 1; - } - elsif($_ =~ /Conditional jump or move/) { - # If we require SSL, this test case most probaly makes - # us use OpenSSL. OpenSSL produces numerous valgrind - # errors of this kind, rendering it impossible for us to - # detect (valid) reports on actual curl or libcurl code. - - if(!$sslenabled) { - $uninitedvar = 1; - $error++; - $bt = 1; - } - else { - $partial=1; - } - } - } - } + @o = <VAL>; close(VAL); return @o; } |