[Pcsclite-cvs-commit] CVS PCSC/src

[CVS User rousseau]

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

Modified Files:
	pcscdaemon.c winscard_msg_srv.c 
Log Message:
do not log an error if select() is interrupted because of a manual
hotplug signal (SIGUSR1)


--- /cvsroot/pcsclite/PCSC/src/pcscdaemon.c	2005/05/26 13:03:40	1.61
+++ /cvsroot/pcsclite/PCSC/src/pcscdaemon.c	2005/05/26 13:05:25	1.62
@@ -5,7 +5,7 @@
  *  David Corcoran <corcoran@linuxnet.com>
  *  Ludovic Rousseau <ludovic.rousseau@free.fr>
  *
- * $Id: pcscdaemon.c,v 1.61 2005/05/26 13:03:40 rousseau Exp $
+ * $Id: pcscdaemon.c,v 1.62 2005/05/26 13:05:25 rousseau Exp $
  */
 
 /**
@@ -50,6 +50,7 @@
 
 char AraKiri = FALSE;
 static char Init = TRUE;
+extern char ReCheckSerialReaders;
 
 /*
  * Some internal functions 
@@ -166,7 +167,8 @@
 			break;
 
 		case -1:
-			if (!AraKiri)
+			/* do not display if we are exiting or re-reading the config */
+			if ((!AraKiri) && (!ReCheckSerialReaders))
 				Log1(PCSC_LOG_ERROR, "Error in SHMProcessEventsServer");
 			break;
 
--- /cvsroot/pcsclite/PCSC/src/winscard_msg_srv.c	2005/05/25 14:17:23	1.2
+++ /cvsroot/pcsclite/PCSC/src/winscard_msg_srv.c	2005/05/26 13:05:25	1.3
@@ -6,7 +6,7 @@
  *  Damien Sauveron <damien.sauveron@labri.fr>
  *  Ludoic Rousseau <ludovic.rousseau@free.fr>
  *
- * $Id: winscard_msg_srv.c,v 1.2 2005/05/25 14:17:23 rousseau Exp $
+ * $Id: winscard_msg_srv.c,v 1.3 2005/05/26 13:05:25 rousseau Exp $
  */
 
 /**
@@ -47,6 +47,7 @@
  */
 static int commonSocket = 0;
 extern char AraKiri;
+extern char ReCheckSerialReaders;
 
 /**
  * @brief Accepts a Client connection.
@@ -185,7 +186,7 @@
 
 	if (selret < 0)
 	{
-		if (!AraKiri)
+		if ((!AraKiri) && (!ReCheckSerialReaders))
 			Log2(PCSC_LOG_CRITICAL, "Select returns with failure: %s",
 				strerror(errno));
 		return -1;