mirror of
https://github.com/curl/curl.git
synced 2024-12-21 06:50:10 +08:00
e9a7d4a1c8
Windows compilers define `_WIN32` automatically. Windows SDK headers or build env defines `WIN32`, or we have to take care of it. The agreement seems to be that `_WIN32` is the preferred practice here. Make the source code rely on that to detect we're building for Windows. Public `curl.h` was using `WIN32`, `__WIN32__` and `CURL_WIN32` for Windows detection, next to the official `_WIN32`. After this patch it only uses `_WIN32` for this. Also, make it stop defining `CURL_WIN32`. There is a slight chance these break compatibility with Windows compilers that fail to define `_WIN32`. I'm not aware of any obsolete or modern compiler affected, but in case there is one, one possible solution is to define this macro manually. grepping for `WIN32` remains useful to discover Windows-specific code. Also: - extend `checksrc` to ensure we're not using `WIN32` anymore. - apply minor formatting here and there. - delete unnecessary checks for `!MSDOS` when `_WIN32` is present. Co-authored-by: Jay Satiro Reviewed-by: Daniel Stenberg Closes #12376
134 lines
4.6 KiB
C
134 lines
4.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
|
|
*
|
|
***************************************************************************/
|
|
#include "curlcheck.h"
|
|
|
|
#include "tool_getparam.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "memdebug.h" /* LAST include file */
|
|
|
|
static CURLcode unit_setup(void)
|
|
{
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static void unit_stop(void)
|
|
{
|
|
|
|
}
|
|
|
|
UNITTEST_START
|
|
|
|
const char *values[] = {
|
|
/* -E parameter */ /* exp. cert name */ /* exp. passphrase */
|
|
"foo:bar:baz", "foo", "bar:baz",
|
|
"foo\\:bar:baz", "foo:bar", "baz",
|
|
"foo\\\\:bar:baz", "foo\\", "bar:baz",
|
|
"foo:bar\\:baz", "foo", "bar\\:baz",
|
|
"foo:bar\\\\:baz", "foo", "bar\\\\:baz",
|
|
"foo\\bar\\baz", "foo\\bar\\baz", NULL,
|
|
"foo\\\\bar\\\\baz", "foo\\bar\\baz", NULL,
|
|
"foo\\", "foo\\", NULL,
|
|
"foo\\\\", "foo\\", NULL,
|
|
"foo:bar\\", "foo", "bar\\",
|
|
"foo:bar\\\\", "foo", "bar\\\\",
|
|
"foo:bar:", "foo", "bar:",
|
|
"foo\\::bar\\:", "foo:", "bar\\:",
|
|
"pkcs11:foobar", "pkcs11:foobar", NULL,
|
|
"PKCS11:foobar", "PKCS11:foobar", NULL,
|
|
"PkCs11:foobar", "PkCs11:foobar", NULL,
|
|
#ifdef _WIN32
|
|
"c:\\foo:bar:baz", "c:\\foo", "bar:baz",
|
|
"c:\\foo\\:bar:baz", "c:\\foo:bar", "baz",
|
|
"c:\\foo\\\\:bar:baz", "c:\\foo\\", "bar:baz",
|
|
"c:\\foo:bar\\:baz", "c:\\foo", "bar\\:baz",
|
|
"c:\\foo:bar\\\\:baz", "c:\\foo", "bar\\\\:baz",
|
|
"c:\\foo\\bar\\baz", "c:\\foo\\bar\\baz", NULL,
|
|
"c:\\foo\\\\bar\\\\baz", "c:\\foo\\bar\\baz", NULL,
|
|
"c:\\foo\\", "c:\\foo\\", NULL,
|
|
"c:\\foo\\\\", "c:\\foo\\", NULL,
|
|
"c:\\foo:bar\\", "c:\\foo", "bar\\",
|
|
"c:\\foo:bar\\\\", "c:\\foo", "bar\\\\",
|
|
"c:\\foo:bar:", "c:\\foo", "bar:",
|
|
"c:\\foo\\::bar\\:", "c:\\foo:", "bar\\:",
|
|
#endif
|
|
NULL, NULL, NULL,
|
|
};
|
|
const char **p;
|
|
char *certname, *passphrase;
|
|
for(p = values; *p; p += 3) {
|
|
parse_cert_parameter(p[0], &certname, &passphrase);
|
|
if(p[1]) {
|
|
if(certname) {
|
|
if(strcmp(p[1], certname)) {
|
|
printf("expected certname '%s' but got '%s' "
|
|
"for -E param '%s'\n", p[1], certname, p[0]);
|
|
fail("assertion failure");
|
|
}
|
|
}
|
|
else {
|
|
printf("expected certname '%s' but got NULL "
|
|
"for -E param '%s'\n", p[1], p[0]);
|
|
fail("assertion failure");
|
|
}
|
|
}
|
|
else {
|
|
if(certname) {
|
|
printf("expected certname NULL but got '%s' "
|
|
"for -E param '%s'\n", certname, p[0]);
|
|
fail("assertion failure");
|
|
}
|
|
}
|
|
if(p[2]) {
|
|
if(passphrase) {
|
|
if(strcmp(p[2], passphrase)) {
|
|
printf("expected passphrase '%s' but got '%s'"
|
|
"for -E param '%s'\n", p[2], passphrase, p[0]);
|
|
fail("assertion failure");
|
|
}
|
|
}
|
|
else {
|
|
printf("expected passphrase '%s' but got NULL "
|
|
"for -E param '%s'\n", p[2], p[0]);
|
|
fail("assertion failure");
|
|
}
|
|
}
|
|
else {
|
|
if(passphrase) {
|
|
printf("expected passphrase NULL but got '%s' "
|
|
"for -E param '%s'\n", passphrase, p[0]);
|
|
fail("assertion failure");
|
|
}
|
|
}
|
|
if(certname)
|
|
free(certname);
|
|
if(passphrase)
|
|
free(passphrase);
|
|
}
|
|
|
|
UNITTEST_STOP
|