* ccid-driver.c (ccid_open_reader): Return an error if no USB

devices are found.

* Makefile.am: Replaced INTLLIBS by LIBINTL.
This commit is contained in:
Werner Koch 2003-10-25 16:26:29 +00:00
parent ea5d88c430
commit e62874f1d1
3 changed files with 9 additions and 1 deletions

View File

@ -1,5 +1,10 @@
2003-10-25 Werner Koch <wk@gnupg.org>
* ccid-driver.c (ccid_open_reader): Return an error if no USB
devices are found.
* Makefile.am: Replaced INTLLIBS by LIBINTL.
* g10.c (main) [ENABLE_CARD_SUPPORT]: Add a default for
--pcsc-driver.

View File

@ -124,7 +124,7 @@ gpgv_SOURCES = gpgv.c \
# ks-db.h \
# $(common_source)
LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ @W32LIBS@
LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @ZLIBS@ @W32LIBS@
# gpg gets LIBOBJS to add in mkdtemp if the platform doesn't have it
gpg_LDADD = @LIBOBJS@ $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB_LIBS@

View File

@ -494,6 +494,9 @@ ccid_open_reader (ccid_driver_t *handle, int readerno)
shallow copy of the list created internally by usb_init ? */
usb_free_match (match);
if (!rc && !*handle)
rc = -1; /* In case we didn't enter the while lool at all. */
return rc;
}