From e917c07b2664bb01a5f7b5975723b90da0f396c9 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 3 Jan 2012 22:12:37 +0100 Subject: Port to npth. * configure.ac: Don't check for PTH but for NPTH. (AH_BOTTOM): Remove PTH_SYSCALL_SOFT. (have_pth): Rename to ... (have_npth): ... this. (USE_GNU_NPTH): Rename to ... (USE_GNU_PTH): ... this. * m4/npth.m4: New file. * agent/Makefile.am, agent/cache.c, agent/call-pinentry.c, agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c, agent/trustlist.c, common/Makefile.am, common/estream.c, common/exechelp-posix.c, common/exechelp-w32.c, common/exechelp-w32ce.c, common/http.c, common/init.c, common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c, dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c, dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am, g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am, scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c, scd/scdaemon.c, tools/Makefile.am: Port to npth. --- scd/apdu.c | 73 ++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 30 deletions(-) (limited to 'scd/apdu.c') diff --git a/scd/apdu.c b/scd/apdu.c index 70c28cd30..064f0d636 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -19,7 +19,7 @@ */ /* NOTE: This module is also used by other software, thus the use of - the macro USE_GNU_PTH is mandatory. For GnuPG this macro is + the macro USE_NPTH is mandatory. For GnuPG this macro is guaranteed to be defined true. */ #include @@ -29,10 +29,10 @@ #include #include #include -#ifdef USE_GNU_PTH +#ifdef USE_NPTH # include # include -# include +# include #endif @@ -67,7 +67,7 @@ /* Due to conflicting use of threading libraries we usually can't link against libpcsclite. Instead we use a wrapper program. */ -#ifdef USE_GNU_PTH +#ifdef USE_NPTH #if !defined(HAVE_W32_SYSTEM) && !defined(__CYGWIN__) #define NEED_PCSC_WRAPPER 1 #endif @@ -144,9 +144,9 @@ struct reader_table_s { not yet been read; i.e. the card is not ready for use. */ unsigned int change_counter; -#ifdef USE_GNU_PTH +#ifdef USE_NPTH int lock_initialized; - pth_mutex_t lock; + npth_mutex_t lock; #endif }; typedef struct reader_table_s *reader_table_t; @@ -352,6 +352,7 @@ static int new_reader_slot (void) { int i, reader = -1; + int err; for (i=0; i < MAX_READER; i++) { @@ -363,17 +364,18 @@ new_reader_slot (void) log_error ("new_reader_slot: out of slots\n"); return -1; } -#ifdef USE_GNU_PTH +#ifdef USE_NPTH if (!reader_table[reader].lock_initialized) { - if (!pth_mutex_init (&reader_table[reader].lock)) + err = npth_mutex_init (&reader_table[reader].lock, NULL); + if (err) { - log_error ("error initializing mutex: %s\n", strerror (errno)); + log_error ("error initializing mutex: %s\n", strerror (err)); return -1; } reader_table[reader].lock_initialized = 1; } -#endif /*USE_GNU_PTH*/ +#endif /*USE_NPTH*/ reader_table[reader].connect_card = NULL; reader_table[reader].disconnect_card = NULL; reader_table[reader].close_reader = NULL; @@ -698,8 +700,8 @@ writen (int fd, const void *buf, size_t nbytes) while (nleft > 0) { -#ifdef USE_GNU_PTH - nwritten = pth_write (fd, buf, nleft); +#ifdef USE_NPTH + nwritten = npth_write (fd, buf, nleft); #else nwritten = write (fd, buf, nleft); #endif @@ -724,11 +726,11 @@ readn (int fd, void *buf, size_t buflen, size_t *nread) while (nleft > 0) { -#ifdef USE_GNU_PTH +#ifdef USE_NPTH # ifdef HAVE_W32_SYSTEM -# error Cannot use pth_read here because it expects a system HANDLE. +# error Cannot use npth_read here because it expects a system HANDLE. # endif - n = pth_read (fd, buf, nleft); + n = npth_read (fd, buf, nleft); #else n = read (fd, buf, nleft); #endif @@ -1874,8 +1876,8 @@ open_pcsc_reader_wrapped (const char *portstr) slotp->pcsc.rsp_fd = rp[0]; /* Wait for the intermediate child to terminate. */ -#ifdef USE_GNU_PTH -#define WAIT pth_waitpid +#ifdef USE_NPTH +#define WAIT npth_waitpid #else #define WAIT waitpid #endif @@ -2117,6 +2119,8 @@ pcsc_keypad_verify (int slot, int class, int ins, int p0, int p1, pin_verify, len, result, &resultlen); xfree (pin_verify); if (sw || resultlen < 2) + return sw? sw : SW_HOST_INCOMPLETE_CARD_RESPONSE; + sw = (result[resultlen-2] << 8) | result[resultlen-1]; { log_error ("control_pcsc failed: %d\n", sw); return sw? sw: SW_HOST_INCOMPLETE_CARD_RESPONSE; @@ -2749,38 +2753,47 @@ open_rapdu_reader (int portno, static int lock_slot (int slot) { -#ifdef USE_GNU_PTH - if (!pth_mutex_acquire (&reader_table[slot].lock, 0, NULL)) +#ifdef USE_NPTH + int err; + + err = npth_mutex_lock (&reader_table[slot].lock); + if (err) { - log_error ("failed to acquire apdu lock: %s\n", strerror (errno)); + log_error ("failed to acquire apdu lock: %s\n", strerror (err)); return SW_HOST_LOCKING_FAILED; } -#endif /*USE_GNU_PTH*/ +#endif /*USE_NPTH*/ return 0; } static int trylock_slot (int slot) { -#ifdef USE_GNU_PTH - if (!pth_mutex_acquire (&reader_table[slot].lock, TRUE, NULL)) +#ifdef USE_NPTH + int err; + + err = npth_mutex_trylock (&reader_table[slot].lock); + if (err == EBUSY) + return SW_HOST_BUSY; + else if (err) { - if (errno == EBUSY) - return SW_HOST_BUSY; - log_error ("failed to acquire apdu lock: %s\n", strerror (errno)); + log_error ("failed to acquire apdu lock: %s\n", strerror (err)); return SW_HOST_LOCKING_FAILED; } -#endif /*USE_GNU_PTH*/ +#endif /*USE_NPTH*/ return 0; } static void unlock_slot (int slot) { -#ifdef USE_GNU_PTH - if (!pth_mutex_release (&reader_table[slot].lock)) +#ifdef USE_NPTH + int err; + + err = npth_mutex_unlock (&reader_table[slot].lock); + if (err) log_error ("failed to release apdu lock: %s\n", strerror (errno)); -#endif /*USE_GNU_PTH*/ +#endif /*USE_NPTH*/ } -- cgit v1.2.3