DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Copy the strings from ConfigurePrefs

Browse Source 
This also helps pass the "fixme" test.
This commit is contained in:
Pierre Pronchery 2019-02-21 02:27:26 +01:00
parent acc82edac5
commit 0c8c21331d
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/configure.c
View File

@ -68,6 +68,9 @@ struct _Configure {
HostOS os; HostOS os;
HostKernel kernel; HostKernel kernel;
Config * config; Config * config;
/* prefs */
String * prefs_os;
}; };
@ -158,8 +161,22 @@ Configure * configure_new(ConfigurePrefs * prefs)
if((configure = object_new(sizeof(*configure))) == NULL) if((configure = object_new(sizeof(*configure))) == NULL)
return NULL; return NULL;
if(prefs != NULL) if(prefs != NULL)
/* FIXME copy strings */ {
/* copy the strings */
if(prefs->os != NULL)
{
if((configure->prefs_os = string_new(prefs->os))
== NULL)
{
configure_delete(configure);
return NULL;
}
}
else
configure->prefs_os = NULL;
configure->prefs = *prefs; configure->prefs = *prefs;
configure->prefs.os = configure->prefs_os;
}
else else
memset(&configure->prefs, 0, sizeof(configure->prefs)); memset(&configure->prefs, 0, sizeof(configure->prefs));
_new_detect(configure); _new_detect(configure);
@ -280,6 +297,8 @@ static int _new_load_config(Configure * configure)
/* configure_delete */ /* configure_delete */
void configure_delete(Configure * configure) void configure_delete(Configure * configure)
{ {
if(configure->prefs_os != NULL)
string_delete(configure->prefs_os);
if(configure->config != NULL) if(configure->config != NULL)
config_delete(configure->config); config_delete(configure->config);
object_delete(configure); object_delete(configure);