dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Fix bug in last sscanf change 

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5171 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-09-21 18:51:04 +00:00
parent e8f1a8bff9
commit 4a5f639e22
1 changed files with 64 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
nuttx/lib/stdio/lib_sscanf.c
View File

@ -79,6 +79,64 @@ int vsscanf(char *buf, const char *fmt, va_list ap);
static const char spaces[] = " \t\n\r\f\v";
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Function: findwidth
*
* Description:
* Try to figure out the width of the input data.
*
****************************************************************************/
static int findwidth(FAR const char *buf, FAR const char *fmt)
{
FAR const char *next = fmt + 1;
/* No... is there a space after the format? Or does the format string end
* here?
*/
if (isspace(*next) || *next == 0)
{
/* Use the input up until the first white space is encountered. */
return strcspn(buf, spaces);
}
/* No.. Another possibility is the the format character is followed by
* some recognizable delimiting value.
*/
if (*next != '%')
{
/* If so we will say that the string ends there if we can find that
* delimiter in the input string.
*/
FAR const char *ptr = strchr(buf, *next);
if (ptr)
{
return (int)(ptr - buf);
}
}
/* No... the format has not delimiter and is back-to-back with the next
* formats (or no is following by a delimiter that does not exist in the
* input string). At this point we just bail and Use the input up until
* the first white space is encountered.
*
* NOTE: This means that values from the following format may be
* concatenated with the first. This is a bug. We have no generic way of
* determining the width of the data if there is no fieldwith, no space
* separating the input, and no usable delimiter character.
*/
return strcspn(buf, spaces);
}
/****************************************************************************
* Private Variables
****************************************************************************/
@ -196,22 +254,9 @@ int vsscanf(FAR char *buf, FAR const char *fmt, va_list ap)
if (!width)
{
/* No... is there a space after the format? */
/* No... Guess a field width using some heuristics */
#if 0 /* Needs more thought */
if (isspace(*(s + 1)) || *(s + 1) == 0)
#endif
{
/* Use the input up until the first white space is
* encountered. NOTE: This means that values on the
* input line must be separated by whitespace or they
* will get combined! This is a bug. We have no good
* way of determining the width of the data if there
* is no field with and no space separating the input.
*/
width = strcspn(buf, spaces);
}
width = findwidth(buf, fmt);
}
if (!noassign)
@ -287,22 +332,9 @@ int vsscanf(FAR char *buf, FAR const char *fmt, va_list ap)
if (!width)
{
/* No... is there a space after the format? */
/* No... Guess a field width using some heuristics */
#if 0 /* Needs more thought */
if (isspace(*(s + 1)) || *(s + 1) == 0)
#endif
{
/* Use the input up until the first white space is
* encountered. NOTE: This means that values on the
* input line must be separated by whitespace or they
* will get combined! This is a bug. We have no good
* way of determining the width of the data if there
* is no field with and no space separating the input.
*/
width = strcspn(buf, spaces);
}
width = findwidth(buf, fmt);
}
/* Copy the numeric string into a temporary working buffer. */
@ -354,22 +386,9 @@ int vsscanf(FAR char *buf, FAR const char *fmt, va_list ap)
if (!width)
{
/* No... is there a space after the format? */
/* No... Guess a field width using some heuristics */
#if 0 /* Needs more thought */
if (isspace(*(s + 1)) || *(s + 1) == 0)
#endif
{
/* Use the input up until the first white space is
* encountered. NOTE: This means that values on the
* input line must be separated by whitespace or they
* will get combined! This is a bug. We have no good
* way of determining the width of the data if there
* is no field with and no space separating the input.
*/
width = strcspn(buf, spaces);
}
width = findwidth(buf, fmt);
}
/* Copy the real string into a temporary working buffer. */