From owner-svn-src-all@FreeBSD.ORG  Sun Nov  9 07:34:12 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 009381065670;
	Sun,  9 Nov 2008 07:34:12 +0000 (UTC)
	(envelope-from matteo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E49238FC16;
	Sun,  9 Nov 2008 07:34:11 +0000 (UTC)
	(envelope-from matteo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA97YBs7033554;
	Sun, 9 Nov 2008 07:34:11 GMT (envelope-from matteo@svn.freebsd.org)
Received: (from matteo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA97YBld033553;
	Sun, 9 Nov 2008 07:34:11 GMT (envelope-from matteo@svn.freebsd.org)
Message-Id: <200811090734.mA97YBld033553@svn.freebsd.org>
From: Matteo Riondato <matteo@FreeBSD.org>
Date: Sun, 9 Nov 2008 07:34:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184780 - head/usr.sbin/cron/crontab
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Nov 2008 07:34:12 -0000

Author: matteo
Date: Sun Nov  9 07:34:11 2008
New Revision: 184780
URL: http://svn.freebsd.org/changeset/base/184780

Log:
  Don't leave files in /var/cront/tabs when interrupted
  
  PR:		17363
  MFC after:	3 days

Modified:
  head/usr.sbin/cron/crontab/crontab.c

Modified: head/usr.sbin/cron/crontab/crontab.c
==============================================================================
--- head/usr.sbin/cron/crontab/crontab.c	Sun Nov  9 06:44:53 2008	(r184779)
+++ head/usr.sbin/cron/crontab/crontab.c	Sun Nov  9 07:34:11 2008	(r184780)
@@ -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();