[Pcsclite-cvs-commit] r7041 - in trunk/PCSC/src: . PCSC

[ludovic.rousseau at free.fr]

Author: rousseau
Date: 2014-11-14 09:08:41 +0000 (Fri, 14 Nov 2014)
New Revision: 7041

Modified:
   trunk/PCSC/src/PCSC/ifdhandler.h
   trunk/PCSC/src/winscard_clnt.c
Log:
Specify the character set used for reader names

- PC/SC reader names are using UTF-8.

- Info.plist reader names must use the ASCII character set.
  Or even a subset of ASCII.

Since ASCII is a subset of UTF-8 we are fine. Reader names may become
full UTF-8 in a later version of pcsc-lite.

Thanks to David Woodhouse for the idea
http://lists.alioth.debian.org/pipermail/pcsclite-muscle/Week-of-Mon-20141110/000243.html


Modified: trunk/PCSC/src/PCSC/ifdhandler.h
===================================================================
--- trunk/PCSC/src/PCSC/ifdhandler.h	2014-11-09 20:35:19 UTC (rev 7040)
+++ trunk/PCSC/src/PCSC/ifdhandler.h	2014-11-14 09:08:41 UTC (rev 7041)
@@ -122,6 +122,8 @@
    <string>SCM Microsystems USB Reader</string>
 @endverbatim
 
+The reader name must use the ASCII character set.
+
 @subsection CFBundleExecutable
 
    The executable name which exists in the particular platform's directory.

Modified: trunk/PCSC/src/winscard_clnt.c
===================================================================
--- trunk/PCSC/src/winscard_clnt.c	2014-11-09 20:35:19 UTC (rev 7040)
+++ trunk/PCSC/src/winscard_clnt.c	2014-11-14 09:08:41 UTC (rev 7041)
@@ -2884,6 +2884,9 @@
  * If \c *pcchReaders is equal to \ref SCARD_AUTOALLOCATE then the function
  * will allocate itself the needed memory. Use SCardFreeMemory() to release it.
  *
+ * Encoding:
+ * The reader names and group names are encoded using UTF-8.
+ *
  * @ingroup API
  * @param[in] hContext Connection context to the PC/SC Resource Manager.
  * @param[in] mszGroups List of groups to list readers (not used).