mirror of
https://github.com/curl/curl.git
synced 2026-04-14 22:41:40 +03:00
cmake: add support for "unity" builds
Aka "jumbo" or "amalgamation" builds. It means to compile all sources per target as a single C source. This is experimental. You can enable it by passing `-DCMAKE_UNITY_BUILD=ON` to cmake. It requires CMake 3.16 or newer. It makes builds (much) faster, allows for better optimizations and tends to promote less ambiguous code. Also add a new AppVeyor CI job and convert an existing one to use "unity" mode (one MSVC, one MinGW), and enable it for one macOS CI job. Fix related issues: - add missing include guard to `easy_lock.h`. - rename static variables and functions (and a macro) with names reused across sources, or shadowed by local variables. - add an `#undef` after use. - add a missing `#undef` before use. - move internal definitions from `ftp.h` to `ftp.c`. - `curl_memory.h` fixes to make it work when included repeatedly. - stop building/linking curlx bits twice for a static-mode curl tool. These caused doubly defined symbols in unity builds. - silence missing extern declarations compiler warning for ` _CRT_glob`. - fix extern declarations for `tool_freq` and `tool_isVistaOrGreater`. - fix colliding static symbols in debug mode: `debugtime()` and `statename`. - rename `ssl_backend_data` structure to unique names for each TLS-backend, along with the `ssl_connect_data` struct member referencing them. This required adding casts for each access. - add workaround for missing `[P]UNICODE_STRING` types in certain Windows builds when compiling `lib/ldap.c`. To support "unity" builds, we had to enable `SCHANNEL_USE_BLACKLISTS` for Schannel (a Windows `schannel.h` option) _globally_. This caused an indirect inclusion of Windows `schannel.h` from `ldap.c` via `winldap.h` to have it enabled as well. This requires `[P]UNICODE_STRING` types, which is apperantly not defined automatically (as seen with both MSVS and mingw-w64). This patch includes `<subauth.h>` to fix it. Ref: https://github.com/curl/curl/runs/13987772013 Ref: https://dev.azure.com/daniel0244/curl/_build/results?buildId=15827&view=logs&jobId=2c9f582d-e278-56b6-4354-f38a4d851906&j=2c9f582d-e278-56b6-4354-f38a4d851906&t=90509b00-34fa-5a81-35d7-5ed9569d331c - tweak unity builds to compile `lib/memdebug.c` separately in memory trace builds to avoid PP confusion. - force-disable unity for test programs. - do not compile and link libcurl sources to libtests _twice_ when libcurl is built in static mode. KNOWN ISSUES: - running tests with unity builds may fail in cases. - some build configurations/env may not compile in unity mode. E.g.: https://ci.appveyor.com/project/curlorg/curl/builds/47230972/job/51wfesgnfuauwl8q#L250 Ref: https://github.com/libssh2/libssh2/issues/1034 Ref: https://cmake.org/cmake/help/latest/prop_tgt/UNITY_BUILD.html Ref: https://en.wikipedia.org/wiki/Unity_build Closes #11095
This commit is contained in:
Viktor Szakats
parent
e812473d1e
commit
3f8fc25720
57 changed files with 1188 additions and 899 deletions
197
lib/smb.h
197
lib/smb.h
|
|
@ -48,203 +48,6 @@ struct smb_conn {
|
|||
size_t got;
|
||||
};
|
||||
|
||||
/*
|
||||
* Definitions for SMB protocol data structures
|
||||
*/
|
||||
#ifdef BUILDING_CURL_SMB_C
|
||||
|
||||
#if defined(_MSC_VER) || defined(__ILEC400__)
|
||||
# define PACK
|
||||
# pragma pack(push)
|
||||
# pragma pack(1)
|
||||
#elif defined(__GNUC__)
|
||||
# define PACK __attribute__((packed))
|
||||
#else
|
||||
# define PACK
|
||||
#endif
|
||||
|
||||
#define SMB_COM_CLOSE 0x04
|
||||
#define SMB_COM_READ_ANDX 0x2e
|
||||
#define SMB_COM_WRITE_ANDX 0x2f
|
||||
#define SMB_COM_TREE_DISCONNECT 0x71
|
||||
#define SMB_COM_NEGOTIATE 0x72
|
||||
#define SMB_COM_SETUP_ANDX 0x73
|
||||
#define SMB_COM_TREE_CONNECT_ANDX 0x75
|
||||
#define SMB_COM_NT_CREATE_ANDX 0xa2
|
||||
#define SMB_COM_NO_ANDX_COMMAND 0xff
|
||||
|
||||
#define SMB_WC_CLOSE 0x03
|
||||
#define SMB_WC_READ_ANDX 0x0c
|
||||
#define SMB_WC_WRITE_ANDX 0x0e
|
||||
#define SMB_WC_SETUP_ANDX 0x0d
|
||||
#define SMB_WC_TREE_CONNECT_ANDX 0x04
|
||||
#define SMB_WC_NT_CREATE_ANDX 0x18
|
||||
|
||||
#define SMB_FLAGS_CANONICAL_PATHNAMES 0x10
|
||||
#define SMB_FLAGS_CASELESS_PATHNAMES 0x08
|
||||
#define SMB_FLAGS2_UNICODE_STRINGS 0x8000
|
||||
#define SMB_FLAGS2_IS_LONG_NAME 0x0040
|
||||
#define SMB_FLAGS2_KNOWS_LONG_NAME 0x0001
|
||||
|
||||
#define SMB_CAP_LARGE_FILES 0x08
|
||||
#define SMB_GENERIC_WRITE 0x40000000
|
||||
#define SMB_GENERIC_READ 0x80000000
|
||||
#define SMB_FILE_SHARE_ALL 0x07
|
||||
#define SMB_FILE_OPEN 0x01
|
||||
#define SMB_FILE_OVERWRITE_IF 0x05
|
||||
|
||||
#define SMB_ERR_NOACCESS 0x00050001
|
||||
|
||||
struct smb_header {
|
||||
unsigned char nbt_type;
|
||||
unsigned char nbt_flags;
|
||||
unsigned short nbt_length;
|
||||
unsigned char magic[4];
|
||||
unsigned char command;
|
||||
unsigned int status;
|
||||
unsigned char flags;
|
||||
unsigned short flags2;
|
||||
unsigned short pid_high;
|
||||
unsigned char signature[8];
|
||||
unsigned short pad;
|
||||
unsigned short tid;
|
||||
unsigned short pid;
|
||||
unsigned short uid;
|
||||
unsigned short mid;
|
||||
} PACK;
|
||||
|
||||
struct smb_negotiate_response {
|
||||
struct smb_header h;
|
||||
unsigned char word_count;
|
||||
unsigned short dialect_index;
|
||||
unsigned char security_mode;
|
||||
unsigned short max_mpx_count;
|
||||
unsigned short max_number_vcs;
|
||||
unsigned int max_buffer_size;
|
||||
unsigned int max_raw_size;
|
||||
unsigned int session_key;
|
||||
unsigned int capabilities;
|
||||
unsigned int system_time_low;
|
||||
unsigned int system_time_high;
|
||||
unsigned short server_time_zone;
|
||||
unsigned char encryption_key_length;
|
||||
unsigned short byte_count;
|
||||
char bytes[1];
|
||||
} PACK;
|
||||
|
||||
struct andx {
|
||||
unsigned char command;
|
||||
unsigned char pad;
|
||||
unsigned short offset;
|
||||
} PACK;
|
||||
|
||||
struct smb_setup {
|
||||
unsigned char word_count;
|
||||
struct andx andx;
|
||||
unsigned short max_buffer_size;
|
||||
unsigned short max_mpx_count;
|
||||
unsigned short vc_number;
|
||||
unsigned int session_key;
|
||||
unsigned short lengths[2];
|
||||
unsigned int pad;
|
||||
unsigned int capabilities;
|
||||
unsigned short byte_count;
|
||||
char bytes[1024];
|
||||
} PACK;
|
||||
|
||||
struct smb_tree_connect {
|
||||
unsigned char word_count;
|
||||
struct andx andx;
|
||||
unsigned short flags;
|
||||
unsigned short pw_len;
|
||||
unsigned short byte_count;
|
||||
char bytes[1024];
|
||||
} PACK;
|
||||
|
||||
struct smb_nt_create {
|
||||
unsigned char word_count;
|
||||
struct andx andx;
|
||||
unsigned char pad;
|
||||
unsigned short name_length;
|
||||
unsigned int flags;
|
||||
unsigned int root_fid;
|
||||
unsigned int access;
|
||||
curl_off_t allocation_size;
|
||||
unsigned int ext_file_attributes;
|
||||
unsigned int share_access;
|
||||
unsigned int create_disposition;
|
||||
unsigned int create_options;
|
||||
unsigned int impersonation_level;
|
||||
unsigned char security_flags;
|
||||
unsigned short byte_count;
|
||||
char bytes[1024];
|
||||
} PACK;
|
||||
|
||||
struct smb_nt_create_response {
|
||||
struct smb_header h;
|
||||
unsigned char word_count;
|
||||
struct andx andx;
|
||||
unsigned char op_lock_level;
|
||||
unsigned short fid;
|
||||
unsigned int create_disposition;
|
||||
|
||||
curl_off_t create_time;
|
||||
curl_off_t last_access_time;
|
||||
curl_off_t last_write_time;
|
||||
curl_off_t last_change_time;
|
||||
unsigned int ext_file_attributes;
|
||||
curl_off_t allocation_size;
|
||||
curl_off_t end_of_file;
|
||||
} PACK;
|
||||
|
||||
struct smb_read {
|
||||
unsigned char word_count;
|
||||
struct andx andx;
|
||||
unsigned short fid;
|
||||
unsigned int offset;
|
||||
unsigned short max_bytes;
|
||||
unsigned short min_bytes;
|
||||
unsigned int timeout;
|
||||
unsigned short remaining;
|
||||
unsigned int offset_high;
|
||||
unsigned short byte_count;
|
||||
} PACK;
|
||||
|
||||
struct smb_write {
|
||||
struct smb_header h;
|
||||
unsigned char word_count;
|
||||
struct andx andx;
|
||||
unsigned short fid;
|
||||
unsigned int offset;
|
||||
unsigned int timeout;
|
||||
unsigned short write_mode;
|
||||
unsigned short remaining;
|
||||
unsigned short pad;
|
||||
unsigned short data_length;
|
||||
unsigned short data_offset;
|
||||
unsigned int offset_high;
|
||||
unsigned short byte_count;
|
||||
unsigned char pad2;
|
||||
} PACK;
|
||||
|
||||
struct smb_close {
|
||||
unsigned char word_count;
|
||||
unsigned short fid;
|
||||
unsigned int last_mtime;
|
||||
unsigned short byte_count;
|
||||
} PACK;
|
||||
|
||||
struct smb_tree_disconnect {
|
||||
unsigned char word_count;
|
||||
unsigned short byte_count;
|
||||
} PACK;
|
||||
|
||||
#if defined(_MSC_VER) || defined(__ILEC400__)
|
||||
# pragma pack(pop)
|
||||
#endif
|
||||
|
||||
#endif /* BUILDING_CURL_SMB_C */
|
||||
|
||||
#if !defined(CURL_DISABLE_SMB) && defined(USE_CURL_NTLM_CORE) && \
|
||||
(SIZEOF_CURL_OFF_T > 4)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue