From: Andreas Reichel <andreas.reichel....@siemens.com>
Correct default data type in API function and fix impractical function
calls to fully support global user variables from tools.
Signed-off-by: Andreas Reichel <andreas.reichel....@siemens.com>
---
docs/TOOLS.md | 10 +++++++++-
env/env_api.c | 5 +++--
tools/bg_setenv.c | 18 ++++--------------
3 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/docs/TOOLS.md b/docs/TOOLS.md
index 7dd1f83..814e6ba 100644
--- a/docs/TOOLS.md
+++ b/docs/TOOLS.md
@@ -92,4 +92,12 @@ bg_setenv --partition=1 --ustate=TESTING
bg_setenv -x key=value
```
-This will set the variable named `key` to `value` in the current environment.
+This will set the variable named `key` to `value` in all environments.
+
+If The user wants to delete such a variable, the value after the `=` must be
omitted, e.g.
+
+```
+bg_setenv -x key=
+```
+will delete the variable with key `key`.
+
diff --git a/env/env_api.c b/env/env_api.c
index ea55bad..29808ff 100644
--- a/env/env_api.c
+++ b/env/env_api.c
@@ -107,8 +107,9 @@ int ebg_env_get_ex(ebgenv_t *e, char *key, uint64_t
*usertype, uint8_t *buffer,
int ebg_env_set(ebgenv_t *e, char *key, char *value)
{
- return bgenv_set((BGENV *)e->bgenv, key, USERVAR_TYPE_DEFAULT, value,
- strlen(value) + 1);
+ return bgenv_set((BGENV *)e->bgenv, key, USERVAR_TYPE_DEFAULT |
+ USERVAR_TYPE_STRING_ASCII, value,
+ strlen(value) + 1);
}
int ebg_env_set_ex(ebgenv_t *e, char *key, uint64_t usertype, uint8_t *value,
diff --git a/tools/bg_setenv.c b/tools/bg_setenv.c
index e9156cd..741d604 100644
--- a/tools/bg_setenv.c
+++ b/tools/bg_setenv.c
@@ -65,8 +65,6 @@ struct env_action {
STAILQ_HEAD(stailhead, env_action) head = STAILQ_HEAD_INITIALIZER(head);
-static bool inhibit_global_store = false;
-
static void journal_free_action(struct env_action *action)
{
if (!action) {
@@ -116,12 +114,6 @@ static void journal_process_action(BGENV *env, struct
env_action *action)
ebgenv_t e;
char *tmp;
- if (inhibit_global_store) {
- /* If the environment is written to a file, we don't want a
- * global variable storage, but only into the output file */
- action->type &= ~USERVAR_TYPE_GLOBAL;
- }
-
switch (action->task) {
case ENV_TASK_SET:
VERBOSE(stdout, "Task = SET, key = %s, type = %llu, val = %s\n",
@@ -156,10 +148,7 @@ static void journal_process_action(BGENV *env, struct
env_action *action)
break;
case ENV_TASK_DEL:
VERBOSE(stdout, "Task = DEL, key = %s\n", action->key);
- var = bgenv_find_uservar(env->data->userdata, action->key);
- if (var) {
- bgenv_del_uservar(env->data->userdata, var);
- }
+ bgenv_set(env, action->key, action->type, "", 1);
break;
}
}
@@ -211,7 +200,9 @@ static error_t set_uservars(char *arg)
value = strtok(NULL, "=");
if (value == NULL) {
- return journal_add_action(ENV_TASK_DEL, key, 0, NULL, 0);
+ return journal_add_action(ENV_TASK_DEL, key,
+ USERVAR_TYPE_DEFAULT |
+ USERVAR_TYPE_DELETED, NULL, 0);
}
return journal_add_action(ENV_TASK_SET, key, USERVAR_TYPE_DEFAULT |
USERVAR_TYPE_STRING_ASCII,
@@ -319,7 +310,6 @@ static error_t parse_opt(int key, char *arg, struct
argp_state *state)
break;
case 'f':
arguments->output_to_file = true;
- inhibit_global_store = true;
res = asprintf(&envfilepath, "%s/%s", arg, FAT_ENV_FILENAME);
if (res == -1) {
return ENOMEM;
--
2.15.0
--
You received this message because you are subscribed to the Google Groups "EFI
Boot Guard" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to efibootguard-dev+unsubscr...@googlegroups.com.
To post to this group, send email to efibootguard-dev@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/efibootguard-dev/20171116135213.15423-2-andreas.reichel.ext%40siemens.com.
For more options, visit https://groups.google.com/d/optout.
