[Pcsclite-cvs-commit] r6215 - /trunk/PCSC/src/configfile.l
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Sat Feb 4 09:08:37 UTC 2012
Author: rousseau
Date: Sat Feb 4 09:08:36 2012
New Revision: 6215
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6215
Log:
Skip non regular or "hidden" config files
Closes Debian bug #658322 "pcscd: fails to start if config directory
contains subdirectories"
Modified:
trunk/PCSC/src/configfile.l
Modified: trunk/PCSC/src/configfile.l
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/configfile.l?rev=6215&op=diff
==============================================================================
--- trunk/PCSC/src/configfile.l (original)
+++ trunk/PCSC/src/configfile.l Sat Feb 4 09:08:36 2012
@@ -249,10 +249,21 @@
char filename[FILENAME_MAX];
int r;
- /* skip . and .. */
- if ((strcmp(direntry->d_name, ".") == 0) ||
- (strcmp(direntry->d_name, "..") == 0))
+ /* skip non regular files */
+ if (direntry->d_type != DT_REG)
+ {
+ Log2(PCSC_LOG_DEBUG, "Skipping non regular file: %s",
+ direntry->d_name);
continue;
+ }
+
+ /* skip files starting with . like ., .., .svn, etc */
+ if ('.' == direntry->d_name[0])
+ {
+ Log2(PCSC_LOG_DEBUG, "Skipping hidden file: %s",
+ direntry->d_name);
+ continue;
+ }
snprintf(filename, sizeof(filename), "%s/%s",
readerconf_dir, direntry->d_name);
More information about the Pcsclite-cvs-commit
mailing list