d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't leave files in /var/cront/tabs when interrupted

Browse Source 
PR:		17363
MFC after:	3 days
This commit is contained in:
Matteo Riondato 2008-11-09 07:34:11 +00:00
parent 2b9f079ca2
commit 8037791bf7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=184780
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr.sbin/cron/crontab/crontab.c
View File

@ -63,6 +63,7 @@ static FILE *NewCrontab;
static int CheckErrorCount;
static enum opt_t Option;
static struct passwd *pw;
static char *tmp_path;
static void list_cmd(void),
delete_cmd(void),
edit_cmd(void),
@ -486,6 +487,16 @@ edit_cmd() {
}
void
static remove_tmp(int sig)
{
if (tmp_path) {
unlink(tmp_path);
}
exit(ERROR_EXIT);
}
/* returns 0 on success
* -1 on syntax error
* -2 on install error
@ -498,6 +509,7 @@ replace_cmd() {
entry *e;
time_t now = time(NULL);
char **envp = env_init();
void (*f[3])();
if (envp == NULL) {
warnx("cannot allocate memory");
@ -506,6 +518,13 @@ replace_cmd() {
(void) snprintf(n, sizeof(n), "tmp.%d", Pid);
(void) snprintf(tn, sizeof(n), CRON_TAB(n));
/* Set up to remove the temp file if interrupted by a signal. */
f[0] = signal(SIGHUP, remove_tmp);
f[1] = signal(SIGINT, remove_tmp);
f[2] = signal(SIGTERM, remove_tmp);
tmp_path = tn;
if (!(tmp = fopen(tn, "w+"))) {
warn("%s", tn);
return (-2);
@ -598,6 +617,13 @@ replace_cmd() {
unlink(tn);
return (-2);
}
/* Restore the default signal handlers. */
tmp_path = NULL;
signal(SIGHUP, f[0]);
signal(SIGINT, f[1]);
signal(SIGTERM, f[2]);
log_it(RealUser, Pid, "REPLACE", User);
poke_daemon();