pkgs/tools/security/pcsclite/no-dropdir-literals.patch

   1 diff --git a/src/hotplug_libudev.c b/src/hotplug_libudev.c
   2 index 51bd95f..84f959b 100644
   3 --- a/src/hotplug_libudev.c
   4 +++ b/src/hotplug_libudev.c
   5 @@ -120,7 +120,8 @@ static LONG HPReadBundleValues(void)
   6
   7         if (NULL == hpDir)
   8         {
   9 -               Log1(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR);
  10 +               Log2(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: %s",
  11 +                       PCSCLITE_HP_DROPDIR);
  12                 Log1(PCSC_LOG_ERROR, "Disabling USB support for pcscd.");
  13                 return -1;
  14         }
  15 @@ -741,7 +742,7 @@ ULONG HPRegisterForHotplugEvents(void)
  16
  17         if (driverSize <= 0)
  18         {
  19 -               Log1(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: "
  20 +               Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s",
  21                         PCSCLITE_HP_DROPDIR);
  22                 Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
  23                 return 0;
  24 diff --git a/src/hotplug_libusb.c b/src/hotplug_libusb.c
  25 index 0ada9f5..d49a407 100644
  26 --- a/src/hotplug_libusb.c
  27 +++ b/src/hotplug_libusb.c
  28 @@ -142,7 +142,8 @@ static LONG HPReadBundleValues(void)
  29
  30         if (hpDir == NULL)
  31         {
  32 -               Log1(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR);
  33 +               Log2(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: %s",
  34 +                       PCSCLITE_HP_DROPDIR);
  35                 Log1(PCSC_LOG_ERROR, "Disabling USB support for pcscd.");
  36                 return -1;
  37         }
  38 @@ -282,7 +283,8 @@ static LONG HPReadBundleValues(void)
  39
  40         if (driverSize == 0)
  41         {
  42 -               Log1(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: " PCSCLITE_HP_DROPDIR);
  43 +               Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s",
  44 +                       PCSCLITE_HP_DROPDIR);
  45                 Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd");
  46         }
  47  #ifdef DEBUG_HOTPLUG