projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove syslog from nightly test.
[bertos.git]
/
bertos
/
mware
/
parser.c
diff --git
a/bertos/mware/parser.c
b/bertos/mware/parser.c
index 71aec30dc980f58d1c4b1ada8060224c96878e7c..e08dd8b66f80a2dba0c1aff5484f705215a17f97 100644
(file)
--- a/
bertos/mware/parser.c
+++ b/
bertos/mware/parser.c
@@
-89,17
+89,31
@@
DECLARE_HASHTABLE_STATIC(commands, CONFIG_MAX_COMMANDS_NUMBER, get_key_from_comm
* \return True if a word was extracted, false if we got to the end
* of the string without extracting any word.
*/
* \return True if a word was extracted, false if we got to the end
* of the string without extracting any word.
*/
-
static
bool get_word(const char **begin, const char **end)
+bool get_word(const char **begin, const char **end)
{
const char *cur = *end;
{
const char *cur = *end;
+ bool open_quote = false;
while ((*cur == ' ' || *cur == '\t') && *cur)
++cur;
while ((*cur == ' ' || *cur == '\t') && *cur)
++cur;
+ if (*cur == '"')
+ open_quote = true;
+
*begin = cur;
*begin = cur;
- while ((*cur != ' ' && *cur != '\t') && *cur)
+ if (open_quote)
+ {
++cur;
++cur;
+ while (*cur != '"' && *cur)
+ ++cur;
+ if (*cur != '"')
+ return false;
+ ++cur;
+ }
+ else
+ while ((*cur != ' ' && *cur != '\t') && *cur)
+ ++cur;
*end = cur;
*end = cur;
@@
-137,7
+151,15
@@
static bool parseArgs(const char *fmt, const char *input, parms argv[])
break;
case 's':
break;
case 's':
- (*argv++).s = begin;
+ (*argv).s.p = begin;
+ (*argv).s.sz = end - begin;
+ /* Remove the quotes from argument */
+ if (*begin == '"' && *(end - 1) == '"')
+ {
+ (*argv).s.p += 1;
+ (*argv).s.sz -= 2;
+ }
+ argv++;
break;
default:
break;
default:
@@
-264,7
+286,7
@@
bool parser_get_cmd_arguments(const char* input, const struct CmdTemplate* cmdp,
if (!input)
return false;
if (!input)
return false;
- args[0].s = cmdp->name;
+ args[0].s
.p
= cmdp->name;
if (!parseArgs(cmdp->arg_fmt, input, args + 1))
return false;
if (!parseArgs(cmdp->arg_fmt, input, args + 1))
return false;