From b0326fb63170801353cbc4d53b80846381de82f4 Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周五, 08 11月 2013 02:14:38 +0800 Subject: [PATCH] Implement compose compound command functionality --- libscpi/src/utils.h | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/libscpi/src/utils.h b/libscpi/src/utils.h index b1e24a0..0969ce7 100644 --- a/libscpi/src/utils.h +++ b/libscpi/src/utils.h @@ -45,9 +45,13 @@ extern "C" { #endif +#if defined(__GNUC__) && (__GNUC__ >= 4) #define LOCAL __attribute__((visibility ("hidden"))) +#else + #define LOCAL +#endif - char * strnpbrk(const char *str, size_t size, const char *set) LOCAL; + const char * strnpbrk(const char *str, size_t size, const char *set) LOCAL; bool_t compareStr(const char * str1, size_t len1, const char * str2, size_t len2) LOCAL; size_t longToStr(int32_t val, char * str, size_t len) LOCAL; size_t doubleToStr(double val, char * str, size_t len) LOCAL; @@ -56,12 +60,19 @@ bool_t locateText(const char * str1, size_t len1, const char ** str2, size_t * len2) LOCAL; bool_t locateStr(const char * str1, size_t len1, const char ** str2, size_t * len2) LOCAL; size_t skipWhitespace(const char * cmd, size_t len) LOCAL; + size_t skipColon(const char * cmd, size_t len) LOCAL; bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len) LOCAL; + bool_t matchCommand(const char * pattern, const char * cmd, size_t len) LOCAL; + bool_t composeCompoundCommand(char * ptr_prev, size_t len_prev, char ** pptr, size_t * plen); #if !HAVE_STRNLEN size_t BSD_strnlen(const char *s, size_t maxlen); #endif +#if !HAVE_STRNCASECMP && !HAVE_STRNICMP + int OUR_strncasecmp(const char *s1, const char *s2, size_t n); +#endif + #define min(a, b) (((a) < (b)) ? (a) : (b)) #define max(a, b) (((a) > (b)) ? (a) : (b)) -- Gitblit v1.9.1