caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gmio_stl: fix some cases where STL ascii format won't be detected

Browse Source 
New cases:
  * mixed-case <solid> token like Solid, SOLID, ...
  * <solid> token not followed by space char, like solid\n
This commit is contained in:
Hugues Delorme 2015-03-31 16:18:35 +02:00
parent f58b6e56b4
commit 45fd39dd7f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gmio_stl/stl_format.c
View File

@ -22,8 +22,8 @@
#include "../gmio_core/internal/byte_swap.h" #include "../gmio_core/internal/byte_swap.h"
#include "../gmio_core/internal/helper_stream.h" #include "../gmio_core/internal/helper_stream.h"
#include "../gmio_core/internal/min_max.h" #include "../gmio_core/internal/min_max.h"
#include "../gmio_core/internal/string_utils.h"
#include <ctype.h>
#include <string.h> #include <string.h>
enum { GMIO_FIXED_BUFFER_SIZE = 512 }; enum { GMIO_FIXED_BUFFER_SIZE = 512 };
@ -70,12 +70,13 @@ gmio_stl_format_t gmio_stl_get_format(gmio_stream_t *stream)
{ {
/* Skip spaces at beginning */ /* Skip spaces at beginning */
size_t pos = 0; size_t pos = 0;
while (pos < read_size && isspace(fixed_buffer[pos])) while (pos < read_size && gmio_clocale_isspace(fixed_buffer[pos]))
++pos; ++pos;
/* Next token (if exists) must match "solid " */ /* Next token (if exists) must match "solid\s" */
if (pos < GMIO_FIXED_BUFFER_SIZE if ((pos + 6) < read_size
&& strncmp(fixed_buffer + pos, "solid ", 6) == 0) && gmio_istarts_with(fixed_buffer + pos, "solid")
&& gmio_clocale_isspace(fixed_buffer[pos + 5]))
{ {
return GMIO_STL_ASCII_FORMAT; return GMIO_STL_ASCII_FORMAT;
} }