[Pcsclite-cvs-commit] CVS PCSC/src

CVS User rousseau ludovic.rousseau@free.fr
Wed, 25 May 2005 14:17:23 +0000


Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv31297

Modified Files:
	pcscdaemon.c winscard_msg_srv.c 
Log Message:
Do not log a critical or error debug message if pcscd is stopped using
Ctrl-C or SIGQUIT
Closes Debian bug 306061


--- /cvsroot/pcsclite/PCSC/src/pcscdaemon.c	2005/04/12 12:09:06	1.58
+++ /cvsroot/pcsclite/PCSC/src/pcscdaemon.c	2005/05/25 14:17:23	1.59
@@ -5,7 +5,7 @@
  *  David Corcoran <corcoran@linuxnet.com>
  *  Ludovic Rousseau <ludovic.rousseau@free.fr>
  *
- * $Id: pcscdaemon.c,v 1.58 2005/04/12 12:09:06 rousseau Exp $
+ * $Id: pcscdaemon.c,v 1.59 2005/05/25 14:17:23 rousseau Exp $
  */
 
 /**
@@ -48,7 +48,7 @@
 #define FALSE 0
 #endif
 
-static char AraKiri = FALSE;
+char AraKiri = FALSE;
 static char Init = TRUE;
 
 /*
@@ -165,7 +165,8 @@
 			break;
 
 		case -1:
-			Log1(PCSC_LOG_ERROR, "Error in SHMProcessEventsServer");
+			if (!AraKiri)
+				Log1(PCSC_LOG_ERROR, "Error in SHMProcessEventsServer");
 			break;
 
 		default:
--- /cvsroot/pcsclite/PCSC/src/winscard_msg_srv.c	2005/05/25 13:44:06	1.1
+++ /cvsroot/pcsclite/PCSC/src/winscard_msg_srv.c	2005/05/25 14:17:23	1.2
@@ -6,7 +6,7 @@
  *  Damien Sauveron <damien.sauveron@labri.fr>
  *  Ludoic Rousseau <ludovic.rousseau@free.fr>
  *
- * $Id: winscard_msg_srv.c,v 1.1 2005/05/25 13:44:06 rousseau Exp $
+ * $Id: winscard_msg_srv.c,v 1.2 2005/05/25 14:17:23 rousseau Exp $
  */
 
 /**
@@ -46,6 +46,7 @@
  * Socket to a file, used for clients-server comminication.
  */
 static int commonSocket = 0;
+extern char AraKiri;
 
 /**
  * @brief Accepts a Client connection.
@@ -184,8 +185,9 @@
 
 	if (selret < 0)
 	{
-		Log2(PCSC_LOG_CRITICAL, "Select returns with failure: %s",
-			strerror(errno));
+		if (!AraKiri)
+			Log2(PCSC_LOG_CRITICAL, "Select returns with failure: %s",
+				strerror(errno));
 		return -1;
 	}