mirror of
https://github.com/curl/curl.git
synced 2026-04-15 01:05:56 +08:00
34ad78da89
Also:
- tests/server: replace local `sstrerror()` with `curlx_strerror()`.
- tests/server: show the error code next to the string, where missing.
- curlx: use `curl_msnprintf()` when building for src and tests.
(units was already using it.)
- lib: drop unused includes found along the way.
- curlx_strerror(): avoid compiler warning (and another similar one):
```
In file included from servers.c:14:
../../lib/../../lib/curlx/strerr.c: In function ‘curlx_strerror’:
../../lib/../../lib/curlx/strerr.c:328:32: error: ‘snprintf’ output may be truncated before the last format character [-Werror=format-truncation=]
328 | SNPRINTF(buf, buflen, "%s", msg);
| ^
../../lib/../../lib/curlx/strerr.c:47:18: note: ‘snprintf’ output 1 or more bytes (assuming 2) into a destination of size 1
47 | #define SNPRINTF snprintf
| ^
../../lib/../../lib/curlx/strerr.c:328:7: note: in expansion of macro ‘SNPRINTF’
328 | SNPRINTF(buf, buflen, "%s", msg);
| ^~~~~~~~
```
Follow-up to 45438c8d6f #18823
Closes #18840
145 lines
3.6 KiB
C
145 lines
3.6 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 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.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.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
/* lib591 is used for test cases 591, 592, 593 and 594 */
|
|
|
|
#include "first.h"
|
|
|
|
#include "memdebug.h"
|
|
|
|
static CURLcode test_lib591(const char *URL)
|
|
{
|
|
CURL *easy = NULL;
|
|
CURLM *multi = NULL;
|
|
CURLcode res = CURLE_OK;
|
|
int running;
|
|
int msgs_left;
|
|
CURLMsg *msg;
|
|
FILE *upload = NULL;
|
|
|
|
start_test_timing();
|
|
|
|
upload = curlx_fopen(libtest_arg3, "rb");
|
|
if(!upload) {
|
|
char errbuf[STRERROR_LEN];
|
|
curl_mfprintf(stderr, "fopen() failed with error (%d) %s\n",
|
|
errno, curlx_strerror(errno, errbuf, sizeof(errbuf)));
|
|
curl_mfprintf(stderr, "Error opening file '%s'\n", libtest_arg3);
|
|
return TEST_ERR_FOPEN;
|
|
}
|
|
|
|
res_global_init(CURL_GLOBAL_ALL);
|
|
if(res) {
|
|
curlx_fclose(upload);
|
|
return res;
|
|
}
|
|
|
|
easy_init(easy);
|
|
|
|
/* go verbose */
|
|
easy_setopt(easy, CURLOPT_VERBOSE, 1L);
|
|
|
|
/* specify target */
|
|
easy_setopt(easy, CURLOPT_URL, URL);
|
|
|
|
/* enable uploading */
|
|
easy_setopt(easy, CURLOPT_UPLOAD, 1L);
|
|
|
|
/* data pointer for the file read function */
|
|
easy_setopt(easy, CURLOPT_READDATA, upload);
|
|
|
|
/* use active mode FTP */
|
|
easy_setopt(easy, CURLOPT_FTPPORT, "-");
|
|
|
|
/* server connection timeout */
|
|
easy_setopt(easy, CURLOPT_ACCEPTTIMEOUT_MS, atol(libtest_arg2)*1000);
|
|
|
|
multi_init(multi);
|
|
|
|
multi_add_handle(multi, easy);
|
|
|
|
for(;;) {
|
|
struct timeval interval;
|
|
fd_set fdread;
|
|
fd_set fdwrite;
|
|
fd_set fdexcep;
|
|
long timeout = -99;
|
|
int maxfd = -99;
|
|
|
|
multi_perform(multi, &running);
|
|
|
|
abort_on_test_timeout();
|
|
|
|
if(!running)
|
|
break; /* done */
|
|
|
|
FD_ZERO(&fdread);
|
|
FD_ZERO(&fdwrite);
|
|
FD_ZERO(&fdexcep);
|
|
|
|
multi_fdset(multi, &fdread, &fdwrite, &fdexcep, &maxfd);
|
|
|
|
/* At this point, maxfd is guaranteed to be greater or equal than -1. */
|
|
|
|
multi_timeout(multi, &timeout);
|
|
|
|
/* At this point, timeout is guaranteed to be greater or equal than -1. */
|
|
|
|
if(timeout != -1L) {
|
|
int itimeout;
|
|
#if LONG_MAX > INT_MAX
|
|
itimeout = (timeout > (long)INT_MAX) ? INT_MAX : (int)timeout;
|
|
#else
|
|
itimeout = (int)timeout;
|
|
#endif
|
|
interval.tv_sec = itimeout/1000;
|
|
interval.tv_usec = (itimeout%1000)*1000;
|
|
}
|
|
else {
|
|
interval.tv_sec = 0;
|
|
interval.tv_usec = 100000L; /* 100 ms */
|
|
}
|
|
|
|
select_test(maxfd + 1, &fdread, &fdwrite, &fdexcep, &interval);
|
|
|
|
abort_on_test_timeout();
|
|
}
|
|
|
|
msg = curl_multi_info_read(multi, &msgs_left);
|
|
if(msg)
|
|
res = msg->data.result;
|
|
|
|
test_cleanup:
|
|
|
|
/* undocumented cleanup sequence - type UA */
|
|
|
|
curl_multi_cleanup(multi);
|
|
curl_easy_cleanup(easy);
|
|
curl_global_cleanup();
|
|
|
|
/* close the local file */
|
|
curlx_fclose(upload);
|
|
|
|
return res;
|
|
}
|