[WIP] use vcpkg for getopt; build windows shared lib enhancements (#350)
* fix MSVC compiler shared library issues - mostly around 'extern const' * add vcpkg install getopt to appveyor-windows.yml show appveyor where to get getopt from vcpkg (non-static lib to avoid LGPL violation) * add missing else case in lsquic_shared_support.h for windows static lib path * have cmake spit out it's version have cmake copy dependent dlls to build dir for tests on windows (getopt.dll) * copy getopt.dll dep for tests added commented version that requires >= 3.21 but handles any dll deps * try caching boringssl dir to reduce CI build time since it's always same commit specified in config file define VCPKG_ROOT in env since I can't seem to find it by VCPKG_ROOT or VCPKG_INSTALLED_DIR in appveyor's cmake v3.16 + vcpkg * make windows cache dependent on yml and cmd * sync up with changes to ls-qpack
This commit is contained in:
parent
df67278304
commit
f07b3eae43
|
@ -12,6 +12,8 @@ OPTION(LSQUIC_DEVEL "Compile in development mode" OFF)
|
|||
|
||||
INCLUDE(GNUInstallDirs)
|
||||
|
||||
MESSAGE(STATUS "CMake v${CMAKE_VERSION}")
|
||||
|
||||
IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
# If using older glibc, need to link with -lrt. See clock_getres(2).
|
||||
EXECUTE_PROCESS(
|
||||
|
@ -110,6 +112,9 @@ SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4706") # assignment within conditional
|
|||
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4090") # different 'const' qualifier (TODO: debug ls-sfparser.c)
|
||||
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} /wd4305") # truncation from double to float
|
||||
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -W4 -WX -Zi -DWIN32_LEAN_AND_MEAN -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -I${CMAKE_CURRENT_SOURCE_DIR}/wincompat")
|
||||
IF(LSQUIC_SHARED_LIB)
|
||||
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DLSQUIC_SHARED_LIB")
|
||||
ENDIF()
|
||||
IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -Od")
|
||||
#SET (MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DFIU_ENABLE=1")
|
||||
|
@ -131,11 +136,20 @@ IF(NOT PERL_FOUND)
|
|||
MESSAGE(FATAL_ERROR "Perl not found -- need it to generate source code")
|
||||
ENDIF()
|
||||
|
||||
IF (MSVC)
|
||||
IF(LSQUIC_SHARED_LIB)
|
||||
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS YES CACHE BOOL "Export all symbols")
|
||||
SET(LIB_SUFFIX .dll)
|
||||
ELSE()
|
||||
SET(LIB_SUFFIX .lib)
|
||||
ENDIF()
|
||||
ELSE()
|
||||
IF(LSQUIC_SHARED_LIB)
|
||||
SET(LIB_SUFFIX .so)
|
||||
ELSE()
|
||||
SET(LIB_SUFFIX .a)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
IF (NOT DEFINED BORINGSSL_INCLUDE AND DEFINED BORINGSSL_DIR)
|
||||
FIND_PATH(BORINGSSL_INCLUDE NAMES openssl/ssl.h
|
||||
|
@ -207,6 +221,21 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
|||
link_directories( /usr/local/lib )
|
||||
ENDIF()
|
||||
|
||||
IF (CMAKE_SYSTEM_NAME STREQUAL Windows)
|
||||
FIND_PATH(GETOPT_INCLUDE_DIR NAMES getopt.h)
|
||||
IF (GETOPT_INCLUDE_DIR)
|
||||
INCLUDE_DIRECTORIES(${GETOPT_INCLUDE_DIR})
|
||||
ELSE()
|
||||
MESSAGE(FATAL_ERROR "getopt.h was not found")
|
||||
ENDIF()
|
||||
FIND_LIBRARY(GETOPT_LIB getopt)
|
||||
IF(GETOPT_LIB)
|
||||
MESSAGE(STATUS "Found getopt: ${GETOPT_LIB}")
|
||||
ELSE()
|
||||
MESSAGE(STATUS "getopt not found")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
# Find zlib and libevent header files and library files
|
||||
# TODO: libevent is not strictly necessary to build the library.
|
||||
FIND_PATH(ZLIB_INCLUDE_DIR NAMES zlib.h)
|
||||
|
|
|
@ -8,10 +8,19 @@ build: off
|
|||
|
||||
init:
|
||||
|
||||
cache:
|
||||
- boringssl -> appveyor-linux.yml # we define the commit in here
|
||||
|
||||
install:
|
||||
|
||||
- sh: >-
|
||||
|
||||
if [[ -e boringssl/CMakeLists.txt ]] ; then
|
||||
|
||||
echo cached
|
||||
|
||||
else
|
||||
|
||||
git clone https://boringssl.googlesource.com/boringssl
|
||||
|
||||
cd boringssl
|
||||
|
@ -24,9 +33,11 @@ install:
|
|||
|
||||
cd ..
|
||||
|
||||
fi
|
||||
|
||||
git submodule init
|
||||
|
||||
git submodule update
|
||||
git submodule update --checkout --force --recursive
|
||||
|
||||
cmake -DBORINGSSL_DIR=$PWD/boringssl .
|
||||
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
vcpkg list
|
||||
|
||||
if exist ".\boringssl\CMakeLists.txt" (
|
||||
echo cached
|
||||
) else (
|
||||
git clone https://boringssl.googlesource.com/boringssl
|
||||
cd boringssl
|
||||
git checkout a2278d4d2cabe73f6663e3299ea7808edfa306b9
|
||||
cmake -DCMAKE_GENERATOR_PLATFORM=x64 --config Debug -DBUILD_SHARED_LIBS=OFF -DOPENSSL_NO_ASM=1 .
|
||||
msbuild /m ALL_BUILD.vcxproj
|
||||
cd ..
|
||||
)
|
||||
|
||||
git submodule init
|
||||
|
||||
git submodule update --checkout --force --recursive
|
||||
|
||||
set VCPKG_ROOT=c:/tools/vcpkg/
|
||||
|
||||
cmake -DCMAKE_GENERATOR_PLATFORM=x64 -DBUILD_SHARED_LIBS=OFF -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DGETOPT_INCLUDE_DIR=c:/tools/vcpkg/installed/x64-windows/include -DGETOPT_LIB=c:/tools/vcpkg/installed/x64-windows/lib/getopt.lib -DBORINGSSL_DIR=%cd%\boringssl .
|
||||
|
||||
|
||||
msbuild /m ALL_BUILD.vcxproj
|
|
@ -2,8 +2,6 @@ version: 1.{branch}.{build}
|
|||
|
||||
image: Visual Studio 2017
|
||||
|
||||
cache: c:\tools\vcpkg\installed
|
||||
|
||||
init:
|
||||
|
||||
- cmd: ''
|
||||
|
@ -18,45 +16,17 @@ install:
|
|||
|
||||
vcpkg install pcre:x64-windows-static
|
||||
|
||||
vcpkg install getopt:x64-windows
|
||||
|
||||
vcpkg integrate install
|
||||
|
||||
cache:
|
||||
- c:\tools\vcpkg\installed
|
||||
- boringssl -> appveyor-windows.yml, appveyor-windows.cmd # we define the commit in here
|
||||
|
||||
build_script:
|
||||
|
||||
- cmd: >-
|
||||
|
||||
vcpkg list
|
||||
|
||||
git clone https://boringssl.googlesource.com/boringssl
|
||||
|
||||
cd boringssl
|
||||
|
||||
git checkout a2278d4d2cabe73f6663e3299ea7808edfa306b9
|
||||
|
||||
cmake -DCMAKE_GENERATOR_PLATFORM=x64 --config Debug -DBUILD_SHARED_LIBS=OFF -DOPENSSL_NO_ASM=1 .
|
||||
|
||||
|
||||
|
||||
msbuild /m ALL_BUILD.vcxproj
|
||||
|
||||
|
||||
|
||||
cd ..
|
||||
|
||||
|
||||
|
||||
git submodule init
|
||||
|
||||
|
||||
|
||||
git submodule update
|
||||
|
||||
|
||||
|
||||
cmake -DCMAKE_GENERATOR_PLATFORM=x64 -DBUILD_SHARED_LIBS=OFF -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DBORINGSSL_DIR=%cd%\boringssl .
|
||||
|
||||
|
||||
|
||||
msbuild /m ALL_BUILD.vcxproj
|
||||
- cmd: appveyor-windows.cmd
|
||||
|
||||
test_script:
|
||||
|
||||
|
|
|
@ -18,22 +18,20 @@ IF(MSVC)
|
|||
ENDIF()
|
||||
LIST(APPEND LIBS ws2_32)
|
||||
LIST(APPEND LIBS iphlpapi)
|
||||
LIST(APPEND LIBS ${GETOPT_LIB})
|
||||
ENDIF()
|
||||
|
||||
IF(MSVC)
|
||||
SET(GETOPT_C ../wincompat/getopt.c)
|
||||
ENDIF()
|
||||
add_executable(http_server http_server.c prog.c test_common.c test_cert.c ${GETOPT_C})
|
||||
add_executable(http_server http_server.c prog.c test_common.c test_cert.c)
|
||||
IF(NOT MSVC) # TODO: port MD5 server and client to Windows
|
||||
add_executable(md5_server md5_server.c prog.c test_common.c test_cert.c ${GETOPT_C})
|
||||
add_executable(md5_client md5_client.c prog.c test_common.c test_cert.c ${GETOPT_C})
|
||||
add_executable(md5_server md5_server.c prog.c test_common.c test_cert.c)
|
||||
add_executable(md5_client md5_client.c prog.c test_common.c test_cert.c)
|
||||
ENDIF()
|
||||
add_executable(echo_server echo_server.c prog.c test_common.c test_cert.c ${GETOPT_C})
|
||||
add_executable(echo_client echo_client.c prog.c test_common.c test_cert.c ${GETOPT_C})
|
||||
add_executable(duck_server duck_server.c prog.c test_common.c test_cert.c ${GETOPT_C})
|
||||
add_executable(duck_client duck_client.c prog.c test_common.c test_cert.c ${GETOPT_C})
|
||||
add_executable(perf_client perf_client.c prog.c test_common.c test_cert.c ${GETOPT_C})
|
||||
add_executable(perf_server perf_server.c prog.c test_common.c test_cert.c ${GETOPT_C})
|
||||
add_executable(echo_server echo_server.c prog.c test_common.c test_cert.c)
|
||||
add_executable(echo_client echo_client.c prog.c test_common.c test_cert.c)
|
||||
add_executable(duck_server duck_server.c prog.c test_common.c test_cert.c)
|
||||
add_executable(duck_client duck_client.c prog.c test_common.c test_cert.c)
|
||||
add_executable(perf_client perf_client.c prog.c test_common.c test_cert.c)
|
||||
add_executable(perf_server perf_server.c prog.c test_common.c test_cert.c)
|
||||
|
||||
|
||||
IF (NOT MSVC)
|
||||
|
@ -53,8 +51,6 @@ add_executable(http_client
|
|||
prog.c
|
||||
test_common.c
|
||||
test_cert.c
|
||||
../wincompat/getopt.c
|
||||
../wincompat/getopt1.c
|
||||
)
|
||||
|
||||
ENDIF()
|
||||
|
|
|
@ -122,6 +122,10 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLSQPACK_DEC_LOGGER_HEADER=\\\"lsquic_qpack
|
|||
IF(LSQUIC_SHARED_LIB)
|
||||
add_library(lsquic SHARED ${lsquic_STAT_SRCS})
|
||||
TARGET_LINK_LIBRARIES(lsquic PRIVATE ${BORINGSSL_LIB_ssl} ${BORINGSSL_LIB_crypto} ${ZLIB_LIB})
|
||||
IF(MSVC)
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLSQUIC_EXPORTS")
|
||||
TARGET_LINK_LIBRARIES(lsquic PRIVATE ws2_32.lib)
|
||||
ENDIF()
|
||||
ELSE()
|
||||
add_library(lsquic STATIC ${lsquic_STAT_SRCS})
|
||||
ENDIF()
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 0b33c64ee8cb90ac32d4bf6152c406fc27016394
|
||||
Subproject commit c74cd4b2c3f97c069584615dc37fdd22a9110c80
|
|
@ -6,6 +6,8 @@
|
|||
#ifndef LSQUIC_CUBIC_H
|
||||
#define LSQUIC_CUBIC_H 1
|
||||
|
||||
#include "lsquic_shared_support.h"
|
||||
|
||||
struct lsquic_conn;
|
||||
|
||||
struct lsquic_cubic {
|
||||
|
@ -32,7 +34,7 @@ struct lsquic_cubic {
|
|||
|
||||
#define TCP_MSS 1460
|
||||
|
||||
extern const struct cong_ctl_if lsquic_cong_cubic_if;
|
||||
LSQUIC_EXTERN const struct cong_ctl_if lsquic_cong_cubic_if;
|
||||
|
||||
void
|
||||
lsquic_cubic_set_flags (struct lsquic_cubic *cubic, enum cubic_flags flags);
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
#ifndef LSQUIC_ENC_SESS_H
|
||||
#define LSQUIC_ENC_SESS_H 1
|
||||
|
||||
#include "lsquic_shared_support.h"
|
||||
|
||||
struct lsquic_alarmset;
|
||||
struct lsquic_engine_public;
|
||||
struct lsquic_packet_out;
|
||||
|
@ -315,27 +317,27 @@ struct enc_session_funcs_iquic
|
|||
const unsigned char *, size_t);
|
||||
};
|
||||
|
||||
extern
|
||||
LSQUIC_EXTERN
|
||||
#ifdef NDEBUG
|
||||
const
|
||||
#endif
|
||||
struct enc_session_funcs_common lsquic_enc_session_common_gquic_1;
|
||||
|
||||
extern
|
||||
LSQUIC_EXTERN
|
||||
#ifdef NDEBUG
|
||||
const
|
||||
#endif
|
||||
struct enc_session_funcs_common lsquic_enc_session_common_gquic_2;
|
||||
|
||||
extern const struct enc_session_funcs_common lsquic_enc_session_common_ietf_v1;
|
||||
LSQUIC_EXTERN const struct enc_session_funcs_common lsquic_enc_session_common_ietf_v1;
|
||||
|
||||
extern
|
||||
LSQUIC_EXTERN
|
||||
#ifdef NDEBUG
|
||||
const
|
||||
#endif
|
||||
struct enc_session_funcs_gquic lsquic_enc_session_gquic_gquic_1;
|
||||
|
||||
extern const struct enc_session_funcs_iquic lsquic_enc_session_iquic_ietf_v1;
|
||||
LSQUIC_EXTERN const struct enc_session_funcs_iquic lsquic_enc_session_iquic_ietf_v1;
|
||||
|
||||
#define select_esf_common_by_ver(ver) ( \
|
||||
ver == LSQVER_ID27 ? &lsquic_enc_session_common_ietf_v1 : \
|
||||
|
@ -353,9 +355,9 @@ extern const struct enc_session_funcs_iquic lsquic_enc_session_iquic_ietf_v1;
|
|||
|
||||
extern const char *const lsquic_enclev2str[];
|
||||
|
||||
extern const struct lsquic_stream_if lsquic_cry_sm_if;
|
||||
LSQUIC_EXTERN const struct lsquic_stream_if lsquic_cry_sm_if;
|
||||
|
||||
extern const struct lsquic_stream_if lsquic_mini_cry_sm_if;
|
||||
LSQUIC_EXTERN const struct lsquic_stream_if lsquic_mini_cry_sm_if;
|
||||
|
||||
/* RFC 7301, Section 3.2 */
|
||||
#define ALERT_NO_APPLICATION_PROTOCOL 120
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
#ifndef LSQUIC_HTTP1X_IF_H
|
||||
#define LSQUIC_HTTP1X_IF_H 1
|
||||
|
||||
#include "lsquic_shared_support.h"
|
||||
|
||||
struct lsquic_hset_if;
|
||||
struct lsquic_conn;
|
||||
|
||||
|
@ -12,7 +14,7 @@ struct http1x_ctor_ctx
|
|||
int is_server;
|
||||
};
|
||||
|
||||
extern const struct lsquic_hset_if *const lsquic_http1x_if;
|
||||
LSQUIC_EXTERN const struct lsquic_hset_if *const lsquic_http1x_if;
|
||||
|
||||
#define MAX_HTTP1X_HEADERS_SIZE (64 * 1024)
|
||||
|
||||
|
|
|
@ -24,6 +24,8 @@
|
|||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "lsquic_shared_support.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
@ -93,7 +95,8 @@ enum lsquic_logger_module {
|
|||
|
||||
/* Each module has its own log level.
|
||||
*/
|
||||
extern enum lsq_log_level lsq_log_levels[N_LSQUIC_LOGGER_MODULES];
|
||||
|
||||
LSQUIC_EXTERN enum lsq_log_level lsq_log_levels[N_LSQUIC_LOGGER_MODULES];
|
||||
|
||||
extern const char *const lsqlm_to_str[N_LSQUIC_LOGGER_MODULES];
|
||||
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
#include "lsquic_packet_common.h"
|
||||
#include "lsquic_packet_gquic.h"
|
||||
#include "lsquic_shared_support.h"
|
||||
|
||||
struct lsquic_conn;
|
||||
struct lsquic_packet_in;
|
||||
|
@ -192,7 +193,6 @@ struct parse_funcs
|
|||
int
|
||||
(*pf_parse_path_resp_frame) (const unsigned char *buf, size_t,
|
||||
uint64_t *resp);
|
||||
#ifndef NDEBUG
|
||||
/* These float reading and writing functions assume `mem' has at least
|
||||
* 2 bytes.
|
||||
*/
|
||||
|
@ -200,7 +200,6 @@ struct parse_funcs
|
|||
(*pf_write_float_time16) (lsquic_time_t time_us, void *mem);
|
||||
uint64_t
|
||||
(*pf_read_float_time16) (const void *mem);
|
||||
#endif
|
||||
ssize_t
|
||||
(*pf_generate_simple_prst) (const lsquic_cid_t *cid,
|
||||
unsigned char *, size_t);
|
||||
|
@ -334,11 +333,10 @@ struct parse_funcs
|
|||
(*pf_datagram_frame_size) (size_t);
|
||||
};
|
||||
|
||||
|
||||
extern const struct parse_funcs lsquic_parse_funcs_gquic_Q043;
|
||||
extern const struct parse_funcs lsquic_parse_funcs_gquic_Q046;
|
||||
extern const struct parse_funcs lsquic_parse_funcs_gquic_Q050;
|
||||
extern const struct parse_funcs lsquic_parse_funcs_ietf_v1;
|
||||
LSQUIC_EXTERN const struct parse_funcs lsquic_parse_funcs_gquic_Q043;
|
||||
LSQUIC_EXTERN const struct parse_funcs lsquic_parse_funcs_gquic_Q046;
|
||||
LSQUIC_EXTERN const struct parse_funcs lsquic_parse_funcs_gquic_Q050;
|
||||
LSQUIC_EXTERN const struct parse_funcs lsquic_parse_funcs_ietf_v1;
|
||||
|
||||
#define select_pf_by_ver(ver) ( \
|
||||
(1 << (ver)) & (1 << LSQVER_043) ? \
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc. See LICENSE. */
|
||||
/*
|
||||
* lsquic_shared_support.h - Support for building a shared library.
|
||||
*/
|
||||
|
||||
#ifndef LSQUIC_SHARED_SUPPORT
|
||||
#define LSQUIC_SHARED_SUPPORT 1
|
||||
|
||||
#ifndef LSQUIC_EXTERN
|
||||
|
||||
# ifdef _MSC_VER /* WIN32 */
|
||||
|
||||
/* MSVC (and CMake on Windows) doesn't like to export extern const symbols, they need to be forced. */
|
||||
|
||||
# ifdef LSQUIC_SHARED_LIB
|
||||
|
||||
# ifdef LSQUIC_EXPORTS
|
||||
# define LSQUIC_EXTERN __declspec(dllexport) extern
|
||||
# else /* LSQUIC_EXPORTS */
|
||||
# define LSQUIC_EXTERN __declspec(dllimport) extern
|
||||
# endif /* LSQUIC_EXPORTS */
|
||||
|
||||
# else
|
||||
|
||||
# define LSQUIC_EXTERN extern
|
||||
|
||||
# endif
|
||||
|
||||
# else /* _MSC_VER */
|
||||
|
||||
# define LSQUIC_EXTERN extern
|
||||
|
||||
# endif /* _MSC_VER */
|
||||
|
||||
#endif /* LSQUIC_EXTERN */
|
||||
|
||||
#endif /* LSQUIC_SHARED_SUPPORT */
|
|
@ -6,12 +6,12 @@
|
|||
#ifndef LSQUIC_STOCK_SHI
|
||||
#define LSQUIC_STOCK_SHI 1
|
||||
|
||||
#include "lsquic_shared_support.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
struct stock_shared_hash;
|
||||
|
||||
struct stock_shared_hash *
|
||||
|
@ -25,6 +25,6 @@ lsquic_stock_shared_hash_destroy (struct stock_shared_hash *);
|
|||
}
|
||||
#endif
|
||||
|
||||
extern const struct lsquic_shared_hash_if stock_shi;
|
||||
LSQUIC_EXTERN const struct lsquic_shared_hash_if stock_shi;
|
||||
|
||||
#endif
|
||||
|
|
|
@ -6,7 +6,6 @@ ENABLE_TESTING()
|
|||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLSQUIC_TEST=1")
|
||||
|
||||
IF (MSVC)
|
||||
SET(ADDL_SOURCES ../wincompat/getopt.c ../wincompat/getopt1.c)
|
||||
SET(LIB_FLAGS "-FORCE:MULTIPLE")
|
||||
ELSE()
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-value")
|
||||
|
@ -91,12 +90,31 @@ ENDIF()
|
|||
|
||||
FOREACH(TEST_NAME ${TESTS})
|
||||
ADD_EXECUTABLE(test_${TEST_NAME} test_${TEST_NAME}.c ${ADDL_SOURCES})
|
||||
IF(NOT MSVC)
|
||||
TARGET_LINK_LIBRARIES(test_${TEST_NAME} ${LIBS} ${LIB_FLAGS})
|
||||
ELSE()
|
||||
TARGET_LINK_LIBRARIES(test_${TEST_NAME} ${LIBS} ${GETOPT_LIB} ${LIB_FLAGS})
|
||||
# copy any dependencies local to the tests
|
||||
#IF (${CMAKE_VERSION} VERSION_LESS "3.21.0")
|
||||
ADD_CUSTOM_COMMAND(TARGET test_${TEST_NAME} POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy \"$ENV{VCPKG_ROOT}/installed/x64-windows$<$<CONFIG:Debug>:/debug>/bin/getopt.dll\" \"$<TARGET_FILE_DIR:test_${TEST_NAME}>\"
|
||||
COMMAND_EXPAND_LISTS
|
||||
)
|
||||
#ELSE()
|
||||
# ADD_CUSTOM_COMMAND(TARGET test_${TEST_NAME} POST_BUILD
|
||||
# COMMAND if not \"\"=="$<TARGET_RUNTIME_DLLS:test_${TEST_NAME}>" ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:test_${TEST_NAME}> $<TARGET_FILE_DIR:test_${TEST_NAME}>
|
||||
# COMMAND_EXPAND_LISTS
|
||||
# )
|
||||
#ENDIF()
|
||||
ENDIF()
|
||||
ADD_TEST(${TEST_NAME} test_${TEST_NAME})
|
||||
ENDFOREACH()
|
||||
|
||||
ADD_EXECUTABLE(test_stream test_stream.c ${ADDL_SOURCES})
|
||||
TARGET_LINK_LIBRARIES(test_stream ${LIBS} ${LIB_FLAGS})
|
||||
IF(MSVC)
|
||||
TARGET_LINK_LIBRARIES(test_stream ${GETOPT_LIB})
|
||||
ENDIF()
|
||||
ADD_TEST(stream test_stream)
|
||||
ADD_TEST(stream_hash test_stream -h)
|
||||
ADD_TEST(stream_A test_stream -A)
|
||||
|
@ -114,20 +132,26 @@ ADD_EXECUTABLE(test_min_heap test_min_heap.c ../src/liblsquic/lsquic_min_heap.c)
|
|||
ADD_TEST(min_heap test_min_heap)
|
||||
|
||||
SET(MALO_SRC test_malo.c ../src/liblsquic/lsquic_malo.c)
|
||||
IF(MSVC)
|
||||
LIST(APPEND MALO_SRC ../wincompat/getopt.c)
|
||||
ENDIF()
|
||||
ADD_EXECUTABLE(test_malo_pooled ${MALO_SRC})
|
||||
IF(MSVC)
|
||||
TARGET_LINK_LIBRARIES(test_malo_pooled ${GETOPT_LIB})
|
||||
ENDIF()
|
||||
SET_TARGET_PROPERTIES(test_malo_pooled
|
||||
PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLSQUIC_USE_POOLS=1")
|
||||
ADD_TEST(malo_pooled test_malo_pooled)
|
||||
|
||||
ADD_EXECUTABLE(test_malo_nopool ${MALO_SRC})
|
||||
IF(MSVC)
|
||||
TARGET_LINK_LIBRARIES(test_malo_nopool ${GETOPT_LIB})
|
||||
ENDIF()
|
||||
SET_TARGET_PROPERTIES(test_malo_nopool
|
||||
PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLSQUIC_USE_POOLS=0")
|
||||
ADD_TEST(malo_nopool test_malo_nopool)
|
||||
|
||||
ADD_EXECUTABLE(test_minmax test_minmax.c ../src/liblsquic/lsquic_minmax.c)
|
||||
IF(MSVC)
|
||||
TARGET_LINK_LIBRARIES(test_minmax ${GETOPT_LIB})
|
||||
ENDIF()
|
||||
ADD_TEST(minmax test_minmax)
|
||||
|
||||
ADD_EXECUTABLE(test_rechist test_rechist.c ../src/liblsquic/lsquic_rechist.c)
|
||||
|
|
|
@ -21,7 +21,8 @@
|
|||
#include "lsquic_logger.h"
|
||||
#include "lsquic.h"
|
||||
|
||||
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
|
||||
//static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043); // will not work on MSVC
|
||||
#define pf ((const struct parse_funcs *const)select_pf_by_ver(LSQVER_043))
|
||||
|
||||
static void
|
||||
test1 (void) /* Inverse of quic_framer_test.cc -- NewAckFrameOneAckBlock */
|
||||
|
|
|
@ -20,7 +20,8 @@
|
|||
|
||||
static struct lsquic_conn lconn = LSCONN_INITIALIZER_CIDLEN(lconn, 0);
|
||||
|
||||
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
|
||||
//static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043); // will not work on MSVC
|
||||
#define pf ((const struct parse_funcs *const)select_pf_by_ver(LSQVER_043))
|
||||
|
||||
|
||||
static lsquic_packno_t
|
||||
|
|
|
@ -20,7 +20,8 @@
|
|||
|
||||
static struct lsquic_conn lconn = LSCONN_INITIALIZER_CIDLEN(lconn, 0);
|
||||
|
||||
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_ID27);
|
||||
//static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_ID27); // will not work on MSVC
|
||||
#define pf ((const struct parse_funcs *const)select_pf_by_ver(LSQVER_ID27))
|
||||
|
||||
|
||||
static void
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
#include "lsquic_types.h"
|
||||
#include "lsquic_parse.h"
|
||||
|
||||
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
|
||||
//static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043); // will not work on MSVC
|
||||
#define pf ((const struct parse_funcs *const)select_pf_by_ver(LSQVER_043))
|
||||
|
||||
|
||||
/* The test is both for generation and parsing: */
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
#include "lsquic_types.h"
|
||||
#include "lsquic_parse.h"
|
||||
|
||||
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
|
||||
//static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043); // will not work on MSVC
|
||||
#define pf ((const struct parse_funcs *const)select_pf_by_ver(LSQVER_043))
|
||||
|
||||
|
||||
struct conn_close_parse_test {
|
||||
|
|
|
@ -29,44 +29,6 @@ struct test {
|
|||
char out[0x100];
|
||||
};
|
||||
|
||||
|
||||
static const struct test tests[] = {
|
||||
|
||||
{ .lineno = __LINE__,
|
||||
.pf = select_pf_by_ver(LSQVER_ID27),
|
||||
.offset = 0,
|
||||
.data_sz = 10,
|
||||
.data = "0123456789",
|
||||
.avail = 0x100,
|
||||
.out =
|
||||
{ /* Type */ 0x06,
|
||||
/* Offset */ 0x00,
|
||||
/* Size */ 0x0A,
|
||||
/* Data */ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
|
||||
},
|
||||
.len = 1 + 1 + 1 + 10,
|
||||
.min_sz = 1 + 1 + 1 + 1,
|
||||
},
|
||||
|
||||
{ .lineno = __LINE__,
|
||||
.pf = select_pf_by_ver(LSQVER_ID27),
|
||||
.offset = 500,
|
||||
.data_sz = 10,
|
||||
.data = "0123456789",
|
||||
.avail = 0x100,
|
||||
.out =
|
||||
{ /* Type */ 0x06,
|
||||
/* Offset */ 0x41, 0xF4,
|
||||
/* Size */ 0x0A,
|
||||
/* Data */ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
|
||||
},
|
||||
.len = 1 + 2 + 1 + 10,
|
||||
.min_sz = 1 + 2 + 1 + 1,
|
||||
},
|
||||
|
||||
};
|
||||
|
||||
|
||||
struct test_ctx {
|
||||
const struct test *test;
|
||||
unsigned off;
|
||||
|
@ -94,9 +56,8 @@ init_ctx (struct test_ctx *test_ctx, const struct test *test)
|
|||
|
||||
|
||||
static void
|
||||
run_test (int i)
|
||||
run_test (const struct test *const test)
|
||||
{
|
||||
const struct test *const test = &tests[i];
|
||||
|
||||
int len;
|
||||
size_t min;
|
||||
|
@ -139,8 +100,44 @@ run_test (int i)
|
|||
int
|
||||
main (void)
|
||||
{
|
||||
const struct test tests[] = {
|
||||
|
||||
{ .lineno = __LINE__,
|
||||
.pf = select_pf_by_ver(LSQVER_ID27),
|
||||
.offset = 0,
|
||||
.data_sz = 10,
|
||||
.data = "0123456789",
|
||||
.avail = 0x100,
|
||||
.out =
|
||||
{ /* Type */ 0x06,
|
||||
/* Offset */ 0x00,
|
||||
/* Size */ 0x0A,
|
||||
/* Data */ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
|
||||
},
|
||||
.len = 1 + 1 + 1 + 10,
|
||||
.min_sz = 1 + 1 + 1 + 1,
|
||||
},
|
||||
|
||||
{ .lineno = __LINE__,
|
||||
.pf = select_pf_by_ver(LSQVER_ID27),
|
||||
.offset = 500,
|
||||
.data_sz = 10,
|
||||
.data = "0123456789",
|
||||
.avail = 0x100,
|
||||
.out =
|
||||
{ /* Type */ 0x06,
|
||||
/* Offset */ 0x41, 0xF4,
|
||||
/* Size */ 0x0A,
|
||||
/* Data */ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
|
||||
},
|
||||
.len = 1 + 2 + 1 + 10,
|
||||
.min_sz = 1 + 2 + 1 + 1,
|
||||
},
|
||||
|
||||
};
|
||||
|
||||
unsigned i;
|
||||
for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i)
|
||||
run_test(i);
|
||||
run_test(&tests[i]);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -27,7 +27,8 @@
|
|||
#include "lsquic_packet_common.h"
|
||||
#include "lsquic_packet_out.h"
|
||||
|
||||
static const struct cong_ctl_if *const cci = &lsquic_cong_cubic_if;
|
||||
//static const struct cong_ctl_if *const cci = &lsquic_cong_cubic_if; // will not work on MSVC
|
||||
#define cci ((const struct cong_ctl_if *const)&lsquic_cong_cubic_if)
|
||||
|
||||
static void
|
||||
test_post_quiescence_explosion (void)
|
||||
|
|
|
@ -26,7 +26,8 @@
|
|||
#include "lsquic_logger.h"
|
||||
|
||||
|
||||
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
|
||||
//static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043); // will not work on MSVC
|
||||
#define pf ((const struct parse_funcs *const)select_pf_by_ver(LSQVER_043))
|
||||
|
||||
static struct {
|
||||
unsigned char buf[0x1000];
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
#include "lsquic_types.h"
|
||||
#include "lsquic_parse.h"
|
||||
|
||||
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
|
||||
//static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043); // will not work on MSVC
|
||||
#define pf ((const struct parse_funcs *const)select_pf_by_ver(LSQVER_043))
|
||||
|
||||
|
||||
struct goaway_parse_test {
|
||||
|
|
|
@ -335,6 +335,7 @@ main (int argc, char **argv)
|
|||
for (n = 0; n < sizeof(test_specs) / sizeof(test_specs[0]); ++n)
|
||||
run_test(&test_specs[n]);
|
||||
|
||||
#ifndef NDEBUG
|
||||
lsquic_hpi_set_heap_test(LSQUIC_HPI_HEAP_TEST_STACK_OK);
|
||||
for (n = 0; n < sizeof(test_specs) / sizeof(test_specs[0]); ++n)
|
||||
run_test(&test_specs[n]);
|
||||
|
@ -346,6 +347,7 @@ main (int argc, char **argv)
|
|||
lsquic_hpi_set_heap_test(0);
|
||||
for (n = 0; n < sizeof(test_specs) / sizeof(test_specs[0]); ++n)
|
||||
run_test(&test_specs[n]);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -8,6 +8,10 @@
|
|||
|
||||
#include "lsquic_minmax.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include "vc_compat.h"
|
||||
#endif
|
||||
|
||||
/* Convert milliseconds to lsquic_time_t, which is microseconds */
|
||||
#define ms(val) ((val) * 1000)
|
||||
|
||||
|
|
|
@ -606,8 +606,11 @@ run_test (const struct test_spec *spec, enum lsquic_version version)
|
|||
LSQ_INFO("Running test on line %d: %s", spec->lineno, spec->desc);
|
||||
if (spec->versions && !(spec->versions & (1 << version)))
|
||||
{
|
||||
LSQ_INFO("Not applicable to version %s, skip",
|
||||
lsquic_ver2str[version]);
|
||||
#ifndef _MSC_VER
|
||||
LSQ_INFO("Not applicable to version %s, skip", lsquic_ver2str[version]);
|
||||
#else
|
||||
LSQ_INFO("Not applicable to version %d, skip", version);
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -765,7 +768,11 @@ main (int argc, char **argv)
|
|||
{
|
||||
if (!((1 << version) & LSQUIC_DF_VERSIONS))
|
||||
continue;
|
||||
#ifndef _MSC_VER
|
||||
LSQ_INFO("testing version %s", lsquic_ver2str[version]);
|
||||
#else
|
||||
LSQ_INFO("testing version %d", version);
|
||||
#endif
|
||||
for (spec = test_specs; spec < test_specs + sizeof(test_specs) / sizeof(test_specs[0]); ++spec)
|
||||
run_test(spec, version);
|
||||
}
|
||||
|
|
|
@ -14,7 +14,8 @@
|
|||
#include "lsquic_parse.h"
|
||||
|
||||
|
||||
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
|
||||
//static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043); // will not work on MSVC
|
||||
#define pf ((const struct parse_funcs *const)select_pf_by_ver(LSQVER_043))
|
||||
|
||||
|
||||
struct packno_bits_test {
|
||||
|
@ -205,7 +206,6 @@ static const struct packno_bits_test pb_tests[] = {
|
|||
static void
|
||||
run_pbt (int i)
|
||||
{
|
||||
const struct parse_funcs *pf = select_pf_by_ver(LSQVER_043);
|
||||
const struct packno_bits_test *const pbt = &pb_tests[i];
|
||||
enum packno_bits packno_bits = pf->pf_calc_packno_bits(pbt->pbt_packno,
|
||||
pbt->pbt_least_unacked, pbt->pbt_n_in_flight);
|
||||
|
|
|
@ -22,8 +22,10 @@ static int s_eight;
|
|||
static void
|
||||
bloom_test (unsigned count, unsigned miss_searches, unsigned hit_searches)
|
||||
{
|
||||
struct lsquic_purga *purga;
|
||||
#ifndef NDEBUG
|
||||
struct purga_bloom_stats *stats;
|
||||
#endif
|
||||
struct lsquic_purga *purga;
|
||||
struct purga_el *puel;
|
||||
lsquic_cid_t *cids, cid;
|
||||
unsigned i, j;
|
||||
|
@ -73,10 +75,12 @@ bloom_test (unsigned count, unsigned miss_searches, unsigned hit_searches)
|
|||
}
|
||||
}
|
||||
|
||||
#ifndef NDEBUG
|
||||
stats = lsquic_purga_get_bloom_stats(purga);
|
||||
LSQ_NOTICE("searches: %lu, false hits: %lu, false hit ratio: %lf",
|
||||
stats->searches, stats->false_hits,
|
||||
(double) stats->false_hits / (double) stats->searches);
|
||||
#endif
|
||||
|
||||
lsquic_purga_destroy(purga);
|
||||
free(cids);
|
||||
|
|
|
@ -12,7 +12,8 @@
|
|||
#include "lsquic_parse.h"
|
||||
|
||||
|
||||
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
|
||||
//static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043); // will not work on MSVC
|
||||
#define pf ((const struct parse_funcs *const)select_pf_by_ver(LSQVER_043))
|
||||
|
||||
struct float_test {
|
||||
uint64_t long_time;
|
||||
|
|
|
@ -41,8 +41,46 @@ struct test {
|
|||
};
|
||||
|
||||
|
||||
static const struct test tests[] = {
|
||||
|
||||
static void
|
||||
run_test (const struct test *const test)
|
||||
{
|
||||
|
||||
struct lsquic_packet_out packet_out =
|
||||
{
|
||||
.po_flags = (test->cid ? PO_CONN_ID : 0)
|
||||
| (test->ver.val ? PO_VERSION : 0)
|
||||
| (test->nonce ? PO_NONCE: 0)
|
||||
,
|
||||
.po_nonce = (unsigned char *) test->nonce,
|
||||
.po_ver_tag = test->ver.val,
|
||||
.po_packno = test->packno,
|
||||
};
|
||||
lsquic_packet_out_set_packno_bits(&packet_out, test->bits);
|
||||
|
||||
lsquic_cid_t cid;
|
||||
memset(&cid, 0, sizeof(cid));
|
||||
cid.len = sizeof(test->cid);
|
||||
memcpy(cid.idbuf, &test->cid, sizeof(test->cid));
|
||||
|
||||
struct lsquic_conn lconn = LSCONN_INITIALIZER_CID(lconn, cid);
|
||||
|
||||
unsigned char out[GQUIC_MAX_PUBHDR_SZ];
|
||||
int len = test->pf->pf_gen_reg_pkt_header(&lconn, &packet_out, out,
|
||||
sizeof(out), NULL, NULL);
|
||||
|
||||
assert(("Packet length is correct", len == test->len));
|
||||
|
||||
if (test->len > 0)
|
||||
assert(("Packet contents are correct",
|
||||
0 == memcmp(out, test->out, len)));
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
const struct test tests[] = {
|
||||
{
|
||||
.pf = select_pf_by_ver(LSQVER_043),
|
||||
.bufsz = GQUIC_MAX_PUBHDR_SZ,
|
||||
|
@ -193,48 +231,8 @@ static const struct test tests[] = {
|
|||
|
||||
};
|
||||
|
||||
|
||||
static void
|
||||
run_test (int i)
|
||||
{
|
||||
const struct test *const test = &tests[i];
|
||||
|
||||
struct lsquic_packet_out packet_out =
|
||||
{
|
||||
.po_flags = (test->cid ? PO_CONN_ID : 0)
|
||||
| (test->ver.val ? PO_VERSION : 0)
|
||||
| (test->nonce ? PO_NONCE: 0)
|
||||
,
|
||||
.po_nonce = (unsigned char *) test->nonce,
|
||||
.po_ver_tag = test->ver.val,
|
||||
.po_packno = test->packno,
|
||||
};
|
||||
lsquic_packet_out_set_packno_bits(&packet_out, test->bits);
|
||||
|
||||
lsquic_cid_t cid;
|
||||
memset(&cid, 0, sizeof(cid));
|
||||
cid.len = sizeof(test->cid);
|
||||
memcpy(cid.idbuf, &test->cid, sizeof(test->cid));
|
||||
|
||||
struct lsquic_conn lconn = LSCONN_INITIALIZER_CID(lconn, cid);
|
||||
|
||||
unsigned char out[GQUIC_MAX_PUBHDR_SZ];
|
||||
int len = test->pf->pf_gen_reg_pkt_header(&lconn, &packet_out, out,
|
||||
sizeof(out), NULL, NULL);
|
||||
|
||||
assert(("Packet length is correct", len == test->len));
|
||||
|
||||
if (test->len > 0)
|
||||
assert(("Packet contents are correct",
|
||||
0 == memcmp(out, test->out, len)));
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
unsigned i;
|
||||
for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i)
|
||||
run_test(i);
|
||||
run_test(&tests[i]);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
#include "lsquic_types.h"
|
||||
#include "lsquic_parse.h"
|
||||
|
||||
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
|
||||
//static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043); // will not work on MSVC
|
||||
#define pf ((const struct parse_funcs *const)select_pf_by_ver(LSQVER_043))
|
||||
|
||||
|
||||
/* The test is both for generation and parsing: */
|
||||
|
|
|
@ -4,7 +4,9 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include "vc_compat.h"
|
||||
#endif
|
||||
#include "lsquic_int_types.h"
|
||||
#include "lsquic_senhist.h"
|
||||
#include "lsquic_types.h"
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
#include "lsquic_types.h"
|
||||
#include "lsquic_parse.h"
|
||||
|
||||
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
|
||||
//static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043); // will not work on MSVC
|
||||
#define pf ((const struct parse_funcs *const)select_pf_by_ver(LSQVER_043))
|
||||
|
||||
|
||||
struct parse_test {
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
#include "lsquic_hq.h"
|
||||
#include "lsquic_data_in_if.h"
|
||||
|
||||
static const struct parse_funcs *g_pf = select_pf_by_ver(LSQVER_043);
|
||||
static const struct parse_funcs *g_pf; // = select_pf_by_ver(LSQVER_043); // will not work on MSVC, moved init to main()
|
||||
|
||||
static int g_use_crypto_ctor;
|
||||
|
||||
|
@ -1295,6 +1295,7 @@ test_loc_RST_rem_FIN (struct test_objs *tobjs)
|
|||
* Stream B is reset. We should get a gapless sequence
|
||||
* of packets 1, 2.
|
||||
*/
|
||||
#ifndef NDEBUG
|
||||
static void
|
||||
test_gapless_elision_middle (struct test_objs *tobjs)
|
||||
{
|
||||
|
@ -1368,7 +1369,6 @@ test_gapless_elision_middle (struct test_objs *tobjs)
|
|||
lsquic_stream_destroy(streamB);
|
||||
}
|
||||
|
||||
|
||||
/* Test that when stream frame is elided and the packet is dropped,
|
||||
* the send controller produces a gapless sequence.
|
||||
*
|
||||
|
@ -1456,6 +1456,7 @@ test_gapless_elision_beginning (struct test_objs *tobjs)
|
|||
lsquic_stream_destroy(streamA);
|
||||
lsquic_stream_destroy(streamB);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
@ -1599,8 +1600,10 @@ test_termination (void)
|
|||
{ 1, 1, test_loc_data_rem_RST, },
|
||||
{ 0, 1, test_loc_data_rem_SS, },
|
||||
{ 1, 0, test_loc_RST_rem_FIN, },
|
||||
#ifndef NDEBUG
|
||||
{ 1, 1, test_gapless_elision_beginning, },
|
||||
{ 1, 1, test_gapless_elision_middle, },
|
||||
#endif
|
||||
}, *tf;
|
||||
|
||||
for (tf = test_funcs; tf < test_funcs + sizeof(test_funcs) / sizeof(test_funcs[0]); ++tf)
|
||||
|
@ -2998,6 +3001,7 @@ test_bad_packbits_guess_3 (void)
|
|||
static void
|
||||
test_resize_buffered (void)
|
||||
{
|
||||
#ifndef NDEBUG
|
||||
ssize_t nw;
|
||||
struct test_objs tobjs;
|
||||
struct lsquic_stream *streams[1];
|
||||
|
@ -3046,6 +3050,7 @@ test_resize_buffered (void)
|
|||
lsquic_stream_destroy(streams[0]);
|
||||
deinit_test_objs(&tobjs);
|
||||
lsquic_send_ctl_set_max_bpq_count(10);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
@ -3059,6 +3064,7 @@ test_resize_buffered (void)
|
|||
static void
|
||||
test_resize_scheduled (void)
|
||||
{
|
||||
#ifndef NDEBUG // lsquic_send_ctl_set_max_bpq_count is debug only
|
||||
ssize_t nw;
|
||||
struct test_objs tobjs;
|
||||
struct lsquic_stream *streams[1];
|
||||
|
@ -3107,6 +3113,7 @@ test_resize_scheduled (void)
|
|||
lsquic_stream_destroy(streams[0]);
|
||||
deinit_test_objs(&tobjs);
|
||||
lsquic_send_ctl_set_max_bpq_count(10);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
@ -3671,6 +3678,8 @@ main_test_packetization (void)
|
|||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
g_pf = select_pf_by_ver(LSQVER_043);
|
||||
|
||||
int opt;
|
||||
|
||||
lsquic_global_init(LSQUIC_GLOBAL_SERVER);
|
||||
|
|
|
@ -41,7 +41,99 @@ struct test {
|
|||
};
|
||||
|
||||
|
||||
static const struct test tests[] = {
|
||||
static struct test_ctx {
|
||||
const struct test *test;
|
||||
int next_fin;
|
||||
lsquic_stream_t stream;
|
||||
} test_ctx;
|
||||
|
||||
|
||||
static int
|
||||
stream_tosend_fin (void *stream)
|
||||
{
|
||||
struct test_ctx *test_ctx2 = stream;
|
||||
return test_ctx2->test->fin[ test_ctx2->next_fin++ ];
|
||||
}
|
||||
|
||||
|
||||
static size_t
|
||||
stream_tosend_read (void *stream, void *buf, size_t len, int *reached_fin)
|
||||
{
|
||||
struct test_ctx *test_ctx2 = stream;
|
||||
if (test_ctx2->test->data_sz < len)
|
||||
len = test_ctx2->test->data_sz;
|
||||
memcpy(buf, test_ctx2->test->data, len);
|
||||
*reached_fin = stream_tosend_fin(stream);
|
||||
return len;
|
||||
}
|
||||
|
||||
|
||||
static size_t
|
||||
stream_tosend_size (void *stream)
|
||||
{
|
||||
struct test_ctx *test_ctx2 = stream;
|
||||
return test_ctx2->test->data_sz;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
reset_ctx (const struct test *test)
|
||||
{
|
||||
test_ctx.test = test;
|
||||
test_ctx.next_fin = 0;
|
||||
test_ctx.stream.id = test->stream_id;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
run_test (const struct test *const test)
|
||||
{
|
||||
|
||||
unsigned char out[0x100];
|
||||
int len;
|
||||
size_t min;
|
||||
|
||||
if (test->len > 0)
|
||||
{
|
||||
/* Test that all sizes under specified min fail to produce a frame */
|
||||
for (min = 0; min < test->min_sz; ++min)
|
||||
{
|
||||
reset_ctx(test);
|
||||
len = test->pf->pf_gen_stream_frame(out, min, test->stream_id,
|
||||
test_ctx.test->offset, stream_tosend_fin(&test_ctx),
|
||||
stream_tosend_size(&test_ctx), stream_tosend_read, &test_ctx);
|
||||
assert(len < 0);
|
||||
}
|
||||
|
||||
/* Test that it succeeds now: */
|
||||
reset_ctx(test);
|
||||
len = test->pf->pf_gen_stream_frame(out, min, test->stream_id,
|
||||
test_ctx.test->offset, stream_tosend_fin(&test_ctx),
|
||||
stream_tosend_size(&test_ctx), stream_tosend_read, &test_ctx);
|
||||
assert(len == (int) min);
|
||||
}
|
||||
|
||||
reset_ctx(test);
|
||||
len = test->pf->pf_gen_stream_frame(out, test->avail, test->stream_id,
|
||||
test_ctx.test->offset, stream_tosend_fin(&test_ctx),
|
||||
stream_tosend_size(&test_ctx), stream_tosend_read, &test_ctx);
|
||||
|
||||
if (test->len > 0) {
|
||||
/* Check parser operation */
|
||||
assert(test->len == len);
|
||||
assert(("Generated frame is correct", 0 == memcmp(test->out, out, test->len)));
|
||||
}
|
||||
else
|
||||
{
|
||||
assert(("This test should fail", len < 0));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
const struct test tests[] = {
|
||||
/*
|
||||
* Big-endian:
|
||||
*/
|
||||
|
@ -394,102 +486,8 @@ static const struct test tests[] = {
|
|||
|
||||
};
|
||||
|
||||
|
||||
static struct test_ctx {
|
||||
const struct test *test;
|
||||
int next_fin;
|
||||
lsquic_stream_t stream;
|
||||
} test_ctx;
|
||||
|
||||
|
||||
static int
|
||||
stream_tosend_fin (void *stream)
|
||||
{
|
||||
struct test_ctx *test_ctx2 = stream;
|
||||
return test_ctx2->test->fin[ test_ctx2->next_fin++ ];
|
||||
}
|
||||
|
||||
|
||||
static size_t
|
||||
stream_tosend_read (void *stream, void *buf, size_t len, int *reached_fin)
|
||||
{
|
||||
struct test_ctx *test_ctx2 = stream;
|
||||
if (test_ctx2->test->data_sz < len)
|
||||
len = test_ctx2->test->data_sz;
|
||||
memcpy(buf, test_ctx2->test->data, len);
|
||||
*reached_fin = stream_tosend_fin(stream);
|
||||
return len;
|
||||
}
|
||||
|
||||
|
||||
static size_t
|
||||
stream_tosend_size (void *stream)
|
||||
{
|
||||
struct test_ctx *test_ctx2 = stream;
|
||||
return test_ctx2->test->data_sz;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
reset_ctx (const struct test *test)
|
||||
{
|
||||
test_ctx.test = test;
|
||||
test_ctx.next_fin = 0;
|
||||
test_ctx.stream.id = test->stream_id;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
run_test (int i)
|
||||
{
|
||||
const struct test *const test = &tests[i];
|
||||
|
||||
unsigned char out[0x100];
|
||||
int len;
|
||||
size_t min;
|
||||
|
||||
if (test->len > 0)
|
||||
{
|
||||
/* Test that all sizes under specified min fail to produce a frame */
|
||||
for (min = 0; min < test->min_sz; ++min)
|
||||
{
|
||||
reset_ctx(test);
|
||||
len = test->pf->pf_gen_stream_frame(out, min, test->stream_id,
|
||||
test_ctx.test->offset, stream_tosend_fin(&test_ctx),
|
||||
stream_tosend_size(&test_ctx), stream_tosend_read, &test_ctx);
|
||||
assert(len < 0);
|
||||
}
|
||||
|
||||
/* Test that it succeeds now: */
|
||||
reset_ctx(test);
|
||||
len = test->pf->pf_gen_stream_frame(out, min, test->stream_id,
|
||||
test_ctx.test->offset, stream_tosend_fin(&test_ctx),
|
||||
stream_tosend_size(&test_ctx), stream_tosend_read, &test_ctx);
|
||||
assert(len == (int) min);
|
||||
}
|
||||
|
||||
reset_ctx(test);
|
||||
len = test->pf->pf_gen_stream_frame(out, test->avail, test->stream_id,
|
||||
test_ctx.test->offset, stream_tosend_fin(&test_ctx),
|
||||
stream_tosend_size(&test_ctx), stream_tosend_read, &test_ctx);
|
||||
|
||||
if (test->len > 0) {
|
||||
/* Check parser operation */
|
||||
assert(test->len == len);
|
||||
assert(("Generated frame is correct", 0 == memcmp(test->out, out, test->len)));
|
||||
}
|
||||
else
|
||||
{
|
||||
assert(("This test should fail", len < 0));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
unsigned i;
|
||||
for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i)
|
||||
run_test(i);
|
||||
run_test(&tests[i]);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -30,7 +30,38 @@ struct test {
|
|||
int should_succeed;
|
||||
};
|
||||
|
||||
static const struct test tests[] = {
|
||||
static void
|
||||
run_test (const struct test *test)
|
||||
{
|
||||
stream_frame_t frame;
|
||||
memset(&frame, 0x7A, sizeof(frame));
|
||||
|
||||
int len = test->pf->pf_parse_stream_frame(test->buf, test->rem_packet_sz, &frame);
|
||||
|
||||
if (test->should_succeed) {
|
||||
/* Check parser operation */
|
||||
assert(("Parsed correct number of bytes", (size_t) len == test->buf_sz + test->frame.data_frame.df_size));
|
||||
assert(("Stream ID is correct", frame.stream_id == test->frame.stream_id));
|
||||
assert(("Data length is correct", frame.data_frame.df_size == test->frame.data_frame.df_size));
|
||||
assert(("Offset is correct", frame.data_frame.df_offset == test->frame.data_frame.df_offset));
|
||||
assert(("FIN is correct", frame.data_frame.df_fin == test->frame.data_frame.df_fin));
|
||||
|
||||
/* Check that initialization of other fields occurred correctly: */
|
||||
assert(0 == frame.packet_in);
|
||||
assert(0 == frame.data_frame.df_read_off);
|
||||
}
|
||||
else
|
||||
{
|
||||
assert(("This test should fail", len < 0));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
|
||||
const struct test tests[] = {
|
||||
|
||||
/*
|
||||
* Big-endian tests
|
||||
|
@ -412,37 +443,6 @@ static const struct test tests[] = {
|
|||
|
||||
};
|
||||
|
||||
|
||||
static void
|
||||
run_test (const struct test *test)
|
||||
{
|
||||
stream_frame_t frame;
|
||||
memset(&frame, 0x7A, sizeof(frame));
|
||||
|
||||
int len = test->pf->pf_parse_stream_frame(test->buf, test->rem_packet_sz, &frame);
|
||||
|
||||
if (test->should_succeed) {
|
||||
/* Check parser operation */
|
||||
assert(("Parsed correct number of bytes", (size_t) len == test->buf_sz + test->frame.data_frame.df_size));
|
||||
assert(("Stream ID is correct", frame.stream_id == test->frame.stream_id));
|
||||
assert(("Data length is correct", frame.data_frame.df_size == test->frame.data_frame.df_size));
|
||||
assert(("Offset is correct", frame.data_frame.df_offset == test->frame.data_frame.df_offset));
|
||||
assert(("FIN is correct", frame.data_frame.df_fin == test->frame.data_frame.df_fin));
|
||||
|
||||
/* Check that initialization of other fields occurred correctly: */
|
||||
assert(0 == frame.packet_in);
|
||||
assert(0 == frame.data_frame.df_read_off);
|
||||
}
|
||||
else
|
||||
{
|
||||
assert(("This test should fail", len < 0));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
unsigned i;
|
||||
for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i)
|
||||
run_test(&tests[i]);
|
||||
|
|
|
@ -5,6 +5,10 @@
|
|||
|
||||
#include "lsquic_varint.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include "vc_compat.h"
|
||||
#endif
|
||||
|
||||
#define MAX_INPUT_SZ 8
|
||||
|
||||
struct test_read_varint
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
#include "lsquic_types.h"
|
||||
#include "lsquic_parse.h"
|
||||
|
||||
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
|
||||
//static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043); // will not work on MSVC
|
||||
#define pf ((const struct parse_funcs *const)select_pf_by_ver(LSQVER_043))
|
||||
|
||||
|
||||
/* The test is both for generation and parsing: */
|
||||
|
|
|
@ -1,759 +0,0 @@
|
|||
/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc. See LICENSE. */
|
||||
/* Getopt for GNU.
|
||||
NOTE: getopt is now part of the C library, so if you don't know what
|
||||
"Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
|
||||
before changing it!
|
||||
|
||||
Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the
|
||||
Free Software Foundation; either version 2, or (at your option) any
|
||||
later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||
|
||||
/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
|
||||
Ditto for AIX 3.2 and <stdlib.h>. */
|
||||
#ifndef _NO_PROTO
|
||||
#define _NO_PROTO
|
||||
#endif
|
||||
#pragma warning(disable:4131)
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#if defined (emacs) || defined (CONFIG_BROKETS)
|
||||
/* We use <config.h> instead of "config.h" so that a compilation
|
||||
using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
|
||||
(which it would do because it found this file in $srcdir). */
|
||||
#include <config.h>
|
||||
#else
|
||||
#include "config.h"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef __STDC__
|
||||
/* This is a separate conditional since some stdc systems
|
||||
reject `defined (const)'. */
|
||||
#ifndef const
|
||||
#define const
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
/* Comment out all this code if we are using the GNU C Library, and are not
|
||||
actually compiling the library itself. This code is part of the GNU C
|
||||
Library, but also included in many other GNU distributions. Compiling
|
||||
and linking in this code is a waste when using the GNU C library
|
||||
(especially if it is a shared library). Rather than having every GNU
|
||||
program understand `configure --with-gnu-libc' and omit the object files,
|
||||
it is simpler to just do this in the source for each such file. */
|
||||
|
||||
#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
|
||||
|
||||
|
||||
/* This needs to come after some library #include
|
||||
to get __GNU_LIBRARY__ defined. */
|
||||
#ifdef __GNU_LIBRARY__
|
||||
/* Don't include stdlib.h for non-GNU C libraries because some of them
|
||||
contain conflicting prototypes for getopt. */
|
||||
#include <stdlib.h>
|
||||
#endif /* GNU C library. */
|
||||
|
||||
/* This version of `getopt' appears to the caller like standard Unix `getopt'
|
||||
but it behaves differently for the user, since it allows the user
|
||||
to intersperse the options with the other arguments.
|
||||
|
||||
As `getopt' works, it permutes the elements of ARGV so that,
|
||||
when it is done, all the options precede everything else. Thus
|
||||
all application programs are extended to handle flexible argument order.
|
||||
|
||||
Setting the environment variable POSIXLY_CORRECT disables permutation.
|
||||
Then the behavior is completely standard.
|
||||
|
||||
GNU application programs can use a third alternative mode in which
|
||||
they can distinguish the relative order of options and other arguments. */
|
||||
|
||||
#include "getopt.h"
|
||||
|
||||
/* For communication from `getopt' to the caller.
|
||||
When `getopt' finds an option that takes an argument,
|
||||
the argument value is returned here.
|
||||
Also, when `ordering' is RETURN_IN_ORDER,
|
||||
each non-option ARGV-element is returned here. */
|
||||
|
||||
char *optarg = NULL;
|
||||
|
||||
/* Index in ARGV of the next element to be scanned.
|
||||
This is used for communication to and from the caller
|
||||
and for communication between successive calls to `getopt'.
|
||||
|
||||
On entry to `getopt', zero means this is the first call; initialize.
|
||||
|
||||
When `getopt' returns EOF, this is the index of the first of the
|
||||
non-option elements that the caller should itself scan.
|
||||
|
||||
Otherwise, `optind' communicates from one call to the next
|
||||
how much of ARGV has been scanned so far. */
|
||||
|
||||
/* XXX 1003.2 says this must be 1 before any call. */
|
||||
int optind = 0;
|
||||
|
||||
/* The next char to be scanned in the option-element
|
||||
in which the last option character we returned was found.
|
||||
This allows us to pick up the scan where we left off.
|
||||
|
||||
If this is zero, or a null string, it means resume the scan
|
||||
by advancing to the next ARGV-element. */
|
||||
|
||||
static char *nextchar;
|
||||
|
||||
/* Callers store zero here to inhibit the error message
|
||||
for unrecognized options. */
|
||||
|
||||
int opterr = 1;
|
||||
|
||||
/* Set to an option character which was unrecognized.
|
||||
This must be initialized on some systems to avoid linking in the
|
||||
system's own getopt implementation. */
|
||||
|
||||
int optopt = '?';
|
||||
|
||||
/* Describe how to deal with options that follow non-option ARGV-elements.
|
||||
|
||||
If the caller did not specify anything,
|
||||
the default is REQUIRE_ORDER if the environment variable
|
||||
POSIXLY_CORRECT is defined, PERMUTE otherwise.
|
||||
|
||||
REQUIRE_ORDER means don't recognize them as options;
|
||||
stop option processing when the first non-option is seen.
|
||||
This is what Unix does.
|
||||
This mode of operation is selected by either setting the environment
|
||||
variable POSIXLY_CORRECT, or using `+' as the first character
|
||||
of the list of option characters.
|
||||
|
||||
PERMUTE is the default. We permute the contents of ARGV as we scan,
|
||||
so that eventually all the non-options are at the end. This allows options
|
||||
to be given in any order, even with programs that were not written to
|
||||
expect this.
|
||||
|
||||
RETURN_IN_ORDER is an option available to programs that were written
|
||||
to expect options and other ARGV-elements in any order and that care about
|
||||
the ordering of the two. We describe each non-option ARGV-element
|
||||
as if it were the argument of an option with character code 1.
|
||||
Using `-' as the first character of the list of option characters
|
||||
selects this mode of operation.
|
||||
|
||||
The special argument `--' forces an end of option-scanning regardless
|
||||
of the value of `ordering'. In the case of RETURN_IN_ORDER, only
|
||||
`--' can cause `getopt' to return EOF with `optind' != ARGC. */
|
||||
|
||||
static enum
|
||||
{
|
||||
REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
|
||||
} ordering;
|
||||
|
||||
/* Value of POSIXLY_CORRECT environment variable. */
|
||||
static char *posixly_correct;
|
||||
|
||||
#ifdef __GNU_LIBRARY__
|
||||
/* We want to avoid inclusion of string.h with non-GNU libraries
|
||||
because there are many ways it can cause trouble.
|
||||
On some systems, it contains special magic macros that don't work
|
||||
in GCC. */
|
||||
#include <string.h>
|
||||
#define my_index strchr
|
||||
#else
|
||||
|
||||
/* Avoid depending on library functions or files
|
||||
whose names are inconsistent. */
|
||||
|
||||
char *getenv ();
|
||||
|
||||
static char *
|
||||
my_index (str, chr)
|
||||
const char *str;
|
||||
int chr;
|
||||
{
|
||||
while (*str)
|
||||
{
|
||||
if (*str == chr)
|
||||
return (char *) str;
|
||||
str++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* If using GCC, we can safely declare strlen this way.
|
||||
If not using GCC, it is ok not to declare it. */
|
||||
#ifdef __GNUC__
|
||||
/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
|
||||
That was relevant to code that was here before. */
|
||||
#ifndef __STDC__
|
||||
/* gcc with -traditional declares the built-in strlen to return int,
|
||||
and has done so at least since version 2.4.5. -- rms. */
|
||||
extern int strlen (const char *);
|
||||
#endif /* not __STDC__ */
|
||||
#endif /* __GNUC__ */
|
||||
|
||||
#endif /* not __GNU_LIBRARY__ */
|
||||
|
||||
/* Handle permutation of arguments. */
|
||||
|
||||
/* Describe the part of ARGV that contains non-options that have
|
||||
been skipped. `first_nonopt' is the index in ARGV of the first of them;
|
||||
`last_nonopt' is the index after the last of them. */
|
||||
|
||||
static int first_nonopt;
|
||||
static int last_nonopt;
|
||||
|
||||
/* Exchange two adjacent subsequences of ARGV.
|
||||
One subsequence is elements [first_nonopt,last_nonopt)
|
||||
which contains all the non-options that have been skipped so far.
|
||||
The other is elements [last_nonopt,optind), which contains all
|
||||
the options processed since those non-options were skipped.
|
||||
|
||||
`first_nonopt' and `last_nonopt' are relocated so that they describe
|
||||
the new indices of the non-options in ARGV after they are moved. */
|
||||
|
||||
static void
|
||||
exchange (argv)
|
||||
char **argv;
|
||||
{
|
||||
int bottom = first_nonopt;
|
||||
int middle = last_nonopt;
|
||||
int top = optind;
|
||||
char *tem;
|
||||
|
||||
/* Exchange the shorter segment with the far end of the longer segment.
|
||||
That puts the shorter segment into the right place.
|
||||
It leaves the longer segment in the right place overall,
|
||||
but it consists of two parts that need to be swapped next. */
|
||||
|
||||
while (top > middle && middle > bottom)
|
||||
{
|
||||
if (top - middle > middle - bottom)
|
||||
{
|
||||
/* Bottom segment is the short one. */
|
||||
int len = middle - bottom;
|
||||
register int i;
|
||||
|
||||
/* Swap it with the top part of the top segment. */
|
||||
for (i = 0; i < len; i++)
|
||||
{
|
||||
tem = argv[bottom + i];
|
||||
argv[bottom + i] = argv[top - (middle - bottom) + i];
|
||||
argv[top - (middle - bottom) + i] = tem;
|
||||
}
|
||||
/* Exclude the moved bottom segment from further swapping. */
|
||||
top -= len;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Top segment is the short one. */
|
||||
int len = top - middle;
|
||||
register int i;
|
||||
|
||||
/* Swap it with the bottom part of the bottom segment. */
|
||||
for (i = 0; i < len; i++)
|
||||
{
|
||||
tem = argv[bottom + i];
|
||||
argv[bottom + i] = argv[middle + i];
|
||||
argv[middle + i] = tem;
|
||||
}
|
||||
/* Exclude the moved top segment from further swapping. */
|
||||
bottom += len;
|
||||
}
|
||||
}
|
||||
|
||||
/* Update records for the slots the non-options now occupy. */
|
||||
|
||||
first_nonopt += (optind - last_nonopt);
|
||||
last_nonopt = optind;
|
||||
}
|
||||
|
||||
/* Initialize the internal data when the first call is made. */
|
||||
|
||||
static const char *
|
||||
_getopt_initialize (optstring)
|
||||
const char *optstring;
|
||||
{
|
||||
/* Start processing options with ARGV-element 1 (since ARGV-element 0
|
||||
is the program name); the sequence of previously skipped
|
||||
non-option ARGV-elements is empty. */
|
||||
|
||||
first_nonopt = last_nonopt = optind = 1;
|
||||
|
||||
nextchar = NULL;
|
||||
|
||||
posixly_correct = getenv ("POSIXLY_CORRECT");
|
||||
|
||||
/* Determine how to handle the ordering of options and nonoptions. */
|
||||
|
||||
if (optstring[0] == '-')
|
||||
{
|
||||
ordering = RETURN_IN_ORDER;
|
||||
++optstring;
|
||||
}
|
||||
else if (optstring[0] == '+')
|
||||
{
|
||||
ordering = REQUIRE_ORDER;
|
||||
++optstring;
|
||||
}
|
||||
else if (posixly_correct != NULL)
|
||||
ordering = REQUIRE_ORDER;
|
||||
else
|
||||
ordering = PERMUTE;
|
||||
|
||||
return optstring;
|
||||
}
|
||||
|
||||
/* Scan elements of ARGV (whose length is ARGC) for option characters
|
||||
given in OPTSTRING.
|
||||
|
||||
If an element of ARGV starts with '-', and is not exactly "-" or "--",
|
||||
then it is an option element. The characters of this element
|
||||
(aside from the initial '-') are option characters. If `getopt'
|
||||
is called repeatedly, it returns successively each of the option characters
|
||||
from each of the option elements.
|
||||
|
||||
If `getopt' finds another option character, it returns that character,
|
||||
updating `optind' and `nextchar' so that the next call to `getopt' can
|
||||
resume the scan with the following option character or ARGV-element.
|
||||
|
||||
If there are no more option characters, `getopt' returns `EOF'.
|
||||
Then `optind' is the index in ARGV of the first ARGV-element
|
||||
that is not an option. (The ARGV-elements have been permuted
|
||||
so that those that are not options now come last.)
|
||||
|
||||
OPTSTRING is a string containing the legitimate option characters.
|
||||
If an option character is seen that is not listed in OPTSTRING,
|
||||
return '?' after printing an error message. If you set `opterr' to
|
||||
zero, the error message is suppressed but we still return '?'.
|
||||
|
||||
If a char in OPTSTRING is followed by a colon, that means it wants an arg,
|
||||
so the following text in the same ARGV-element, or the text of the following
|
||||
ARGV-element, is returned in `optarg'. Two colons mean an option that
|
||||
wants an optional arg; if there is text in the current ARGV-element,
|
||||
it is returned in `optarg', otherwise `optarg' is set to zero.
|
||||
|
||||
If OPTSTRING starts with `-' or `+', it requests different methods of
|
||||
handling the non-option ARGV-elements.
|
||||
See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
|
||||
|
||||
Long-named options begin with `--' instead of `-'.
|
||||
Their names may be abbreviated as long as the abbreviation is unique
|
||||
or is an exact match for some defined option. If they have an
|
||||
argument, it follows the option name in the same ARGV-element, separated
|
||||
from the option name by a `=', or else the in next ARGV-element.
|
||||
When `getopt' finds a long-named option, it returns 0 if that option's
|
||||
`flag' field is nonzero, the value of the option's `val' field
|
||||
if the `flag' field is zero.
|
||||
|
||||
The elements of ARGV aren't really const, because we permute them.
|
||||
But we pretend they're const in the prototype to be compatible
|
||||
with other systems.
|
||||
|
||||
LONGOPTS is a vector of `struct option' terminated by an
|
||||
element containing a name which is zero.
|
||||
|
||||
LONGIND returns the index in LONGOPT of the long-named option found.
|
||||
It is only valid when a long-named option has been found by the most
|
||||
recent call.
|
||||
|
||||
If LONG_ONLY is nonzero, '-' as well as '--' can introduce
|
||||
long-named options. */
|
||||
|
||||
int
|
||||
_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
|
||||
int argc;
|
||||
char *const *argv;
|
||||
const char *optstring;
|
||||
const struct option *longopts;
|
||||
int *longind;
|
||||
int long_only;
|
||||
{
|
||||
optarg = NULL;
|
||||
|
||||
if (optind == 0)
|
||||
optstring = _getopt_initialize (optstring);
|
||||
|
||||
if (nextchar == NULL || *nextchar == '\0')
|
||||
{
|
||||
/* Advance to the next ARGV-element. */
|
||||
|
||||
if (ordering == PERMUTE)
|
||||
{
|
||||
/* If we have just processed some options following some non-options,
|
||||
exchange them so that the options come first. */
|
||||
|
||||
if (first_nonopt != last_nonopt && last_nonopt != optind)
|
||||
exchange ((char **) argv);
|
||||
else if (last_nonopt != optind)
|
||||
first_nonopt = optind;
|
||||
|
||||
/* Skip any additional non-options
|
||||
and extend the range of non-options previously skipped. */
|
||||
|
||||
while (optind < argc
|
||||
&& (argv[optind][0] != '-' || argv[optind][1] == '\0'))
|
||||
optind++;
|
||||
last_nonopt = optind;
|
||||
}
|
||||
|
||||
/* The special ARGV-element `--' means premature end of options.
|
||||
Skip it like a null option,
|
||||
then exchange with previous non-options as if it were an option,
|
||||
then skip everything else like a non-option. */
|
||||
|
||||
if (optind != argc && !strcmp (argv[optind], "--"))
|
||||
{
|
||||
optind++;
|
||||
|
||||
if (first_nonopt != last_nonopt && last_nonopt != optind)
|
||||
exchange ((char **) argv);
|
||||
else if (first_nonopt == last_nonopt)
|
||||
first_nonopt = optind;
|
||||
last_nonopt = argc;
|
||||
|
||||
optind = argc;
|
||||
}
|
||||
|
||||
/* If we have done all the ARGV-elements, stop the scan
|
||||
and back over any non-options that we skipped and permuted. */
|
||||
|
||||
if (optind == argc)
|
||||
{
|
||||
/* Set the next-arg-index to point at the non-options
|
||||
that we previously skipped, so the caller will digest them. */
|
||||
if (first_nonopt != last_nonopt)
|
||||
optind = first_nonopt;
|
||||
return EOF;
|
||||
}
|
||||
|
||||
/* If we have come to a non-option and did not permute it,
|
||||
either stop the scan or describe it to the caller and pass it by. */
|
||||
|
||||
if ((argv[optind][0] != '-' || argv[optind][1] == '\0'))
|
||||
{
|
||||
if (ordering == REQUIRE_ORDER)
|
||||
return EOF;
|
||||
optarg = argv[optind++];
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* We have found another option-ARGV-element.
|
||||
Skip the initial punctuation. */
|
||||
|
||||
nextchar = (argv[optind] + 1
|
||||
+ (longopts != NULL && argv[optind][1] == '-'));
|
||||
}
|
||||
|
||||
/* Decode the current option-ARGV-element. */
|
||||
|
||||
/* Check whether the ARGV-element is a long option.
|
||||
|
||||
If long_only and the ARGV-element has the form "-f", where f is
|
||||
a valid short option, don't consider it an abbreviated form of
|
||||
a long option that starts with f. Otherwise there would be no
|
||||
way to give the -f short option.
|
||||
|
||||
On the other hand, if there's a long option "fubar" and
|
||||
the ARGV-element is "-fu", do consider that an abbreviation of
|
||||
the long option, just like "--fu", and not "-f" with arg "u".
|
||||
|
||||
This distinction seems to be the most useful approach. */
|
||||
|
||||
if (longopts != NULL
|
||||
&& (argv[optind][1] == '-'
|
||||
|| (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
|
||||
{
|
||||
char *nameend;
|
||||
const struct option *p;
|
||||
const struct option *pfound = NULL;
|
||||
int exact = 0;
|
||||
int ambig = 0;
|
||||
int indfound = 0;
|
||||
int option_index;
|
||||
|
||||
for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
|
||||
/* Do nothing. */ ;
|
||||
|
||||
/* Test all long options for either exact match
|
||||
or abbreviated matches. */
|
||||
for (p = longopts, option_index = 0; p->name; p++, option_index++)
|
||||
if (!strncmp (p->name, nextchar, nameend - nextchar))
|
||||
{
|
||||
if (nameend - nextchar == (int) strlen (p->name))
|
||||
{
|
||||
/* Exact match found. */
|
||||
pfound = p;
|
||||
indfound = option_index;
|
||||
exact = 1;
|
||||
break;
|
||||
}
|
||||
else if (pfound == NULL)
|
||||
{
|
||||
/* First nonexact match found. */
|
||||
pfound = p;
|
||||
indfound = option_index;
|
||||
}
|
||||
else
|
||||
/* Second or later nonexact match found. */
|
||||
ambig = 1;
|
||||
}
|
||||
|
||||
if (ambig && !exact)
|
||||
{
|
||||
if (opterr)
|
||||
fprintf (stderr, "%s: option `%s' is ambiguous\n",
|
||||
argv[0], argv[optind]);
|
||||
nextchar += strlen (nextchar);
|
||||
optind++;
|
||||
return '?';
|
||||
}
|
||||
|
||||
if (pfound != NULL)
|
||||
{
|
||||
option_index = indfound;
|
||||
optind++;
|
||||
if (*nameend)
|
||||
{
|
||||
/* Don't test has_arg with >, because some C compilers don't
|
||||
allow it to be used on enums. */
|
||||
if (pfound->has_arg)
|
||||
optarg = nameend + 1;
|
||||
else
|
||||
{
|
||||
if (opterr)
|
||||
{
|
||||
if (argv[optind - 1][1] == '-')
|
||||
/* --option */
|
||||
fprintf (stderr,
|
||||
"%s: option `--%s' doesn't allow an argument\n",
|
||||
argv[0], pfound->name);
|
||||
else
|
||||
/* +option or -option */
|
||||
fprintf (stderr,
|
||||
"%s: option `%c%s' doesn't allow an argument\n",
|
||||
argv[0], argv[optind - 1][0], pfound->name);
|
||||
}
|
||||
nextchar += strlen (nextchar);
|
||||
return '?';
|
||||
}
|
||||
}
|
||||
else if (pfound->has_arg == 1)
|
||||
{
|
||||
if (optind < argc)
|
||||
optarg = argv[optind++];
|
||||
else
|
||||
{
|
||||
if (opterr)
|
||||
fprintf (stderr, "%s: option `%s' requires an argument\n",
|
||||
argv[0], argv[optind - 1]);
|
||||
nextchar += strlen (nextchar);
|
||||
return optstring[0] == ':' ? ':' : '?';
|
||||
}
|
||||
}
|
||||
nextchar += strlen (nextchar);
|
||||
if (longind != NULL)
|
||||
*longind = option_index;
|
||||
if (pfound->flag)
|
||||
{
|
||||
*(pfound->flag) = pfound->val;
|
||||
return 0;
|
||||
}
|
||||
return pfound->val;
|
||||
}
|
||||
|
||||
/* Can't find it as a long option. If this is not getopt_long_only,
|
||||
or the option starts with '--' or is not a valid short
|
||||
option, then it's an error.
|
||||
Otherwise interpret it as a short option. */
|
||||
if (!long_only || argv[optind][1] == '-'
|
||||
|| my_index (optstring, *nextchar) == NULL)
|
||||
{
|
||||
if (opterr)
|
||||
{
|
||||
if (argv[optind][1] == '-')
|
||||
/* --option */
|
||||
fprintf (stderr, "%s: unrecognized option `--%s'\n",
|
||||
argv[0], nextchar);
|
||||
else
|
||||
/* +option or -option */
|
||||
fprintf (stderr, "%s: unrecognized option `%c%s'\n",
|
||||
argv[0], argv[optind][0], nextchar);
|
||||
}
|
||||
nextchar = (char *) "";
|
||||
optind++;
|
||||
return '?';
|
||||
}
|
||||
}
|
||||
|
||||
/* Look at and handle the next short option-character. */
|
||||
|
||||
{
|
||||
char c = *nextchar++;
|
||||
char *temp = my_index (optstring, c);
|
||||
|
||||
/* Increment `optind' when we start to process its last character. */
|
||||
if (*nextchar == '\0')
|
||||
++optind;
|
||||
|
||||
if (temp == NULL || c == ':')
|
||||
{
|
||||
if (opterr)
|
||||
{
|
||||
if (posixly_correct)
|
||||
/* 1003.2 specifies the format of this message. */
|
||||
fprintf (stderr, "%s: illegal option -- %c\n", argv[0], c);
|
||||
else
|
||||
fprintf (stderr, "%s: invalid option -- %c\n", argv[0], c);
|
||||
}
|
||||
optopt = c;
|
||||
return '?';
|
||||
}
|
||||
if (temp[1] == ':')
|
||||
{
|
||||
if (temp[2] == ':')
|
||||
{
|
||||
/* This is an option that accepts an argument optionally. */
|
||||
if (*nextchar != '\0')
|
||||
{
|
||||
optarg = nextchar;
|
||||
optind++;
|
||||
}
|
||||
else
|
||||
optarg = NULL;
|
||||
nextchar = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* This is an option that requires an argument. */
|
||||
if (*nextchar != '\0')
|
||||
{
|
||||
optarg = nextchar;
|
||||
/* If we end this ARGV-element by taking the rest as an arg,
|
||||
we must advance to the next element now. */
|
||||
optind++;
|
||||
}
|
||||
else if (optind == argc)
|
||||
{
|
||||
if (opterr)
|
||||
{
|
||||
/* 1003.2 specifies the format of this message. */
|
||||
fprintf (stderr, "%s: option requires an argument -- %c\n",
|
||||
argv[0], c);
|
||||
}
|
||||
optopt = c;
|
||||
if (optstring[0] == ':')
|
||||
c = ':';
|
||||
else
|
||||
c = '?';
|
||||
}
|
||||
else
|
||||
/* We already incremented `optind' once;
|
||||
increment it again when taking next ARGV-elt as argument. */
|
||||
optarg = argv[optind++];
|
||||
nextchar = NULL;
|
||||
}
|
||||
}
|
||||
return c;
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
getopt (argc, argv, optstring)
|
||||
int argc;
|
||||
char *const *argv;
|
||||
const char *optstring;
|
||||
{
|
||||
return _getopt_internal (argc, argv, optstring,
|
||||
(const struct option *) 0,
|
||||
(int *) 0,
|
||||
0);
|
||||
}
|
||||
|
||||
#endif /* _LIBC or not __GNU_LIBRARY__. */
|
||||
|
||||
#ifdef TEST
|
||||
|
||||
/* Compile with -DTEST to make an executable for use in testing
|
||||
the above definition of `getopt'. */
|
||||
|
||||
int
|
||||
main (argc, argv)
|
||||
int argc;
|
||||
char **argv;
|
||||
{
|
||||
int c;
|
||||
int digit_optind = 0;
|
||||
|
||||
while (1)
|
||||
{
|
||||
int this_option_optind = optind ? optind : 1;
|
||||
|
||||
c = getopt (argc, argv, "abc:d:0123456789");
|
||||
if (c == EOF)
|
||||
break;
|
||||
|
||||
switch (c)
|
||||
{
|
||||
case '0':
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
case '4':
|
||||
case '5':
|
||||
case '6':
|
||||
case '7':
|
||||
case '8':
|
||||
case '9':
|
||||
if (digit_optind != 0 && digit_optind != this_option_optind)
|
||||
printf ("digits occur in two different argv-elements.\n");
|
||||
digit_optind = this_option_optind;
|
||||
printf ("option %c\n", c);
|
||||
break;
|
||||
|
||||
case 'a':
|
||||
printf ("option a\n");
|
||||
break;
|
||||
|
||||
case 'b':
|
||||
printf ("option b\n");
|
||||
break;
|
||||
|
||||
case 'c':
|
||||
printf ("option c with value `%s'\n", optarg);
|
||||
break;
|
||||
|
||||
case '?':
|
||||
break;
|
||||
|
||||
default:
|
||||
printf ("?? getopt returned character code 0%o ??\n", c);
|
||||
}
|
||||
}
|
||||
|
||||
if (optind < argc)
|
||||
{
|
||||
printf ("non-option ARGV-elements: ");
|
||||
while (optind < argc)
|
||||
printf ("%s ", argv[optind++]);
|
||||
printf ("\n");
|
||||
}
|
||||
|
||||
exit (0);
|
||||
}
|
||||
|
||||
#endif /* TEST */
|
|
@ -1,132 +0,0 @@
|
|||
/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc. See LICENSE. */
|
||||
/* Declarations for getopt.
|
||||
Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the
|
||||
Free Software Foundation; either version 2, or (at your option) any
|
||||
later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||
|
||||
/* $CVSid: @(#)getopt.h 1.7 94/09/21 $ */
|
||||
|
||||
#ifndef _GETOPT_H
|
||||
#define _GETOPT_H 1
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* For communication from `getopt' to the caller.
|
||||
When `getopt' finds an option that takes an argument,
|
||||
the argument value is returned here.
|
||||
Also, when `ordering' is RETURN_IN_ORDER,
|
||||
each non-option ARGV-element is returned here. */
|
||||
|
||||
extern char *optarg;
|
||||
|
||||
/* Index in ARGV of the next element to be scanned.
|
||||
This is used for communication to and from the caller
|
||||
and for communication between successive calls to `getopt'.
|
||||
|
||||
On entry to `getopt', zero means this is the first call; initialize.
|
||||
|
||||
When `getopt' returns EOF, this is the index of the first of the
|
||||
non-option elements that the caller should itself scan.
|
||||
|
||||
Otherwise, `optind' communicates from one call to the next
|
||||
how much of ARGV has been scanned so far. */
|
||||
|
||||
extern int optind;
|
||||
|
||||
/* Callers store zero here to inhibit the error message `getopt' prints
|
||||
for unrecognized options. */
|
||||
|
||||
extern int opterr;
|
||||
|
||||
/* Set to an option character which was unrecognized. */
|
||||
|
||||
extern int optopt;
|
||||
|
||||
/* Describe the long-named options requested by the application.
|
||||
The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
|
||||
of `struct option' terminated by an element containing a name which is
|
||||
zero.
|
||||
|
||||
The field `has_arg' is:
|
||||
no_argument (or 0) if the option does not take an argument,
|
||||
required_argument (or 1) if the option requires an argument,
|
||||
optional_argument (or 2) if the option takes an optional argument.
|
||||
|
||||
If the field `flag' is not NULL, it points to a variable that is set
|
||||
to the value given in the field `val' when the option is found, but
|
||||
left unchanged if the option is not found.
|
||||
|
||||
To have a long-named option do something other than set an `int' to
|
||||
a compiled-in constant, such as set a value from `optarg', set the
|
||||
option's `flag' field to zero and its `val' field to a nonzero
|
||||
value (the equivalent single-letter option character, if there is
|
||||
one). For long options that have a zero `flag' field, `getopt'
|
||||
returns the contents of the `val' field. */
|
||||
|
||||
struct option
|
||||
{
|
||||
#if __STDC__
|
||||
const char *name;
|
||||
#else
|
||||
char *name;
|
||||
#endif
|
||||
/* has_arg can't be an enum because some compilers complain about
|
||||
type mismatches in all the code that assumes it is an int. */
|
||||
int has_arg;
|
||||
int *flag;
|
||||
int val;
|
||||
};
|
||||
|
||||
/* Names for the values of the `has_arg' field of `struct option'. */
|
||||
|
||||
#define no_argument 0
|
||||
#define required_argument 1
|
||||
#define optional_argument 2
|
||||
|
||||
#if __STDC__
|
||||
#if defined(__GNU_LIBRARY__)
|
||||
/* Many other libraries have conflicting prototypes for getopt, with
|
||||
differences in the consts, in stdlib.h. To avoid compilation
|
||||
errors, only prototype getopt for the GNU C library. */
|
||||
extern int getopt (int argc, char *const *argv, const char *shortopts);
|
||||
#else /* not __GNU_LIBRARY__ */
|
||||
extern int getopt ();
|
||||
#endif /* not __GNU_LIBRARY__ */
|
||||
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
|
||||
const struct option *longopts, int *longind);
|
||||
extern int getopt_long_only (int argc, char *const *argv,
|
||||
const char *shortopts,
|
||||
const struct option *longopts, int *longind);
|
||||
|
||||
/* Internal only. Users should not call this directly. */
|
||||
extern int _getopt_internal (int argc, char *const *argv,
|
||||
const char *shortopts,
|
||||
const struct option *longopts, int *longind,
|
||||
int long_only);
|
||||
#else /* not __STDC__ */
|
||||
extern int getopt ();
|
||||
extern int getopt_long ();
|
||||
extern int getopt_long_only ();
|
||||
|
||||
extern int _getopt_internal ();
|
||||
#endif /* not __STDC__ */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _GETOPT_H */
|
|
@ -1,189 +0,0 @@
|
|||
/* Copyright (c) 2017 - 2021 LiteSpeed Technologies Inc. See LICENSE. */
|
||||
/* getopt_long and getopt_long_only entry points for GNU getopt.
|
||||
Copyright (C) 1987, 88, 89, 90, 91, 92, 1993
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the
|
||||
Free Software Foundation; either version 2, or (at your option) any
|
||||
later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#if defined (emacs) || defined (CONFIG_BROKETS)
|
||||
/* We use <config.h> instead of "config.h" so that a compilation
|
||||
using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
|
||||
(which it would do because it found this file in $srcdir). */
|
||||
#include <config.h>
|
||||
#else
|
||||
#include "config.h"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#pragma warning(disable:4131)
|
||||
#include "getopt.h"
|
||||
|
||||
#ifndef __STDC__
|
||||
/* This is a separate conditional since some stdc systems
|
||||
reject `defined (const)'. */
|
||||
#ifndef const
|
||||
#define const
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
/* Comment out all this code if we are using the GNU C Library, and are not
|
||||
actually compiling the library itself. This code is part of the GNU C
|
||||
Library, but also included in many other GNU distributions. Compiling
|
||||
and linking in this code is a waste when using the GNU C library
|
||||
(especially if it is a shared library). Rather than having every GNU
|
||||
program understand `configure --with-gnu-libc' and omit the object files,
|
||||
it is simpler to just do this in the source for each such file. */
|
||||
|
||||
#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
|
||||
|
||||
|
||||
/* This needs to come after some library #include
|
||||
to get __GNU_LIBRARY__ defined. */
|
||||
#ifdef __GNU_LIBRARY__
|
||||
#include <stdlib.h>
|
||||
#else
|
||||
char *getenv ();
|
||||
#endif
|
||||
|
||||
#ifndef NULL
|
||||
#define NULL 0
|
||||
#endif
|
||||
|
||||
int
|
||||
getopt_long (argc, argv, options, long_options, opt_index)
|
||||
int argc;
|
||||
char *const *argv;
|
||||
const char *options;
|
||||
const struct option *long_options;
|
||||
int *opt_index;
|
||||
{
|
||||
return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
|
||||
}
|
||||
|
||||
/* Like getopt_long, but '-' as well as '--' can indicate a long option.
|
||||
If an option that starts with '-' (not '--') doesn't match a long option,
|
||||
but does match a short option, it is parsed as a short option
|
||||
instead. */
|
||||
|
||||
int
|
||||
getopt_long_only (argc, argv, options, long_options, opt_index)
|
||||
int argc;
|
||||
char *const *argv;
|
||||
const char *options;
|
||||
const struct option *long_options;
|
||||
int *opt_index;
|
||||
{
|
||||
return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
|
||||
}
|
||||
|
||||
|
||||
#endif /* _LIBC or not __GNU_LIBRARY__. */
|
||||
|
||||
#ifdef TEST
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
int
|
||||
main (argc, argv)
|
||||
int argc;
|
||||
char **argv;
|
||||
{
|
||||
int c;
|
||||
int digit_optind = 0;
|
||||
|
||||
while (1)
|
||||
{
|
||||
int this_option_optind = optind ? optind : 1;
|
||||
int option_index = 0;
|
||||
static struct option long_options[] =
|
||||
{
|
||||
{"add", 1, 0, 0},
|
||||
{"append", 0, 0, 0},
|
||||
{"delete", 1, 0, 0},
|
||||
{"verbose", 0, 0, 0},
|
||||
{"create", 0, 0, 0},
|
||||
{"file", 1, 0, 0},
|
||||
{0, 0, 0, 0}
|
||||
};
|
||||
|
||||
c = getopt_long (argc, argv, "abc:d:0123456789",
|
||||
long_options, &option_index);
|
||||
if (c == EOF)
|
||||
break;
|
||||
|
||||
switch (c)
|
||||
{
|
||||
case 0:
|
||||
printf ("option %s", long_options[option_index].name);
|
||||
if (optarg)
|
||||
printf (" with arg %s", optarg);
|
||||
printf ("\n");
|
||||
break;
|
||||
|
||||
case '0':
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
case '4':
|
||||
case '5':
|
||||
case '6':
|
||||
case '7':
|
||||
case '8':
|
||||
case '9':
|
||||
if (digit_optind != 0 && digit_optind != this_option_optind)
|
||||
printf ("digits occur in two different argv-elements.\n");
|
||||
digit_optind = this_option_optind;
|
||||
printf ("option %c\n", c);
|
||||
break;
|
||||
|
||||
case 'a':
|
||||
printf ("option a\n");
|
||||
break;
|
||||
|
||||
case 'b':
|
||||
printf ("option b\n");
|
||||
break;
|
||||
|
||||
case 'c':
|
||||
printf ("option c with value `%s'\n", optarg);
|
||||
break;
|
||||
|
||||
case 'd':
|
||||
printf ("option d with value `%s'\n", optarg);
|
||||
break;
|
||||
|
||||
case '?':
|
||||
break;
|
||||
|
||||
default:
|
||||
printf ("?? getopt returned character code 0%o ??\n", c);
|
||||
}
|
||||
}
|
||||
|
||||
if (optind < argc)
|
||||
{
|
||||
printf ("non-option ARGV-elements: ");
|
||||
while (optind < argc)
|
||||
printf ("%s ", argv[optind++]);
|
||||
printf ("\n");
|
||||
}
|
||||
|
||||
exit (0);
|
||||
}
|
||||
|
||||
#endif /* TEST */
|
Loading…
Reference in New Issue