sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More FTP bugfixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3665 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-06-03 20:27:30 +00:00
parent 9ac8ffc564
commit f0d063dd93
2 changed files with 66 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configs/olimex-lpc1766stk/README.txt
View File

@ -787,12 +787,14 @@ Where <subdir> is one of the following:
to that it will only work as a "built-in" program that can be run from
NSH when CONFIG_NSH_BUILTIN_APPS is defined.
From NSH, the startup command line is then:
From NSH, the startup command sequence is then:
ftpc xx.xx.xx.xx[:pp]
mount -t vfat /dev/mmcsd0 /tmp # Mount the SD card at /tmp
cd /tmp # cd into the /tmp directory
ftpc xx.xx.xx.xx[:pp] # Start the FTP client
where xx.xx.xx.xx is the IP address of the FTP server and pp is an
optional port number.
optional port number (default is the standard FTP port number 21).
hidkbd:
This configuration directory, performs a simple test of the USB host

85
lib/stdio/lib_sscanf.c
View File

@ -100,8 +100,7 @@ int sscanf(const char *buf, const char *fmt, ...)
count = vsscanf((char*)buf, fmt, ap);
va_end(ap);
return count;
} /* end sscanf */
}
/****************************************************************************
* Function: vsscanf
@ -129,7 +128,9 @@ int vsscanf(char *buf, const char *s, va_list ap)
/* Skip over white space */
while (isspace(*s))
s++;
{
s++;
}
/* Check for a conversion specifier */
@ -144,19 +145,26 @@ int vsscanf(char *buf, const char *s, va_list ap)
lvdbg("vsscanf: Processing %c\n", *s);
if (strchr("dibouxcsefg%", *s))
break;
{
break;
}
if (*s == '*')
noassign = 1;
{
noassign = 1;
}
else if (*s == 'l' || *s == 'L')
lflag = 1;
else if (*s >= '1' && *s <= '9') {
for (tc = s; isdigit(*s); s++);
strncpy(tmp, tc, s - tc);
tmp[s - tc] = '\0';
width = atoi(tmp);
/* atob(&width, tmp, 10); */
s--;
}
{
lflag = 1;
}
else if (*s >= '1' && *s <= '9')
{
for (tc = s; isdigit(*s); s++);
strncpy(tmp, tc, s - tc);
tmp[s - tc] = '\0';
width = atoi(tmp);
s--;
}
}
/* Process %s: String conversion */
@ -166,11 +174,15 @@ int vsscanf(char *buf, const char *s, va_list ap)
lvdbg("vsscanf: Performing string conversion\n");
while (isspace(*buf))
buf++;
{
buf++;
}
if (!width)
{
width = strcspn(buf, spaces);
}
if (!noassign)
{
tv = va_arg(ap, char*);
@ -187,7 +199,10 @@ int vsscanf(char *buf, const char *s, va_list ap)
lvdbg("vsscanf: Performing character conversion\n");
if (!width)
width = 1;
{
width = 1;
}
if (!noassign)
{
tv = va_arg(ap, char*);
@ -206,20 +221,30 @@ int vsscanf(char *buf, const char *s, va_list ap)
/* Skip over any white space before the integer string */
while (isspace(*buf))
buf++;
{
buf++;
}
/* The base of the integer conversion depends on the specific
* conversion specification.
*/
if (*s == 'd' || *s == 'u')
base = 10;
{
base = 10;
}
else if (*s == 'x')
base = 16;
{
base = 16;
}
else if (*s == 'o')
base = 8;
{
base = 8;
}
else if (*s == 'b')
base = 2;
{
base = 2;
}
/* Copy the integer string into a temporary working buffer. */
@ -234,6 +259,7 @@ int vsscanf(char *buf, const char *s, va_list ap)
width = strchr(buf, *(s + 1)) - buf;
}
}
strncpy(tmp, buf, width);
tmp[width] = '\0';
@ -290,6 +316,7 @@ int vsscanf(char *buf, const char *s, va_list ap)
width = strchr(buf, *(s + 1)) - buf;
}
}
strncpy(tmp, buf, width);
tmp[width] = '\0';
buf += width;
@ -333,6 +360,7 @@ int vsscanf(char *buf, const char *s, va_list ap)
{
count++;
}
width = noassign = lflag = 0;
s++;
}
@ -342,12 +370,21 @@ int vsscanf(char *buf, const char *s, va_list ap)
else
{
while (isspace(*buf))
buf++;
{
buf++;
}
if (*s != *buf)
break;
{
break;
}
else
s++, buf++;
{
s++;
buf++;
}
}
}
return count;
}