diff options
Diffstat (limited to 'ports/binn')
| -rw-r--r-- | ports/binn/0001_fix_uwp.patch | 65 | ||||
| -rw-r--r-- | ports/binn/CONTROL | 3 |
2 files changed, 15 insertions, 53 deletions
diff --git a/ports/binn/0001_fix_uwp.patch b/ports/binn/0001_fix_uwp.patch index c4f0b6658..f43cdd2c8 100644 --- a/ports/binn/0001_fix_uwp.patch +++ b/ports/binn/0001_fix_uwp.patch @@ -2,27 +2,22 @@ diff --git a/src/binn.c b/src/binn.c index ef32f35..d12d473 100644 --- a/src/binn.c +++ b/src/binn.c -@@ -142,8 +142,8 @@ BINN_PRIVATE void copy_be64(u64 *pdest, u64 *psource) { +@@ -142,8 +142,14 @@ BINN_PRIVATE void copy_be64(u64 *pdest, u64 *psource) { /***************************************************************************/ #ifndef WIN32 --#define stricmp strcasecmp --#define strnicmp strncasecmp -+#define _stricmp strcasecmp -+#define _strnicmp strncasecmp + #define stricmp strcasecmp + #define strnicmp strncasecmp ++#define sprintf_s(b, n, ...) sprintf(b, __VA_ARGS__) ++#define strcpy_s(b, n, s) strcpy(b, s) ++#else ++#define stricmp _stricmp ++#define strnicmp _strnicmp ++#define strdup _strdup #endif BINN_PRIVATE BOOL IsValidBinnHeader(void *pbuf, int *ptype, int *pcount, int *psize, int *pheadersize); -@@ -614,7 +614,7 @@ BINN_PRIVATE unsigned char * SearchForKey(unsigned char *p, int header_size, int - if (p > plimit) break; - // Compare if the strings are equal. - if (len > 0) { -- if (strnicmp((char*)p, key, len) == 0) { // note that there is no null terminator here -+ if (_strnicmp((char*)p, key, len) == 0) { // note that there is no null terminator here - if (keylen == len) { - p += len; - return p; -@@ -1582,6 +1582,7 @@ BINN_PRIVATE BOOL binn_read_pair(int expected_type, void *ptr, int pos, int *pid +@@ -1582,6 +1588,7 @@ BINN_PRIVATE BOOL binn_read_pair(int expected_type, void *ptr, int pos, int *pid base = p; plimit = p + size - 1; p += header_size; @@ -30,40 +25,16 @@ index ef32f35..d12d473 100644 for (i = 0; i < count; i++) { switch (type) { -@@ -3147,15 +3148,15 @@ BINN_PRIVATE BOOL is_bool_str(char *str, BOOL *pbool) { - - if (str == NULL || pbool == NULL) return FALSE; - -- if (stricmp(str, "true") == 0) goto loc_true; -- if (stricmp(str, "yes") == 0) goto loc_true; -- if (stricmp(str, "on") == 0) goto loc_true; -- //if (stricmp(str, "1") == 0) goto loc_true; -+ if (_stricmp(str, "true") == 0) goto loc_true; -+ if (_stricmp(str, "yes") == 0) goto loc_true; -+ if (_stricmp(str, "on") == 0) goto loc_true; -+ //if (_stricmp(str, "1") == 0) goto loc_true; - -- if (stricmp(str, "false") == 0) goto loc_false; -- if (stricmp(str, "no") == 0) goto loc_false; -- if (stricmp(str, "off") == 0) goto loc_false; -- //if (stricmp(str, "0") == 0) goto loc_false; -+ if (_stricmp(str, "false") == 0) goto loc_false; -+ if (_stricmp(str, "no") == 0) goto loc_false; -+ if (_stricmp(str, "off") == 0) goto loc_false; -+ //if (_stricmp(str, "0") == 0) goto loc_false; - - if (is_integer(str)) { - vint = atoi64(str); -@@ -3333,7 +3334,7 @@ char * APIENTRY binn_get_str(binn *value) { +@@ -3333,7 +3340,7 @@ char * APIENTRY binn_get_str(binn *value) { if (type_family(value->type) == BINN_FAMILY_INT) { if (copy_int_value(value->ptr, &vint, value->type, BINN_INT64) == FALSE) return NULL; - sprintf(buf, "%" INT64_FORMAT, vint); -+ sprintf_s(buf, "%" INT64_FORMAT, vint); ++ sprintf_s(buf, sizeof buf, "%" INT64_FORMAT, vint); goto loc_convert_value; } -@@ -3341,15 +3342,15 @@ char * APIENTRY binn_get_str(binn *value) { +@@ -3341,14 +3348,14 @@ char * APIENTRY binn_get_str(binn *value) { case BINN_FLOAT: value->vdouble = value->vfloat; case BINN_DOUBLE: @@ -81,13 +52,3 @@ index ef32f35..d12d473 100644 + strcpy_s(buf, sizeof buf, "false"); goto loc_convert_value; } - -@@ -3358,7 +3359,7 @@ char * APIENTRY binn_get_str(binn *value) { - loc_convert_value: - - //value->vint64 = 0; -- value->ptr = strdup(buf); -+ value->ptr = _strdup(buf); - if (value->ptr == NULL) return NULL; - value->freefn = free; - value->type = BINN_STRING; diff --git a/ports/binn/CONTROL b/ports/binn/CONTROL index f0c5dc45a..0e0cc1ac4 100644 --- a/ports/binn/CONTROL +++ b/ports/binn/CONTROL @@ -1,3 +1,4 @@ Source: binn Version: 2.0 -Description: Binn is a binary data serialization format designed to be compact, fast and easy to use.
\ No newline at end of file +Port-Version: 1 +Description: Binn is a binary data serialization format designed to be compact, fast and easy to use. |