From 6217b4adf5eb5b87b63b13d09f1508b5c4fa1346 Mon Sep 17 00:00:00 2001
From: okir <okir@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Fri, 6 Dec 2002 21:40:41 +0000
Subject: [PATCH] - changed pcsc_detect_card_presence to call
 refresh_slot_attributes. This   eliminates duplicate code, and that we also
 pick up the new ATR if another   card was inserted in the meanwhil.

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@758 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/libopensc/reader-pcsc.c | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/libopensc/reader-pcsc.c b/src/libopensc/reader-pcsc.c
index f2c3f98f..7cb6fd78 100644
--- a/src/libopensc/reader-pcsc.c
+++ b/src/libopensc/reader-pcsc.c
@@ -179,28 +179,6 @@ static int pcsc_transmit(struct sc_reader *reader, struct sc_slot_info *slot,
 	return 0;
 }
 
-static int pcsc_detect_card_presence(struct sc_reader *reader, struct sc_slot_info *slot)
-{
-	struct pcsc_private_data *priv = GET_PRIV_DATA(reader);
-	LONG ret;
-	SCARD_READERSTATE_A rgReaderStates[SC_MAX_READERS];
-
-	rgReaderStates[0].szReader = priv->reader_name;
-	rgReaderStates[0].dwCurrentState = SCARD_STATE_UNAWARE;
-	rgReaderStates[0].dwEventState = SCARD_STATE_UNAWARE;
-	ret = SCardGetStatusChange(priv->pcsc_ctx, SC_STATUS_TIMEOUT, rgReaderStates, 1);
-	if (ret != 0) {
-		PCSC_ERROR(reader->ctx, "SCardGetStatusChange failed", ret);
-		SC_FUNC_RETURN(reader->ctx, 1, pcsc_ret_to_error(ret));
-	}
-	if (rgReaderStates[0].dwEventState & SCARD_STATE_PRESENT) {
-		slot->flags |= SC_SLOT_CARD_PRESENT;
-		return 1;
-	}
-	slot->flags &= ~SC_SLOT_CARD_PRESENT;
-	return 0;
-}
-
 static int refresh_slot_attributes(struct sc_reader *reader, struct sc_slot_info *slot)
 {
 	struct pcsc_private_data *priv = GET_PRIV_DATA(reader);
@@ -215,18 +193,28 @@ static int refresh_slot_attributes(struct sc_reader *reader, struct sc_slot_info
 		PCSC_ERROR(reader->ctx, "SCardGetStatusChange failed", ret);
 		return pcsc_ret_to_error(ret);
 	}
-	slot->flags = 0;
 	if (rgReaderStates[0].dwEventState & SCARD_STATE_PRESENT) {
-		slot->flags = SC_SLOT_CARD_PRESENT;
+		slot->flags |= SC_SLOT_CARD_PRESENT;
 		slot->atr_len = rgReaderStates[0].cbAtr;
 		if (slot->atr_len > SC_MAX_ATR_SIZE)
 			slot->atr_len = SC_MAX_ATR_SIZE;
 		memcpy(slot->atr, rgReaderStates[0].rgbAtr, slot->atr_len);
+	} else {
+		slot->flags &= ~SC_SLOT_CARD_PRESENT;
 	}
 
 	return 0;
 }
 
+static int pcsc_detect_card_presence(struct sc_reader *reader, struct sc_slot_info *slot)
+{
+	int rv;
+
+	if ((rv = refresh_slot_attributes(reader, slot)) < 0)
+		return rv;
+	return (slot->flags & SC_SLOT_CARD_PRESENT)? 1 : 0;
+}
+
 static int pcsc_connect(struct sc_reader *reader, struct sc_slot_info *slot)
 {
 	DWORD active_proto;
@@ -366,6 +354,7 @@ static int pcsc_init(struct sc_context *ctx, void **reader_data)
 				free(priv);
 			break;
 		}
+		memset(reader, 0, sizeof(*reader));
 		reader->drv_data = priv;
 		reader->ops = &pcsc_ops;
 		reader->driver = &pcsc_drv;