- appveyor: add build-only job for clang-cl. - cmake: `-pedantic-errors` enables `-Werror,-Wlanguage-extension-token` automatically, which makes `__int64` detection fail. Explictly disable this compiler warning for clang-cl to make the feature detection work and to accept `__int64` in the source code. - cmake: disable `-Wlanguage-extension-token` warning for clang-cl to fix these when encountering `__int64`: ``` lib/formdata.c(797,29): error : extension used [-Werror,-Wlanguage-extension-token] lib/warnless.c(117,33): error : extension used [-Werror,-Wlanguage-extension-token] lib/warnless.c(60,28): message : expanded from macro 'CURL_MASK_SCOFFT' lib/warnless.c(59,38): message : expanded from macro 'CURL_MASK_UCOFFT' include\curl/system.h(352,40): message : expanded from macro 'CURL_TYPEOF_CURL_OFF_T' ``` - make `__GNUC__` warning suppressions apply to `__clang__` too. Necessary for clang-cl, which defines the latter, but not the former. (Regular clang defines both.) - examples: fix clang-cl compiler warning in `http2-upload.c`. ``` docs\examples\http2-upload.c(56,5): error : no previous prototype for function 'my_gettimeofday' [-Werror,-Wmissing-prototypes] docs\examples\http2-upload.c(56,1): message : declare 'static' if the function is not intended to be used outside of this translation unit ``` - unit2604: add missing `#pragma GCC diagnostic pop`. Follow-up toe53523fef0#14859 - unit1652: limit compiler warning suppression to GCC. They do not affect clang builds. Follow-up to71cf0d1fca#14772 Closes #15449
192 lines
5.4 KiB
C
192 lines
5.4 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
|
|
*
|
|
***************************************************************************/
|
|
#include "curlcheck.h"
|
|
#include "curl_get_line.h"
|
|
#include "memdebug.h"
|
|
|
|
#if !defined(CURL_DISABLE_COOKIES) || !defined(CURL_DISABLE_ALTSVC) || \
|
|
!defined(CURL_DISABLE_HSTS) || !defined(CURL_DISABLE_NETRC)
|
|
|
|
/* The test XML does not supply a way to write files without newlines
|
|
* so we write our own
|
|
*/
|
|
|
|
#define C64 "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
#define C256 C64 C64 C64 C64
|
|
#define C1024 C256 C256 C256 C256
|
|
#define C4096 C1024 C1024 C1024 C1024
|
|
|
|
static CURLcode unit_setup(void)
|
|
{
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode unit_stop(void)
|
|
{
|
|
return CURLE_OK;
|
|
}
|
|
|
|
#if defined(__GNUC__) || defined(__clang__)
|
|
#pragma GCC diagnostic push
|
|
#pragma GCC diagnostic ignored "-Woverlength-strings"
|
|
#endif
|
|
|
|
#define NUMTESTS 6
|
|
static const char *filecontents[] = {
|
|
/* Both should be read */
|
|
"LINE1\n"
|
|
"LINE2 NEWLINE\n",
|
|
|
|
/* Both should be read */
|
|
"LINE1\n"
|
|
"LINE2 NONEWLINE",
|
|
|
|
/* Only first should be read */
|
|
"LINE1\n"
|
|
C4096,
|
|
|
|
/* First line should be read */
|
|
"LINE1\n"
|
|
C4096 "SOME EXTRA TEXT",
|
|
|
|
/* Only first should be read */
|
|
"LINE1\n"
|
|
C4096 "SOME EXTRA TEXT\n"
|
|
"LINE3\n",
|
|
|
|
"LINE1\x1aTEST"
|
|
};
|
|
|
|
#if defined(__GNUC__) || defined(__clang__)
|
|
#pragma GCC diagnostic warning "-Woverlength-strings"
|
|
#endif
|
|
|
|
|
|
UNITTEST_START
|
|
size_t i;
|
|
int rc = 0;
|
|
for(i = 0; i < NUMTESTS; i++) {
|
|
FILE *fp;
|
|
struct dynbuf buf;
|
|
size_t len = 4096;
|
|
char *line;
|
|
Curl_dyn_init(&buf, len);
|
|
|
|
fp = fopen(arg, "wb");
|
|
abort_unless(fp != NULL, "Cannot open testfile");
|
|
fwrite(filecontents[i], 1, strlen(filecontents[i]), fp);
|
|
fclose(fp);
|
|
|
|
fp = fopen(arg, "rb");
|
|
abort_unless(fp != NULL, "Cannot open testfile");
|
|
|
|
fprintf(stderr, "Test %zd...", i);
|
|
switch(i) {
|
|
case 0:
|
|
rc = Curl_get_line(&buf, fp);
|
|
line = Curl_dyn_ptr(&buf);
|
|
fail_unless(line && !strcmp("LINE1\n", line),
|
|
"First line failed (1)");
|
|
rc = Curl_get_line(&buf, fp);
|
|
line = Curl_dyn_ptr(&buf);
|
|
fail_unless(line && !strcmp("LINE2 NEWLINE\n", line),
|
|
"Second line failed (1)");
|
|
rc = Curl_get_line(&buf, fp);
|
|
abort_unless(!Curl_dyn_len(&buf), "Missed EOF (1)");
|
|
break;
|
|
case 1:
|
|
rc = Curl_get_line(&buf, fp);
|
|
line = Curl_dyn_ptr(&buf);
|
|
fail_unless(line && !strcmp("LINE1\n", line),
|
|
"First line failed (2)");
|
|
rc = Curl_get_line(&buf, fp);
|
|
line = Curl_dyn_ptr(&buf);
|
|
fail_unless(line && !strcmp("LINE2 NONEWLINE\n", line),
|
|
"Second line failed (2)");
|
|
rc = Curl_get_line(&buf, fp);
|
|
abort_unless(!Curl_dyn_len(&buf), "Missed EOF (2)");
|
|
break;
|
|
case 2:
|
|
rc = Curl_get_line(&buf, fp);
|
|
line = Curl_dyn_ptr(&buf);
|
|
fail_unless(line && !strcmp("LINE1\n", line),
|
|
"First line failed (3)");
|
|
rc = Curl_get_line(&buf, fp);
|
|
fail_unless(!Curl_dyn_len(&buf),
|
|
"Did not detect max read on EOF (3)");
|
|
break;
|
|
case 3:
|
|
rc = Curl_get_line(&buf, fp);
|
|
line = Curl_dyn_ptr(&buf);
|
|
fail_unless(line && !strcmp("LINE1\n", line),
|
|
"First line failed (4)");
|
|
rc = Curl_get_line(&buf, fp);
|
|
fail_unless(!Curl_dyn_len(&buf),
|
|
"Did not ignore partial on EOF (4)");
|
|
break;
|
|
case 4:
|
|
rc = Curl_get_line(&buf, fp);
|
|
line = Curl_dyn_ptr(&buf);
|
|
fail_unless(line && !strcmp("LINE1\n", line),
|
|
"First line failed (5)");
|
|
rc = Curl_get_line(&buf, fp);
|
|
fail_unless(!Curl_dyn_len(&buf),
|
|
"Did not bail out on too long line");
|
|
break;
|
|
case 5:
|
|
rc = Curl_get_line(&buf, fp);
|
|
line = Curl_dyn_ptr(&buf);
|
|
fail_unless(line && !strcmp("LINE1\x1aTEST\n", line),
|
|
"Missed/Misinterpreted ^Z (6)");
|
|
rc = Curl_get_line(&buf, fp);
|
|
abort_unless(!Curl_dyn_len(&buf), "Missed EOF (6)");
|
|
break;
|
|
default:
|
|
abort_unless(1, "Unknown case");
|
|
break;
|
|
}
|
|
Curl_dyn_free(&buf);
|
|
fclose(fp);
|
|
fprintf(stderr, "OK\n");
|
|
}
|
|
return (CURLcode)rc;
|
|
UNITTEST_STOP
|
|
|
|
#if defined(__GNUC__) || defined(__clang__)
|
|
#pragma GCC diagnostic pop
|
|
#endif
|
|
|
|
#else
|
|
static CURLcode unit_setup(void)
|
|
{
|
|
return CURLE_OK;
|
|
}
|
|
static void unit_stop(void)
|
|
{
|
|
}
|
|
UNITTEST_START
|
|
UNITTEST_STOP
|
|
|
|
#endif
|