OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Extend the mkconfig tool so that it can dequote a quoated list of quoated strings. THTTPD uses such a configration setting to provide the list of index files.

This commit is contained in:
Gregory Nutt 2015-06-02 14:23:59 -06:00
parent 0de965100c
commit 8cdce50e8c
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/cfgdefine.c
View File

@ -90,7 +90,7 @@ static const char *dequote_list[] =
"CONFIG_EXAMPLES_HELLO_PROGNAME", /* Name of installed hello example program */
"CONFIG_EXAMPLES_NSH_PROGNAME", /* Name of installed NSH example program */
"CONFIG_THTTPD_INDEX_NAMES", /* List of index file names */
NULL /* Marks the end of the list */
};
@ -225,7 +225,9 @@ static char *dequote_value(const char *varname, char *varval)
{
const char **dqnam;
char *dqval = varval;
char *ptr;
int len;
int i;
if (dqval)
{
@ -240,12 +242,12 @@ static char *dequote_value(const char *varname, char *varval)
}
/* Did we find the variable name in the list of configuration variables
* to be dequoated?
* to be dequoted?
*/
if (*dqnam)
{
/* Yes... Check if there is a traiing quote */
/* Yes... Check if there is a trailing quote */
len = strlen(dqval);
if (dqval[len-1] == '"')
@ -266,6 +268,28 @@ static char *dequote_value(const char *varname, char *varval)
len--;
}
/* A special case is a quoted list of quoted strings. In that case
* we will need to remove the backspaces from the internally quoted
* strings. NOTE: this will not handle nested quoted quotes.
*/
for (ptr = dqval; *ptr; ptr++)
{
/* Check for a quoted quote */
if (ptr[0] == '\\' && ptr[1] == '"')
{
/* Delete the backslash by moving the rest of the string */
for (i = 0; ptr[i]; i++)
{
ptr[i] = ptr[i+1];
}
len--;
}
}
/* Handle the case where nothing is left after dequoting */
if (len <= 0)