parse_env_file() - return empty value strings like FOO="" as NULL value
This commit is contained in:
parent
34c8deaae1
commit
dd36de4d52
2
fixme
2
fixme
|
@ -9,8 +9,6 @@ v11:
|
|||
|
||||
* emergency.service should start default.target after C-d. synchronize from fedora's initscripts package
|
||||
|
||||
* drop empty assignments for parse_env_file
|
||||
|
||||
* stability promise must say that #ifdef TARGET_XXX style distro compatibility will go away one day
|
||||
|
||||
* enable tmpfiles by default
|
||||
|
|
|
@ -653,6 +653,12 @@ int parse_env_file(
|
|||
goto fail;
|
||||
}
|
||||
|
||||
if (v[0] == '\0') {
|
||||
/* return empty value strings as NULL */
|
||||
free(v);
|
||||
v = NULL;
|
||||
}
|
||||
|
||||
free(*value);
|
||||
*value = v;
|
||||
|
||||
|
|
|
@ -113,11 +113,11 @@ static int load_font(const char *vc, const char *font, const char *map, const ch
|
|||
args[i++] = "-C";
|
||||
args[i++] = vc;
|
||||
args[i++] = font;
|
||||
if (map && map[0] != '\0') {
|
||||
if (map) {
|
||||
args[i++] = "-m";
|
||||
args[i++] = map;
|
||||
}
|
||||
if (unimap && unimap[0] != '\0') {
|
||||
if (unimap) {
|
||||
args[i++] = "-u";
|
||||
args[i++] = unimap;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue