return NULL;
}
+static int parse_fixed_string(struct cmdline_token_string_data *sd,
+ const char *buf, unsigned token_len)
+{
+ unsigned int conf_token_len;
+ const char *str;
+
+ str = sd->str;
+ for (str = sd->str; str != NULL ; str = get_next_token(str)) {
+
+ conf_token_len = get_token_len(str);
+
+ /* if token from config is too big... */
+ if (conf_token_len >= STR_TOKEN_SIZE - 1)
+ continue;
+
+ /* compare conf token and user token */
+ if (token_len == conf_token_len &&
+ strncmp(buf, str, token_len) == 0)
+ return 0;
+ }
+
+ return -1;
+}
+
int
cmdline_parse_string(cmdline_parse_token_hdr_t *tk, const char *buf, void *res)
{
struct cmdline_token_string *tk2 = (struct cmdline_token_string *)tk;
struct cmdline_token_string_data *sd = &tk2->string_data;;
unsigned int token_len;
- const char *str;
- if (! *buf)
+ token_len = strlen(buf);
+
+ if (token_len >= (STR_TOKEN_SIZE - 1) || token_len == 0)
return -1;
/* fixed string */
if (sd->str) {
- str = sd->str;
- do {
- token_len = get_token_len(str);
-
- /* if token is too big... */
- if (token_len >= STR_TOKEN_SIZE - 1) {
- continue;
- }
-
- if ( strncmp(buf, str, token_len) ) {
- continue;
- }
-
- if ( !cmdline_isendoftoken(*(buf+token_len)) ) {
- continue;
- }
-
- break;
- } while ( (str = get_next_token(str)) != NULL );
-
- if (!str)
+ if (parse_fixed_string(sd, buf, token_len) < 0)
return -1;
}
- /* unspecified string */
- else {
- token_len=0;
- while(!cmdline_isendoftoken(buf[token_len]) &&
- token_len < (STR_TOKEN_SIZE-1))
- token_len++;
-
- /* return if token too long */
- if (token_len >= STR_TOKEN_SIZE - 1) {
- return -1;
- }
- }
- if (res) {
- /* we are sure that token_len is < STR_TOKEN_SIZE-1 */
- strncpy(res, buf, token_len);
- *((char *)res + token_len) = 0;
- }
+ /* we already checked that token_len is < STR_TOKEN_SIZE-1 */
+ if (res)
+ strcpy(res, buf);
return token_len;
}