[Pcsclite-cvs-commit] r4600 - /trunk/PCSC/src/pcscdaemon.c

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Fri Dec 11 13:08:18 UTC 2009


Author: rousseau
Date: Fri Dec 11 13:08:18 2009
New Revision: 4600

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4600
Log:
revert revision 4599 and remove the second call to signal() instead of
the first one. We need to clean-up as soon as we created the files.

Modified:
    trunk/PCSC/src/pcscdaemon.c

Modified: trunk/PCSC/src/pcscdaemon.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcscdaemon.c?rev=4600&op=diff
==============================================================================
--- trunk/PCSC/src/pcscdaemon.c (original)
+++ trunk/PCSC/src/pcscdaemon.c Fri Dec 11 13:08:18 2009
@@ -412,6 +412,15 @@
 	}
 
 	/*
+	 * cleanly remove /var/run/pcscd/files when exiting
+	 * signal_trap() does just set a global variable used by the main loop
+	 */
+	(void)signal(SIGQUIT, signal_trap);
+	(void)signal(SIGTERM, signal_trap);
+	(void)signal(SIGINT, signal_trap);
+	(void)signal(SIGHUP, signal_trap);
+
+	/*
 	 * If PCSCLITE_IPC_DIR does not exist then create it
 	 */
 	rv = SYS_Stat(PCSCLITE_IPC_DIR, &fStatBuf);
@@ -521,13 +530,8 @@
 	Init = FALSE;
 
 	/*
-	 * signal_trap() does just set a global variable used by the main loop
-	 */
-	(void)signal(SIGQUIT, signal_trap);
-	(void)signal(SIGTERM, signal_trap);
-	(void)signal(SIGINT, signal_trap);
-	(void)signal(SIGHUP, signal_trap);
-
+	 * Hotplug rescan
+	 */
 	(void)signal(SIGUSR1, signal_reload);
 
 	SVCServiceRunLoop(customMaxThreadCounter, customMaxThreadCardHandles);




More information about the Pcsclite-cvs-commit mailing list