summaryrefslogtreecommitdiff
path: root/apps/nshlib/nsh_netcmds.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-06-05 14:08:26 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-06-05 14:08:26 +0000
commitab784567291b1925d616ea9b9d2577f42d2699a5 (patch)
tree7d4f4e1976f7a03adc136358ded5a2f866cf9285 /apps/nshlib/nsh_netcmds.c
parentb20e2a5a26d3c9bbbea0dbea71227085bb8a135a (diff)
downloadnuttx-ab784567291b1925d616ea9b9d2577f42d2699a5.tar.gz
nuttx-ab784567291b1925d616ea9b9d2577f42d2699a5.tar.bz2
nuttx-ab784567291b1925d616ea9b9d2577f42d2699a5.zip
More FTP bug fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3669 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/nshlib/nsh_netcmds.c')
-rw-r--r--apps/nshlib/nsh_netcmds.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c
index 6e210c020..8285da295 100644
--- a/apps/nshlib/nsh_netcmds.c
+++ b/apps/nshlib/nsh_netcmds.c
@@ -331,20 +331,28 @@ int tftpc_parseargs(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv,
return ERROR;
}
- /* There should be exactly on parameter left on the command-line */
+ /* There should be exactly one parameter left on the command-line */
if (optind == argc-1)
{
args->srcpath = argv[optind];
}
+
+ /* optind == argc means that there is nothing left on the command-line */
+
else if (optind >= argc)
{
- fmt = g_fmttoomanyargs;
+ fmt = g_fmtargrequired;
goto errout;
}
+
+ /* optind < argc-1 means that there are too many arguments on the
+ * command-line
+ */
+
else
{
- fmt = g_fmtargrequired;
+ fmt = g_fmttoomanyargs;
goto errout;
}