mirror of
https://github.com/curl/curl.git
synced 2024-12-27 06:59:43 +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
74 lines
2.3 KiB
C
74 lines
2.3 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 "rename.h"
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#if (!defined(CURL_DISABLE_HTTP) || !defined(CURL_DISABLE_COOKIES)) || \
|
|
!defined(CURL_DISABLE_ALTSVC)
|
|
|
|
#include "curl_multibyte.h"
|
|
#include "timeval.h"
|
|
|
|
/* The last 3 #include files should be in this order */
|
|
#include "curl_printf.h"
|
|
#include "curl_memory.h"
|
|
#include "memdebug.h"
|
|
|
|
/* return 0 on success, 1 on error */
|
|
int Curl_rename(const char *oldpath, const char *newpath)
|
|
{
|
|
#ifdef _WIN32
|
|
/* rename() on Windows doesn't overwrite, so we can't use it here.
|
|
MoveFileEx() will overwrite and is usually atomic, however it fails
|
|
when there are open handles to the file. */
|
|
const int max_wait_ms = 1000;
|
|
struct curltime start = Curl_now();
|
|
TCHAR *tchar_oldpath = curlx_convert_UTF8_to_tchar((char *)oldpath);
|
|
TCHAR *tchar_newpath = curlx_convert_UTF8_to_tchar((char *)newpath);
|
|
for(;;) {
|
|
timediff_t diff;
|
|
if(MoveFileEx(tchar_oldpath, tchar_newpath, MOVEFILE_REPLACE_EXISTING)) {
|
|
curlx_unicodefree(tchar_oldpath);
|
|
curlx_unicodefree(tchar_newpath);
|
|
break;
|
|
}
|
|
diff = Curl_timediff(Curl_now(), start);
|
|
if(diff < 0 || diff > max_wait_ms) {
|
|
curlx_unicodefree(tchar_oldpath);
|
|
curlx_unicodefree(tchar_newpath);
|
|
return 1;
|
|
}
|
|
Sleep(1);
|
|
}
|
|
#else
|
|
if(rename(oldpath, newpath))
|
|
return 1;
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
#endif
|