giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Shell: easier argument parsing

Browse Source
This commit is contained in:
Simon Duquennoy 2017-07-07 15:11:51 +02:00
parent 9ddae0c90f
commit 07b5373829
3 changed files with 67 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
apps/shell/shell-commands.c
View File

@ -73,21 +73,18 @@ echo_reply_handler(uip_ipaddr_t *source, uint8_t ttl, uint8_t *data, uint16_t da
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static static
PT_THREAD(cmd_ping(struct pt *pt, shell_output_func output, const char *args)) PT_THREAD(cmd_ping(struct pt *pt, shell_output_func output, char *args))
{ {
static uip_ipaddr_t remote_addr; static uip_ipaddr_t remote_addr;
static char *next_args;
static struct etimer timeout_timer; static struct etimer timeout_timer;
char *next_args;
PT_BEGIN(pt); PT_BEGIN(pt);
/* Isolate first argument */ SHELL_ARGS_INIT(args, next_args);
next_args = strchr(args, ' ');
if(next_args != NULL) {
*next_args = '\0';
next_args++;
}
/* Get argument (remote IPv6) */
SHELL_ARGS_NEXT(args, next_args);
if(uiplib_ipaddrconv(args, &remote_addr) == 0) { if(uiplib_ipaddrconv(args, &remote_addr) == 0) {
SHELL_OUTPUT(output, "Invalid IPv6: %s\n", args); SHELL_OUTPUT(output, "Invalid IPv6: %s\n", args);
PT_EXIT(pt); PT_EXIT(pt);
@ -153,13 +150,52 @@ PT_THREAD(cmd_log(struct pt *pt, shell_output_func output, const char *args))
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static static
PT_THREAD(cmd_help(struct pt *pt, shell_output_func output, const char *args)) PT_THREAD(cmd_log(struct pt *pt, shell_output_func output, char *args))
{ {
static int prev_level;
static int level;
char *next_args;
char *ptr;
PT_BEGIN(pt); PT_BEGIN(pt);
struct shell_command_t *cmd_ptr = shell_commands; SHELL_ARGS_INIT(args, next_args);
/* Get and parse argument */
SHELL_ARGS_NEXT(args, next_args);
level = (int)strtol(args, &ptr, 10);
if((level == 0 && args == ptr)
|| level < LOG_LEVEL_NONE || level > LOG_LEVEL_DBG) {
SHELL_OUTPUT(output, "Invalid argument: %s\n", args);
PT_EXIT(pt);
}
/* Set log level */
prev_level = log_get_level();
if(level != prev_level) {
log_set_level(level);
if(level >= LOG_LEVEL_DBG) {
tsch_log_init();
SHELL_OUTPUT(output, "TSCH logging started\n");
} else {
tsch_log_stop();
SHELL_OUTPUT(output, "TSCH logging stopped\n");
}
}
SHELL_OUTPUT(output, "Log level set to %u (%s)\n", level, log_level_to_str(level));
PT_END(pt);
}
/*---------------------------------------------------------------------------*/
static
PT_THREAD(cmd_help(struct pt *pt, shell_output_func output, char *args))
{
struct shell_command_t *cmd_ptr;
PT_BEGIN(pt);
SHELL_OUTPUT(output, "Available commands:\n"); SHELL_OUTPUT(output, "Available commands:\n");
cmd_ptr = shell_commands;
while(cmd_ptr->name != NULL) { while(cmd_ptr->name != NULL) {
SHELL_OUTPUT(output, "%s\n", cmd_ptr->help); SHELL_OUTPUT(output, "%s\n", cmd_ptr->help);
cmd_ptr++; cmd_ptr++;

2
apps/shell/shell-commands.h
View File

@ -44,7 +44,7 @@
#define _SHELL_COMMANDS_H_ #define _SHELL_COMMANDS_H_
/* Command handling function type */ /* Command handling function type */
typedef char (shell_commands_func)(struct pt *pt, shell_output_func output, const char *args); typedef char (shell_commands_func)(struct pt *pt, shell_output_func output, char *args);
/* Command structure */ /* Command structure */
struct shell_command_t { struct shell_command_t {

20
apps/shell/shell.h
View File

@ -48,6 +48,26 @@
#include "sys/process.h" #include "sys/process.h"
#include <stdio.h> #include <stdio.h>
/* Helper macros to parse arguments */
#define SHELL_ARGS_INIT(args, next_args) (next_args) = (args);
#define SHELL_ARGS_NEXT(args, next_args) do { \
(args) = (next_args); \
if((args) != NULL) { \
if(*(args) == '\0') { \
(args) = NULL; \
} else { \
(next_args) = strchr((args), ' '); \
if((next_args) != NULL) { \
*(next_args) = '\0'; \
(next_args)++; \
} \
} \
} else { \
(next_args) = NULL; \
} \
} while(0)
/* Printf-formatted output via a given output function */ /* Printf-formatted output via a given output function */
#define SHELL_OUTPUT(output_func, format, ...) do { \ #define SHELL_OUTPUT(output_func, format, ...) do { \
char buffer[128]; \ char buffer[128]; \