[OpenWrt-Devel] [PATCH 07/12] cli: fix printing option values occupying multiple lines.

[Yousong Zhou]

On 15 December 2014 at 16:46, Yousong Zhou <yszhou4tech at gmail.com> wrote:
>
> Signed-off-by: Yousong Zhou <yszhou4tech at gmail.com>
> ---
>  cli.c |   40 ++++++++++++++++++++++++++++++----------
>  1 file changed, 30 insertions(+), 10 deletions(-)
>
> diff --git a/cli.c b/cli.c
> index 6fbbfe9..85a24d8 100644
> --- a/cli.c
> +++ b/cli.c
> @@ -168,18 +168,36 @@ static void cli_perror(void)
>         uci_perror(ctx, appname);
>  }
>
> -static void uci_show_value(struct uci_option *o)
> +static void uci_print_value(FILE *f, const char *v)
> +{
> +       fprintf(f, "'");
> +       while (*v) {
> +               if (*v != '\'')
> +                       fputc(*v, f);
> +               else
> +                       fprintf(f, "'\\''");
> +               v++;
> +       }
> +       fprintf(f, "'");
> +}
> +
> +static void uci_show_value(struct uci_option *o, bool quote)
>  {
>         struct uci_element *e;
>         bool sep = false;
>
>         switch(o->type) {
>         case UCI_TYPE_STRING:
> -               printf("%s\n", o->v.string);
> +               if (quote)
> +                       uci_print_value(stdout, o->v.string);
> +               else
> +                       printf("%s", o->v.string);
> +               printf("\n");
>                 break;
>         case UCI_TYPE_LIST:
>                 uci_foreach_element(&o->v.list, e) {
> -                       printf("%s%s", (sep ? delimiter : ""), e->name);
> +                       printf("%s", (sep ? delimiter : ""));
> +                       uci_print_value(stdout, e->name);
>                         sep = true;
>                 }

While `config_foreach` works okay with this change.  I may note that
this will break usages like the following

                network=$(uci get sockd.instance0.internal_network)
                status=$(ifstatus "$network")

where option `internal_network` is of list type, thus the value will
be quoted resulting a call to ifstatus like the following.

                ifstatus "'vpn'"

which is invalid of course.  Anyway, I think `config_foreach` should
be used in such cases.

Regards.

                yousong


>                 printf("\n");
> @@ -190,13 +208,13 @@ static void uci_show_value(struct uci_option *o)
>         }
>  }
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel