lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed two crashes

Browse Source
This commit is contained in:
Oswald Buddenhagen 2002-12-28 04:04:54 +00:00
parent 3327572fd2
commit 2012aadc5b
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/config.c
View File

@ -110,7 +110,7 @@ load_config (const char *where, int *o2o)
char path[_POSIX_PATH_MAX]; char path[_POSIX_PATH_MAX];
char buf[1024]; char buf[1024];
struct passwd *pw; struct passwd *pw;
config_t **cur = &boxes, *cfg; config_t **stor = &boxes, *cfg;
int line = 0; int line = 0;
FILE *fp; FILE *fp;
char *p, *cmd, *val; char *p, *cmd, *val;
@ -141,19 +141,23 @@ load_config (const char *where, int *o2o)
line++; line++;
if (!cmd || *cmd == '#') if (!cmd || *cmd == '#')
continue; continue;
if (!val) {
fprintf (stderr, "%s:%d: parameter missing\n", path, line);
continue;
}
if (!strcasecmp ("mailbox", cmd)) if (!strcasecmp ("mailbox", cmd))
{ {
if (*o2o) if (*o2o)
break; break;
cur = &(*cur)->next; cfg = *stor = malloc (sizeof (config_t));
cfg = *cur = malloc (sizeof (config_t)); stor = &cfg->next;
config_defaults (cfg); config_defaults (cfg);
/* not expanded at this point */ /* not expanded at this point */
cfg->path = strdup (val); cfg->path = strdup (val);
} }
else if (!strcasecmp ("OneToOne", cmd)) else if (!strcasecmp ("OneToOne", cmd))
{ {
if (*cur) { if (boxes) {
forbid: forbid:
fprintf (stderr, fprintf (stderr,
"%s:%d: keyword '%s' allowed only in global section\n", "%s:%d: keyword '%s' allowed only in global section\n",
@ -164,7 +168,7 @@ load_config (const char *where, int *o2o)
} }
else if (!strcasecmp ("maildir", cmd)) else if (!strcasecmp ("maildir", cmd))
{ {
if (*cur) if (boxes)
goto forbid; goto forbid;
/* this only affects the global setting */ /* this only affects the global setting */
free (global.maildir); free (global.maildir);
@ -172,14 +176,14 @@ load_config (const char *where, int *o2o)
} }
else if (!strcasecmp ("folder", cmd)) else if (!strcasecmp ("folder", cmd))
{ {
if (*cur) if (boxes)
goto forbid; goto forbid;
/* this only affects the global setting */ /* this only affects the global setting */
global.folder = strdup (val); global.folder = strdup (val);
} }
else if (!strcasecmp ("inbox", cmd)) else if (!strcasecmp ("inbox", cmd))
{ {
if (*cur) if (boxes)
goto forbid; goto forbid;
/* this only affects the global setting */ /* this only affects the global setting */
global.inbox = strdup (val); global.inbox = strdup (val);
@ -200,8 +204,8 @@ load_config (const char *where, int *o2o)
} }
else if (!strcasecmp ("user", cmd)) else if (!strcasecmp ("user", cmd))
{ {
if (*cur) if (boxes)
(*cur)->user = strdup (val); cfg->user = strdup (val);
else { else {
free (global.user); free (global.user);
global.user = strdup (val); global.user = strdup (val);
@ -215,7 +219,7 @@ load_config (const char *where, int *o2o)
cfg->box = strdup (val); cfg->box = strdup (val);
else if (!strcasecmp ("alias", cmd)) else if (!strcasecmp ("alias", cmd))
{ {
if (!*cur) { if (!boxes) {
fprintf (stderr, fprintf (stderr,
"%s:%d: keyword 'alias' allowed only in mailbox specification\n", "%s:%d: keyword 'alias' allowed only in mailbox specification\n",
path, line); path, line);