X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=src%2Flib%2Fcmdline_parse_string.c;h=1b2c14670ab266d03b6abf35ba3c399fb9ead921;hb=f32d30f48ddfb55b86efd695e0dd144e9d15401e;hp=eb4553b54c4e7b895415e814bc6dce3b655f04ba;hpb=6f32a68393e01b4179592b9f48255179e8ad55f7;p=libcmdline.git diff --git a/src/lib/cmdline_parse_string.c b/src/lib/cmdline_parse_string.c index eb4553b..1b2c146 100644 --- a/src/lib/cmdline_parse_string.c +++ b/src/lib/cmdline_parse_string.c @@ -1,3 +1,37 @@ +/*- + * Copyright (c) <2010>, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * - Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + /* * Copyright (c) 2009, Olivier MATZ * All rights reserved. @@ -33,13 +67,6 @@ #include "cmdline_parse.h" #include "cmdline_parse_string.h" -struct cmdline_token_ops cmdline_token_string_ops = { - .parse = cmdline_parse_string, - .complete_get_nb = cmdline_complete_get_nb_string, - .complete_get_elt = cmdline_complete_get_elt_string, - .get_help = cmdline_get_help_string, -}; - #define MULTISTRING_HELP "Mul-choice STRING" #define ANYSTRING_HELP "Any STRING" #define FIXEDSTRING_HELP "Fixed STRING" @@ -47,15 +74,15 @@ struct cmdline_token_ops cmdline_token_string_ops = { static unsigned int get_token_len(const char *s) { - char c; + char c; unsigned int i=0; c = s[i]; - while (c!='#' && c!='\0') { - i++; + while (c!='#' && c!='\0') { + i++; c = s[i]; } - return i; + return i; } static const char * @@ -68,96 +95,85 @@ get_next_token(const char *s) return NULL; } -int -cmdline_parse_string(cmdline_parse_token_hdr_t *tk, const char *buf, void *res) +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; +} + +static int +cmdline_parse_string(cmdline_parse_token_hdr_t *tk, const char *buf, void *res, + unsigned ressize) { 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) + if (res && ressize < STR_TOKEN_SIZE) + return -1; + + 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) + /* fixed string */ + if (sd->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; } - return token_len; + /* we already checked that token_len is < STR_TOKEN_SIZE-1 */ + if (res) + strcpy(res, buf); + + return token_len; } -int cmdline_complete_get_nb_string(cmdline_parse_token_hdr_t *tk) +static int +cmdline_complete_string_start(cmdline_parse_token_hdr_t *tk, void **opaque) { struct cmdline_token_string *tk2 = (struct cmdline_token_string *)tk; struct cmdline_token_string_data *sd = &tk2->string_data;; - int ret=1; const char *str; - if (!sd->str) - return 0; - str = sd->str; - while( (str = get_next_token(str)) != NULL ) { - ret++; - } - return ret; + *opaque = (void *)str; + if (str == NULL) + return -1; /* no completion */ + return 0; } -int cmdline_complete_get_elt_string(cmdline_parse_token_hdr_t *tk, int idx, - char *dstbuf, unsigned int size) +static int +cmdline_complete_string_iterate(cmdline_parse_token_hdr_t *tk, void **opaque, + char *dstbuf, unsigned int size) { - struct cmdline_token_string *tk2 = (struct cmdline_token_string *)tk; - struct cmdline_token_string_data *sd = &tk2->string_data;; const char *s; unsigned int len; - s = sd->str; - - while (idx-- && s) - s = get_next_token(s); - - if (!s) + s = *opaque; + if (s == NULL) return -1; + *opaque = (void *)get_next_token(s); len = get_token_len(s); if (len > size - 1) @@ -168,29 +184,35 @@ int cmdline_complete_get_elt_string(cmdline_parse_token_hdr_t *tk, int idx, return 0; } - -int cmdline_get_help_string(cmdline_parse_token_hdr_t *tk, char *dstbuf, - unsigned int size) +static int +cmdline_help_string(cmdline_parse_token_hdr_t *tk, char *dstbuf, + unsigned int size) { struct cmdline_token_string *tk2 = (struct cmdline_token_string *)tk; struct cmdline_token_string_data *sd = &tk2->string_data;; const char *s; - + s = sd->str; - if (s) { - if (get_next_token(s)) { + if (s != NULL) { + if (get_next_token(s)) strncpy(dstbuf, MULTISTRING_HELP, size); - } - else { + else strncpy(dstbuf, FIXEDSTRING_HELP, size); - } } else { strncpy(dstbuf, ANYSTRING_HELP, size); } - + dstbuf[size-1] = '\0'; return 0; } + +struct cmdline_token_ops cmdline_token_string_ops = { + .parse = cmdline_parse_string, + .complete_start = cmdline_complete_string_start, + .complete_iterate = cmdline_complete_string_iterate, + .complete_end = NULL, + .help = cmdline_help_string, +};