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

examples: ftpc: Fix style violations in ftpc_main.c

Browse Source 
Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
This commit is contained in:
Masayuki Ishikawa 2020-05-15 08:41:09 +09:00 committed by patacongo
parent 9a90b65355
commit ba3baa57a5
1 changed files with 61 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
examples/ftpc/ftpc_main.c
View File

@ -67,7 +67,7 @@
#endif #endif
/**************************************************************************** /****************************************************************************
* Public Types * Private Types
****************************************************************************/ ****************************************************************************/
struct cmdmap_s struct cmdmap_s
@ -138,6 +138,7 @@ static int cmd_lhelp(SESSION handle, int argc, char **argv)
printf(" %s\n", ptr->cmd); printf(" %s\n", ptr->cmd);
} }
} }
return OK; return OK;
} }
@ -200,7 +201,9 @@ char *ftpc_argument(char **saveptr)
} }
else else
{ {
/* No, then any of the usual terminators will terminate the argument */ /* No, then any of the usual terminators
* will terminate the argument
*/
term = g_delim; term = g_delim;
} }
@ -225,7 +228,6 @@ char *ftpc_argument(char **saveptr)
/* Save the pointer where we left off */ /* Save the pointer where we left off */
*saveptr = pend; *saveptr = pend;
} }
/* Return the beginning of the token. */ /* Return the beginning of the token. */
@ -239,64 +241,65 @@ char *ftpc_argument(char **saveptr)
static int ftpc_execute(SESSION handle, int argc, char *argv[]) static int ftpc_execute(SESSION handle, int argc, char *argv[])
{ {
const struct cmdmap_s *cmdmap; const struct cmdmap_s *cmdmap;
const char *cmd; const char *cmd;
cmd_t handler = cmd_lunrecognized; cmd_t handler = cmd_lunrecognized;
int ret; int ret;
/* The form of argv is: /* The form of argv is:
* *
* argv[0]: The command name. This is argv[0] when the arguments * argv[0]: The command name. This is argv[0] when the arguments
* are, finally, received by the command handler * are, finally, received by the command handler
* argv[1]: The beginning of argument (up to FTPC_MAX_ARGUMENTS) * argv[1]: The beginning of argument (up to FTPC_MAX_ARGUMENTS)
* argv[argc]: NULL terminating pointer * argv[argc]: NULL terminating pointer
*/ */
cmd = argv[0]; cmd = argv[0];
/* See if the command is one that we understand */ /* See if the command is one that we understand */
for (cmdmap = g_cmdmap; cmdmap->cmd; cmdmap++) for (cmdmap = g_cmdmap; cmdmap->cmd; cmdmap++)
{ {
if (strcmp(cmdmap->cmd, cmd) == 0) if (strcmp(cmdmap->cmd, cmd) == 0)
{ {
/* Check if a valid number of arguments was provided. We /* Check if a valid number of arguments was provided. We
* do this simple, imperfect checking here so that it does * do this simple, imperfect checking here so that it does
* not have to be performed in each command. * not have to be performed in each command.
*/ */
if (argc < cmdmap->minargs) if (argc < cmdmap->minargs)
{ {
/* Fewer than the minimum number were provided */ /* Fewer than the minimum number were provided */
printf("Too few arguments for '%s'\n", cmd); printf("Too few arguments for '%s'\n", cmd);
return ERROR; return ERROR;
} }
else if (argc > cmdmap->maxargs) else if (argc > cmdmap->maxargs)
{ {
/* More than the maximum number were provided */ /* More than the maximum number were provided */
printf("Too many arguments for '%s'\n", cmd); printf("Too many arguments for '%s'\n", cmd);
return ERROR; return ERROR;
} }
else else
{ {
/* A valid number of arguments were provided (this does /* A valid number of arguments were provided (this does
* not mean they are right). * not mean they are right).
*/ */
handler = cmdmap->handler; handler = cmdmap->handler;
break; break;
} }
} }
} }
ret = handler(handle, argc, argv); ret = handler(handle, argc, argv);
if (ret < 0) if (ret < 0)
{ {
printf("%s failed: %d\n", cmd, errno); printf("%s failed: %d\n", cmd, errno);
} }
return ret;
return ret;
} }
/**************************************************************************** /****************************************************************************
@ -305,7 +308,7 @@ static int ftpc_execute(SESSION handle, int argc, char *argv[])
int ftpc_parse(SESSION handle, char *cmdline) int ftpc_parse(SESSION handle, char *cmdline)
{ {
FAR char *argv[FTPC_MAX_ARGUMENTS+1]; FAR char *argv[FTPC_MAX_ARGUMENTS + 1];
FAR char *saveptr; FAR char *saveptr;
FAR char *cmd; FAR char *cmd;
int argc; int argc;
@ -342,6 +345,7 @@ int ftpc_parse(SESSION handle, char *cmdline)
break; break;
} }
} }
argv[argc] = NULL; argv[argc] = NULL;
/* Check if the maximum number of arguments was exceeded */ /* Check if the maximum number of arguments was exceeded */
@ -384,7 +388,8 @@ int main(int argc, FAR char *argv[])
printf("Usage:\n"); printf("Usage:\n");
printf(" %s xx:xx:xx:xx:xx:xx:xx:xx [pp]\n", argv[0]); printf(" %s xx:xx:xx:xx:xx:xx:xx:xx [pp]\n", argv[0]);
printf("Where\n"); printf("Where\n");
printf(" xx:xx:xx:xx:xx:xx:xx:xx is the IP address of the FTP server\n"); printf(" xx:xx:xx:xx:xx:xx:xx:xx is "
"the IP address of the FTP server\n");
printf(" pp is option port to use with the FTP server\n"); printf(" pp is option port to use with the FTP server\n");
#else #else
printf("Usage:\n"); printf("Usage:\n");
@ -418,7 +423,7 @@ int main(int argc, FAR char *argv[])
if (ptr) if (ptr)
{ {
*ptr = '\0'; *ptr = '\0';
server.in4.sin_port = atoi(ptr+1); server.in4.sin_port = atoi(ptr + 1);
} }
server.in4.sin_family = AF_INET; server.in4.sin_family = AF_INET;
@ -453,7 +458,7 @@ int main(int argc, FAR char *argv[])
/* Then enter the command line parsing loop */ /* Then enter the command line parsing loop */
for (;;) for (; ; )
{ {
/* Display the prompt string */ /* Display the prompt string */