dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

env: make himport_r() selective on variables

Browse Source 
Add 2 new arguments to himport_r():

 o "nvars", "vars": number and list of variables to take into account
   (0 means ALL)

NOTE: This patch does not change the current behaviour.

Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Reviewed-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Gerlando Falauto
2012-08-24 00:11:38 +00:00
committed by Tom Rini
parent c3f6525854
commit 348b1f1c60
4 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/hashtable.c
View File

@@ -603,6 +603,24 @@ ssize_t hexport_r(struct hsearch_data *htab, const char sep,
* himport()
*/
/* Check whether variable name is amongst vars[] */
static int is_var_in_set(const char *name, int nvars, char * const vars[])
{
int i = 0;
/* No variables specified means process all of them */
if (nvars == 0)
return 1;
for (i = 0; i < nvars; i++) {
if (!strcmp(name, vars[i]))
return 1;
}
debug("Skipping non-listed variable %s\n", name);
return 0;
}
/*
* Import linearized data into hash table.
*
@@ -639,7 +657,8 @@ ssize_t hexport_r(struct hsearch_data *htab, const char sep,
*/
int himport_r(struct hsearch_data *htab,
const char *env, size_t size, const char sep, int flag)
const char *env, size_t size, const char sep, int flag,
int nvars, char * const vars[])
{
char *data, *sp, *dp, *name, *value;
@@ -726,6 +745,8 @@ int himport_r(struct hsearch_data *htab,
*dp++ = '\0'; /* terminate name */
debug("DELETE CANDIDATE: \"%s\"\n", name);
if (!is_var_in_set(name, nvars, vars))
continue;
if (hdelete_r(name, htab) == 0)
debug("DELETE ERROR ##############################\n");
@@ -743,6 +764,10 @@ int himport_r(struct hsearch_data *htab,
*sp++ = '\0'; /* terminate value */
++dp;
/* Skip variables which are not supposed to be processed */
if (!is_var_in_set(name, nvars, vars))
continue;
/* enter into hash table */
e.key = name;
e.data = value;