projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various error-handling fixes, mostly in Unix PuTTY but one (failure
[u/mdw/putty]
/
config.c
diff --git
a/config.c
b/config.c
index
ed2bee6
..
7204a6c
100644
(file)
--- a/
config.c
+++ b/
config.c
@@
-305,7
+305,13
@@
static void sessionsaver_handler(union control *ctrl, void *dlg,
savedsession[0] = '\0';
}
}
savedsession[0] = '\0';
}
}
- save_settings(savedsession, !isdef, cfg);
+ {
+ char *errmsg = save_settings(savedsession, !isdef, cfg);
+ if (errmsg) {
+ dlg_error_msg(dlg, errmsg);
+ sfree(errmsg);
+ }
+ }
get_sesslist(ssd->sesslist, FALSE);
get_sesslist(ssd->sesslist, TRUE);
dlg_refresh(ssd->editbox, dlg);
get_sesslist(ssd->sesslist, FALSE);
get_sesslist(ssd->sesslist, TRUE);
dlg_refresh(ssd->editbox, dlg);
@@
-1141,7
+1147,7
@@
void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
charclass_handler, P(ccd));
ccd->listbox->listbox.multisel = 1;
ccd->listbox->listbox.ncols = 4;
charclass_handler, P(ccd));
ccd->listbox->listbox.multisel = 1;
ccd->listbox->listbox.ncols = 4;
- ccd->listbox->listbox.percentages = s
malloc(4*sizeof(int)
);
+ ccd->listbox->listbox.percentages = s
newn(4, int
);
ccd->listbox->listbox.percentages[0] = 15;
ccd->listbox->listbox.percentages[1] = 25;
ccd->listbox->listbox.percentages[2] = 20;
ccd->listbox->listbox.percentages[0] = 15;
ccd->listbox->listbox.percentages[1] = 25;
ccd->listbox->listbox.percentages[2] = 20;
@@
-1345,7
+1351,7
@@
void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
environ_handler, P(ed));
ed->listbox->listbox.height = 3;
ed->listbox->listbox.ncols = 2;
environ_handler, P(ed));
ed->listbox->listbox.height = 3;
ed->listbox->listbox.ncols = 2;
- ed->listbox->listbox.percentages = s
malloc(2*sizeof(int)
);
+ ed->listbox->listbox.percentages = s
newn(2, int
);
ed->listbox->listbox.percentages[0] = 30;
ed->listbox->listbox.percentages[1] = 70;
}
ed->listbox->listbox.percentages[0] = 30;
ed->listbox->listbox.percentages[1] = 70;
}
@@
-1525,7
+1531,7
@@
void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
portfwd_handler, P(pfd));
pfd->listbox->listbox.height = 3;
pfd->listbox->listbox.ncols = 2;
portfwd_handler, P(pfd));
pfd->listbox->listbox.height = 3;
pfd->listbox->listbox.ncols = 2;
- pfd->listbox->listbox.percentages = s
malloc(2*sizeof(int)
);
+ pfd->listbox->listbox.percentages = s
newn(2, int
);
pfd->listbox->listbox.percentages[0] = 20;
pfd->listbox->listbox.percentages[1] = 80;
ctrl_tabdelay(s, pfd->rembutton);
pfd->listbox->listbox.percentages[0] = 20;
pfd->listbox->listbox.percentages[1] = 80;
ctrl_tabdelay(s, pfd->rembutton);