[Pcsclite-cvs-commit] PCSC/src tokenfactory.c,1.14,1.15

rousseau@quantz.debian.org rousseau@quantz.debian.org
Tue, 30 Sep 2003 22:08:55 +0200


Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv22593

Modified Files:
	tokenfactory.c 
Log Message:
having a trailing / in MSC_SVC_DROPDIR (--enable-muscledropdir) is no more mandatory


Index: tokenfactory.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/tokenfactory.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- tokenfactory.c	30 Sep 2003 19:56:14 -0000	1.14
+++ tokenfactory.c	30 Sep 2003 20:08:53 -0000	1.15
@@ -27,10 +27,10 @@
 
 #ifndef WIN32
 #ifndef MSC_SVC_DROPDIR
-#define MSC_SVC_DROPDIR                     "/usr/local/pcsc/services/"
+#define MSC_SVC_DROPDIR                     "/usr/local/pcsc/services"
 #endif
 #else
-#define MSC_SVC_DROPDIR                     "C:\\Program Files\\Muscle\\Services\\"
+#define MSC_SVC_DROPDIR                     "C:\\Program Files\\Muscle\\Services"
 #endif
 
 #define MSC_MANUMSC_KEY_NAME                "spVendorName"
@@ -182,11 +182,11 @@
 			 * vendor and product ID's for this particular bundle 
 			 */
 #ifndef WIN32
-			sprintf(fullPath, "%s%s%s", MSC_SVC_DROPDIR, currFP->d_name,
-				"/Contents/Info.plist");
+			sprintf(fullPath, "%s/%s/Contents/Info.plist", MSC_SVC_DROPDIR,
+				currFP->d_name);
 #else
-			sprintf(fullPath, "%s%s%s", MSC_SVC_DROPDIR, findData.cFileName,
-				"\\Contents\\Info.plist");
+			sprintf(fullPath, "%s\\%s\\Contents\\Info.plist", MSC_SVC_DROPDIR,
+				findData.cFileName);
 #endif
 
 			atrIndex = 0;
@@ -265,13 +265,13 @@
 					}
 				}
 #if defined(WIN32)
-				sprintf(fullLibPath, "%s%s%s%s", MSC_SVC_DROPDIR,
-					findData.cFileName, "\\Contents\\Win32\\", keyValue);
+				sprintf(fullLibPath, "%s\\%s\Contents\\Win32\\%s",
+					MSC_SVC_DROPDIR, findData.cFileName, keyValue);
 #elif defined(__APPLE__)
 				sprintf(fullLibPath, "%s%s", MSC_SVC_DROPDIR,
 					currFP->d_name);
 #else
-				sprintf(fullLibPath, "%s%s/Contents/%s%s", MSC_SVC_DROPDIR,
+				sprintf(fullLibPath, "%s/%s/Contents/%s/%s", MSC_SVC_DROPDIR,
 					currFP->d_name, PCSC_ARCH, keyValue);
 #endif