nixpkgs/pkgs/tools/security/pcsclite/no-dropdir-literals.patch
Kirill Elagin df3e661ac9 pcsclite: 1.9.4 -> 1.9.5
Also updated our patch:

* Refreshed offsets.
* hotplug_linux.c was removed upstream.
2021-12-04 23:03:02 -05:00

48 lines
1.6 KiB
Diff

diff --git a/src/hotplug_libudev.c b/src/hotplug_libudev.c
index 51bd95f..84f959b 100644
--- a/src/hotplug_libudev.c
+++ b/src/hotplug_libudev.c
@@ -120,7 +120,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;
}
@@ -741,7 +742,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 0ada9f5..d49a407 100644
--- a/src/hotplug_libusb.c
+++ b/src/hotplug_libusb.c
@@ -142,7 +142,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;
}
@@ -282,7 +283,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