#include "parser.h"
+#include "cfg/cfg_parser.h"
+
#include <io/kfile.h>
#include <struct/hashtable.h>
* \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;
+ bool open_quote = false;
while ((*cur == ' ' || *cur == '\t') && *cur)
++cur;
+ if (*cur == '"')
+ open_quote = true;
+
*begin = cur;
- while ((*cur != ' ' && *cur != '\t') && *cur)
+ if (open_quote)
+ {
++cur;
+ while (*cur != '"' && *cur)
+ ++cur;
+ if (*cur != '"')
+ return false;
+ ++cur;
+ }
+ else
+ while ((*cur != ' ' && *cur != '\t') && *cur)
+ ++cur;
*end = cur;
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:
* in a given text line without parsing all the parameters and
* executing it.
*
- * \param line Text line to be processed (ASCIIZ)
+ * \param input Text line to be processed (ASCIIZ)
*
* \return The command template associated with the command contained
* in the line, or NULL if the command is invalid.
* The first argument will always be the command name, so the actual arguments
* will start at index 1.
*
- * \param line Text line to be processed (ASCIIZ)
- * \param templ Command template for this line
+ * \param input Text line to be processed (ASCIIZ)
+ * \param cmdp Command template for this line
* \param args Will contain the extracted parameters
*
* \return True if everything OK, false in case of parsing error.
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;
*
* Process the input, calling the requested command (if found).
*
- * \param line Text line to be processed (ASCIIZ)
+ * \param input Text line to be processed (ASCIIZ)
*
* \return true if everything is OK, false in case of errors
*/
* Register a new command into the parser
*
* \param cmd Command template describing the command
+ * \return true if registration was successful, false otherwise
*/
-void parser_register_cmd(const struct CmdTemplate* cmd)
+bool parser_register_cmd(const struct CmdTemplate* cmd)
{
- ht_insert(&commands, cmd);
+ return ht_insert(&commands, cmd);
}
void parser_init(void)