From 98b8fcff4f76e9707342a3b7d132955ba18b09c4 Mon Sep 17 00:00:00 2001 From: Jacques Germishuys Date: Tue, 29 Apr 2014 20:45:02 +0200 Subject: Build regex.c for Solaris. Added required defines for Solaris --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 704770b29..c506c4702 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,7 +168,7 @@ IF (ENABLE_TRACE STREQUAL "ON") ENDIF() # Include POSIX regex when it is required -IF(WIN32 OR AMIGA OR ANDROID) +IF(WIN32 OR AMIGA OR ANDROID OR CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)") INCLUDE_DIRECTORIES(deps/regex) SET(SRC_REGEX deps/regex/regex.c) ENDIF() @@ -290,6 +290,10 @@ IF (MSVC) ELSE () SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -Wall -Wextra ${CMAKE_C_FLAGS}") + IF (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)") + SET(CMAKE_C_FLAGS "-std=c99 -D_POSIX_C_SOURCE=200112L -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS ${CMAKE_C_FLAGS}") + ENDIF() + IF (WIN32 AND NOT CYGWIN) SET(CMAKE_C_FLAGS_DEBUG "-D_DEBUG") ENDIF () -- cgit v1.2.1 From 6b05240ceaf4df7bbb4806f6827f0314db6a5a91 Mon Sep 17 00:00:00 2001 From: Jacques Germishuys Date: Sun, 27 Apr 2014 19:44:20 +0200 Subject: strcasecmp is in --- src/common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common.h b/src/common.h index 9c8bdc18a..dd97a3099 100644 --- a/src/common.h +++ b/src/common.h @@ -44,6 +44,7 @@ #else # include +# include # ifdef GIT_THREADS # include # include -- cgit v1.2.1 From 183aa4f8317f5a64f1bc931551a342e6a93ce1c3 Mon Sep 17 00:00:00 2001 From: Jacques Germishuys Date: Wed, 30 Apr 2014 17:46:53 +0200 Subject: Check for NULL before passing it to vsnprintf --- src/config.c | 4 ++-- src/remote.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config.c b/src/config.c index b3168f735..16854c0c8 100644 --- a/src/config.c +++ b/src/config.c @@ -1144,7 +1144,7 @@ int git_config_parse_int64(int64_t *out, const char *value) } fail_parse: - giterr_set(GITERR_CONFIG, "Failed to parse '%s' as an integer", value); + giterr_set(GITERR_CONFIG, "Failed to parse '%s' as an integer", value ? value : "(null)"); return -1; } @@ -1164,7 +1164,7 @@ int git_config_parse_int32(int32_t *out, const char *value) return 0; fail_parse: - giterr_set(GITERR_CONFIG, "Failed to parse '%s' as a 32-bit integer", value); + giterr_set(GITERR_CONFIG, "Failed to parse '%s' as a 32-bit integer", value ? value : "(null)"); return -1; } diff --git a/src/remote.c b/src/remote.c index ea638e373..be7198a98 100644 --- a/src/remote.c +++ b/src/remote.c @@ -73,7 +73,7 @@ static int ensure_remote_name_is_valid(const char *name) if (!git_remote_is_valid_name(name)) { giterr_set( GITERR_CONFIG, - "'%s' is not a valid remote name.", name); + "'%s' is not a valid remote name.", name ? name : "(null)"); error = GIT_EINVALIDSPEC; } -- cgit v1.2.1