mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-15 17:25:11 +00:00
70246d7cfa
This allows to override the directory where PCSC-Lite searches for USB
drivers at runtime and should make our NixOS module much more clean so
that we don't need to imperatively stitch together plugin directories
anymore.
I'm using a GNU extension for the ternary operator to avoid computing
getenv("PCSCLITE_HP_DROPDIR") twice:
https://gcc.gnu.org/onlinedocs/gcc/Conditionals.html#Conditionals
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @viric, @wkennington
74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
diff --git a/src/hotplug_libudev.c b/src/hotplug_libudev.c
|
|
index a8ba1b8..a53700b 100644
|
|
--- a/src/hotplug_libudev.c
|
|
+++ b/src/hotplug_libudev.c
|
|
@@ -119,7 +119,8 @@ static LONG HPReadBundleValues(void)
|
|
|
|
if (NULL == hpDir)
|
|
{
|
|
- Log1(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR);
|
|
+ Log2(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: %s",
|
|
+ PCSCLITE_HP_DROPDIR);
|
|
Log1(PCSC_LOG_ERROR, "Disabling USB support for pcscd.");
|
|
return -1;
|
|
}
|
|
@@ -722,7 +723,7 @@ ULONG HPRegisterForHotplugEvents(void)
|
|
|
|
if (driverSize <= 0)
|
|
{
|
|
- Log1(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: "
|
|
+ Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s",
|
|
PCSCLITE_HP_DROPDIR);
|
|
Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
|
|
return 0;
|
|
diff --git a/src/hotplug_libusb.c b/src/hotplug_libusb.c
|
|
index eff8519..8dd496d 100644
|
|
--- a/src/hotplug_libusb.c
|
|
+++ b/src/hotplug_libusb.c
|
|
@@ -138,7 +138,8 @@ static LONG HPReadBundleValues(void)
|
|
|
|
if (hpDir == NULL)
|
|
{
|
|
- Log1(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR);
|
|
+ Log2(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: %s",
|
|
+ PCSCLITE_HP_DROPDIR);
|
|
Log1(PCSC_LOG_ERROR, "Disabling USB support for pcscd.");
|
|
return -1;
|
|
}
|
|
@@ -265,7 +266,8 @@ static LONG HPReadBundleValues(void)
|
|
|
|
if (driverSize == 0)
|
|
{
|
|
- Log1(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: " PCSCLITE_HP_DROPDIR);
|
|
+ Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s",
|
|
+ PCSCLITE_HP_DROPDIR);
|
|
Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
|
|
}
|
|
#ifdef DEBUG_HOTPLUG
|
|
diff --git a/src/hotplug_linux.c b/src/hotplug_linux.c
|
|
index bf69af8..64b0ed7 100644
|
|
--- a/src/hotplug_linux.c
|
|
+++ b/src/hotplug_linux.c
|
|
@@ -130,8 +130,8 @@ static LONG HPReadBundleValues(void)
|
|
|
|
if (hpDir == NULL)
|
|
{
|
|
- Log1(PCSC_LOG_INFO,
|
|
- "Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR);
|
|
+ Log2(PCSC_LOG_INFO, "Cannot open PC/SC drivers directory: %s",
|
|
+ PCSCLITE_HP_DROPDIR);
|
|
Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd.");
|
|
return -1;
|
|
}
|
|
@@ -219,8 +219,8 @@ end:
|
|
|
|
if (bundleSize == 0)
|
|
{
|
|
- Log1(PCSC_LOG_INFO,
|
|
- "No bundle files in pcsc drivers directory: " PCSCLITE_HP_DROPDIR);
|
|
+ Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s",
|
|
+ PCSCLITE_HP_DROPDIR);
|
|
Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
|
|
}
|
|
|