|
|
@ -172,7 +172,6 @@ load_config (const char *where, int *o2o) |
|
|
|
if (boxes) |
|
|
|
if (boxes) |
|
|
|
goto forbid; |
|
|
|
goto forbid; |
|
|
|
/* this only affects the global setting */ |
|
|
|
/* this only affects the global setting */ |
|
|
|
free (global.maildir); |
|
|
|
|
|
|
|
global.maildir = expand_strdup (val); |
|
|
|
global.maildir = expand_strdup (val); |
|
|
|
} |
|
|
|
} |
|
|
|
else if (!strcasecmp ("folder", cmd)) |
|
|
|
else if (!strcasecmp ("folder", cmd)) |
|
|
@ -204,14 +203,7 @@ load_config (const char *where, int *o2o) |
|
|
|
cfg->host = strdup (val); |
|
|
|
cfg->host = strdup (val); |
|
|
|
} |
|
|
|
} |
|
|
|
else if (!strcasecmp ("user", cmd)) |
|
|
|
else if (!strcasecmp ("user", cmd)) |
|
|
|
{ |
|
|
|
cfg->user = strdup (val); |
|
|
|
if (boxes) |
|
|
|
|
|
|
|
cfg->user = strdup (val); |
|
|
|
|
|
|
|
else { |
|
|
|
|
|
|
|
free (global.user); |
|
|
|
|
|
|
|
global.user = strdup (val); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else if (!strcasecmp ("pass", cmd)) |
|
|
|
else if (!strcasecmp ("pass", cmd)) |
|
|
|
cfg->pass = strdup (val); |
|
|
|
cfg->pass = strdup (val); |
|
|
|
else if (!strcasecmp ("port", cmd)) |
|
|
|
else if (!strcasecmp ("port", cmd)) |
|
|
@ -288,12 +280,3 @@ find_box (const char *s) |
|
|
|
} |
|
|
|
} |
|
|
|
return 0; |
|
|
|
return 0; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void |
|
|
|
|
|
|
|
free_config (void) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
free (global.user); |
|
|
|
|
|
|
|
free (global.maildir); |
|
|
|
|
|
|
|
free (global.host); |
|
|
|
|
|
|
|
free (global.pass); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|