New upstream version 1.4.30
This commit is contained in:
parent
93dc650f02
commit
6b2ce452cd
662
ChangeLog
662
ChangeLog
|
@ -1,4 +1,662 @@
|
|||
commit 70379da0cf79444d7035e0f42bea6f759f0a0886 (HEAD -> master, origin/master, origin/HEAD)
|
||||
commit db45750ebb2ce8d841f8e555e79f09108527aaa8 (HEAD -> master, origin/master, origin/HEAD)
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Wed Sep 19 09:33:32 2018 +0200
|
||||
|
||||
Release 1.4.30
|
||||
|
||||
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
|
||||
README | 26 ++++++++++++++++++++++++++
|
||||
configure.ac | 2 +-
|
||||
2 files changed, 27 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 8e25aca1e115546dc3d01f866ae1236d3f98275b
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Sep 7 16:25:10 2018 +0200
|
||||
|
||||
SafeNet eToken 5300 new firmware
|
||||
|
||||
firmware changed from 0.12 to 0.15. No other visible changes.
|
||||
|
||||
readers/SafeNet_eToken_5300.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
commit 62f66e488d0742fc4b6f71bc0f4465406dd55a59
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Sep 14 14:39:34 2018 +0200
|
||||
|
||||
InterruptRead(): revert change 68ece95c8e
|
||||
|
||||
The value in transfer->status is not a libusb_error but a
|
||||
libusb_transfer_status.
|
||||
|
||||
We can't use libusb_error_name() on this value unless we only want to
|
||||
see LIBUSB_ERROR_UNKNOWN values
|
||||
|
||||
src/ccid_usb.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
commit 36fa4611f9fa4d8bafb3e888f13d97f90a3a7b6e
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Tue Sep 4 18:06:31 2018 +0200
|
||||
|
||||
Disable the REINER SCT cyberJack RFID standard
|
||||
|
||||
Move from the "should work" to "disabled" list on Reiner SCT request.
|
||||
|
||||
readers/supported_readers.txt | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
commit 68ece95c8e4fd05a37b10944dce2f1a819fbd3c8
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Aug 31 14:52:03 2018 +0200
|
||||
|
||||
InterruptStop(): Log the libusb text instead of number
|
||||
|
||||
If libusb_cancel_transfer() fails we now use libusb_error_name() to get the
|
||||
error message in text instead of just the error number.
|
||||
|
||||
The log message is now
|
||||
00000008 ccid_usb.c:1399:InterruptStop() libusb_cancel_transfer failed: LIBUSB_ERROR_NOT_FOUND
|
||||
instead of:
|
||||
00000007 ccid_usb.c:1399:InterruptStop() libusb_cancel_transfer failed: -5
|
||||
|
||||
src/ccid_usb.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 6d2bebccdae215eb6cc63560ab573dd6aad589c3
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Aug 27 21:58:43 2018 +0200
|
||||
|
||||
Use new Yubico YubiKey names
|
||||
|
||||
readers/supported_readers.txt | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
commit 96c6cf1286f75f2624ba4d58db4c342c3cd6371d
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Aug 27 21:55:15 2018 +0200
|
||||
|
||||
Yubikey 4 OTP+U2F+CCID firmware upgrade
|
||||
|
||||
bcdDevice updated from 4.37 to 5.03
|
||||
- new iProduct "YubiKey OTP+FIDO+CCID"
|
||||
- new dwMaxIFSD: 3062
|
||||
|
||||
readers/Yubico_Yubikey_4_OTP+U2F+CCID.txt | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
commit 78e939ffb565c014de3ce931f49d179b4e6801aa
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Aug 27 21:53:56 2018 +0200
|
||||
|
||||
Yubikey 4 U2F+CCID firmware upgrade
|
||||
|
||||
bcdDevice updated from 4.20 to 5.03
|
||||
- new iProduct "YubiKey FIDO+CCID"
|
||||
- new dwMaxIFSD: 3062
|
||||
- new dwMaxCCIDMessageLength: 3072 bytes
|
||||
|
||||
readers/Yubico_Yubikey_4_U2F+CCID.txt | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
commit b940e3e9400d20917cdd90f0b56ac90f48994394
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Aug 27 21:51:01 2018 +0200
|
||||
|
||||
Yubikey 4 OTP+CCID firmware update
|
||||
|
||||
bcdDevice updated from 4.20 to 5.03
|
||||
- new iProduct "YubiKey OTP+CCID"
|
||||
- new dwMaxIFSD: 3062
|
||||
- new dwMaxCCIDMessageLength: 3072 bytes
|
||||
|
||||
readers/Yubico_Yubikey_4_OTP+CCID.txt | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
commit 9938ed502655228fa11f1ed961840051a07dbc14
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Aug 27 21:48:33 2018 +0200
|
||||
|
||||
Yubikey 4 CCID firmware update
|
||||
|
||||
bcdDevice updated from 4.20 to 5.03
|
||||
- new iProduct "YubiKey CCID"
|
||||
- new dwMaxIFSD: 3062
|
||||
- new dwMaxCCIDMessageLength: 3072 bytes
|
||||
|
||||
readers/Yubico_Yubikey_4_CCID.txt | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
commit 1859b3d23668e68065e6cf0a1965b266f65e3fa5
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Aug 27 19:05:10 2018 +0200
|
||||
|
||||
Add ACS ACR33 ICC Reader
|
||||
|
||||
readers/acs_acr33u.txt | 52 +++++++++++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 ++-
|
||||
2 files changed, 54 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 452fb5a64dc5424baa6932ba1dec3eb28572e3a4
|
||||
Author: Nicolas Schneider <nioncode+git@gmail.com>
|
||||
Date: Sun Aug 26 15:41:20 2018 +0200
|
||||
|
||||
Fix leaking an allocated bundle in case no matching reader was found
|
||||
|
||||
src/ccid_usb.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
commit 06ae9756e9fe80216a432a2a5c1dabb128ea8b28
|
||||
Author: Nicolas Schneider <nioncode+git@gmail.com>
|
||||
Date: Sat Aug 25 13:02:05 2018 +0200
|
||||
|
||||
Fix libusb config descriptor leak
|
||||
|
||||
The descriptor received from libusb_get_active_config_descriptor was
|
||||
never freed. Thus, when opening a channel repeatedly, more and more
|
||||
memory was leaked (tested with valgrind).
|
||||
|
||||
src/ccid_usb.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
commit 33748489fda8497e91bf9fef16257f9a840d8f6e
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Jul 27 19:40:20 2018 +0200
|
||||
|
||||
Add Certgate GmbH AirID 2 USB
|
||||
|
||||
readers/Certgate_AirID_2_USB.txt | 49 ++++++++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 5 +++-
|
||||
2 files changed, 53 insertions(+), 1 deletion(-)
|
||||
|
||||
commit ce2acdb9fe5e8f4381b3ff8a7ec81f6ef9afcbfd
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Jul 16 20:52:09 2018 +0200
|
||||
|
||||
Update Cherry_KC_1000_SC_Z
|
||||
|
||||
New firmware with extended APDU support
|
||||
|
||||
readers/Cherry_KC_1000_SC_Z.txt | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
commit 75c92f7365432b0cac2b4e3be82d44070c72fe34
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Jul 16 20:45:00 2018 +0200
|
||||
|
||||
Update Cherry_KC_1000_SC
|
||||
|
||||
New firmware with extended APDU support
|
||||
|
||||
readers/Cherry_KC_1000_SC.txt | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
commit bd81ab573ff91febee83c699e178c5e0f146c0f1
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Jul 16 20:30:54 2018 +0200
|
||||
|
||||
Fix FujitsuTechnologySolutions GmbH Keyboard KB SCR2 name
|
||||
|
||||
readers/supported_readers.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
commit 3cd2999f79ff47a72c4f3651e98da13af5c169a1
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Jul 16 20:24:20 2018 +0200
|
||||
|
||||
Update FujitsuTechnologySolutions_Keyboard_KB100_SCR_eSIG
|
||||
|
||||
New firmware with extended APDU support.
|
||||
|
||||
readers/FujitsuTechnologySolutions_Keyboard_KB100_SCR_eSIG.txt | 9 +++++----
|
||||
readers/supported_readers.txt | 2 +-
|
||||
2 files changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
commit 6b37041bb958031fa213b0c51a1d004f9d566876
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Jul 16 20:20:43 2018 +0200
|
||||
|
||||
Update FujitsuTechnologySolutions_Keyboard_KB100_SCR
|
||||
|
||||
New firmware with extended APDU support.
|
||||
|
||||
readers/FujitsuTechnologySolutions_Keyboard_KB100_SCR.txt | 9 +++++----
|
||||
readers/supported_readers.txt | 4 ++--
|
||||
2 files changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
commit 39c7ed6b83bf75fc3eb7fbd3a31e96526c8146ba
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Jul 16 20:06:00 2018 +0200
|
||||
|
||||
Update Fujitsu_Smartcard_Reader_D323 descriptor
|
||||
|
||||
The reader now has extended APDU support.
|
||||
|
||||
readers/Fujitsu_Smartcard_Reader_D323.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
commit 6021465a8330021bf4399ee2bd65e4d0bcd6f476 (github/master)
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Jul 9 15:53:41 2018 +0200
|
||||
|
||||
macOS: exit configure with an error when needed
|
||||
|
||||
If the script is not launched from the correct place then exit with an
|
||||
error code.
|
||||
|
||||
MacOSX/configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
commit cb9b92e7284286e518f29e798442ba0bde0a4f99
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Jul 9 15:51:49 2018 +0200
|
||||
|
||||
macOS: exit configure with an error when needed
|
||||
|
||||
If an incorrect configuration for libusb is found then exit with an
|
||||
error code instead of 0.
|
||||
|
||||
MacOSX/configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
commit 1b8b0e6ba0109fdc54e086ee78c35b5316cd5c91
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri May 25 12:20:25 2018 +0200
|
||||
|
||||
Add Broadcom Corp 58200
|
||||
|
||||
readers/Broadcom_58200.txt | 106 ++++++++++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 +-
|
||||
2 files changed, 108 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 696fa6b1e6bf5ff7783af7be688fffc4e7dc4fda
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri May 18 17:57:44 2018 +0200
|
||||
|
||||
PCSC submodule: resync to PCSC/master
|
||||
|
||||
PCSC | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
commit 6e26122ef8155ad4ebe28551497fbcf4dfe7927a
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri May 18 17:24:19 2018 +0200
|
||||
|
||||
supported_readers: fix CCID URL
|
||||
|
||||
Move from pcsclite.alioth.debian.org to ccid.apdu.fr
|
||||
|
||||
readers/supported_readers.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
commit e3d71e025d479f7a2082c61a2302014cd65e3783
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri May 18 17:23:05 2018 +0200
|
||||
|
||||
INSTALL: fix CCID URL
|
||||
|
||||
Move from pcsclite.alioth.debian.org to ccid.apdu.fr
|
||||
|
||||
INSTALL | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
commit a912fcc33febadef1db0afb003141b27478bdd54
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri May 18 17:19:02 2018 +0200
|
||||
|
||||
README: fix reader list URLs
|
||||
|
||||
Move from pcsclite.alioth.debian.org to ccid.apdu.fr
|
||||
|
||||
README | 13 ++++++-------
|
||||
1 file changed, 6 insertions(+), 7 deletions(-)
|
||||
|
||||
commit 85d33a8ff31d42ed3651659499f54602106bd8fc
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Tue May 1 18:40:16 2018 +0200
|
||||
|
||||
Add Genesys Logic Combo Card Reader
|
||||
|
||||
readers/Genesys_Logic_Combo_Card_Reader.txt | 112 ++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 1 +
|
||||
2 files changed, 113 insertions(+)
|
||||
|
||||
commit ffaee8fe1456e9c2197d1c9ba61d0bf041492edd
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Tue May 1 18:38:55 2018 +0200
|
||||
|
||||
Add Genesys Logic CCID Card Reader
|
||||
|
||||
readers/Genesys_Logic_CCID_Card_Reader.txt | 112 +++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 5 +-
|
||||
2 files changed, 116 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 0bfd7b0f3463096c9beff78e2c50c04d908219a2
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Sat Apr 21 09:51:18 2018 +0200
|
||||
|
||||
Yubico_Yubikey_4_OTP+U2F+CCID: update firmware to 4.37
|
||||
|
||||
dwMaxCCIDMessageLength moved from 2048 to 3072 bytes
|
||||
|
||||
readers/Yubico_Yubikey_4_OTP+U2F+CCID.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
commit bae63c43c7eb66f391d8c713fbc4fb3baf38d9e3
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Sun Mar 18 17:36:56 2018 +0100
|
||||
|
||||
Remove submodule contrib_libPCSCv2part10
|
||||
|
||||
contrib_libPCSCv2part10 | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
commit c60b86a94fb336cb72d770af48b30fa73e17179f
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Sun Mar 18 17:24:06 2018 +0100
|
||||
|
||||
Update links for PCSCv2part10.{c,h}
|
||||
|
||||
The submodule has been renamed PCSC-contrib.
|
||||
|
||||
examples/PCSCv2part10.c | 2 +-
|
||||
examples/PCSCv2part10.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
commit c5fd7d7eba45d9355ea780ede8585ec791d3537a
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Sun Mar 18 17:21:39 2018 +0100
|
||||
|
||||
.gitmodules: Use a relative path for PCSC-contrib
|
||||
|
||||
Do not hardcode the git repository in the URL but use a relative path so
|
||||
that "git clone --recursive" will work for
|
||||
https://salsa.debian.org/rousseau/CCID.git,
|
||||
https://github.com/LudovicRousseau/CCID.git and also for git@ URLs.
|
||||
|
||||
.gitmodules | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
commit 2e1bb2a24c68af26d75bef7e3dc117641272aade
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Sun Mar 18 17:20:45 2018 +0100
|
||||
|
||||
ylwrap: update to version 2018-03-07
|
||||
|
||||
ylwrap | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
commit 5346af31baa739355f48750cc51889aa34b7d10f
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Sun Mar 18 17:15:56 2018 +0100
|
||||
|
||||
Add PCSC-contrib submodule
|
||||
|
||||
.gitmodules | 2 +-
|
||||
PCSC-contrib | 1 +
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
commit c07b89ed40cced3410c218e19ec39f9f491fe9ee
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Sun Mar 18 16:44:17 2018 +0100
|
||||
|
||||
submodule contrib is renamed PCSC-contrib
|
||||
|
||||
The upsteam repository is https://salsa.debian.org/rousseau/PCSC-contrib
|
||||
|
||||
.gitmodules | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
commit 85bd9cb85743f52fc4038d139a3032b510738337
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Thu Mar 15 16:48:50 2018 +0100
|
||||
|
||||
Add BIFIT ANGARA
|
||||
|
||||
readers/BIFIT_ANGARA.txt | 51 +++++++++++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 ++-
|
||||
2 files changed, 53 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 239336aee5d0c0b7a0ffbed8ed7d080d421f8b13
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Mar 2 14:11:33 2018 +0100
|
||||
|
||||
Add DC.Ltd DC4 5CCID READER
|
||||
|
||||
readers/DC_DC4_5CCID_READER.txt | 211 ++++++++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 5 +-
|
||||
2 files changed, 215 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 733d60d0a1b40959c11b5210093e326ce220dfdd
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Feb 23 23:46:32 2018 +0100
|
||||
|
||||
Add Spyrus Inc WorkSafe Pro (ProductID 0x3117)
|
||||
|
||||
readers/Spyrus_WorkSafe_Pro_0x3117.txt | 49 ++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 1 +
|
||||
2 files changed, 50 insertions(+)
|
||||
|
||||
commit ad3b30c4f70a1facbe06cd057fd4e77da6458872
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Feb 23 23:23:30 2018 +0100
|
||||
|
||||
Add InfoThink IT-500U Reader
|
||||
|
||||
readers/InfoThink_IT-500U_Reader.txt | 64 ++++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 +-
|
||||
2 files changed, 66 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 7ab9a8b3d2c91a9588388c489252628afc0469d0 (tag: ccid-1.4.29)
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Wed Feb 21 09:43:01 2018 +0100
|
||||
|
||||
Release 1.4.29
|
||||
|
||||
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
|
||||
README | 17 +++++++++++++++++
|
||||
configure.ac | 2 +-
|
||||
2 files changed, 18 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 7db748a330b1387d496ced77a9182dbb9b4492dc
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Tue Feb 20 22:35:48 2018 +0100
|
||||
|
||||
Add Spyrus Inc WorkSafe Pro
|
||||
|
||||
readers/Spyrus_WorkSafe_Pro.txt | 49 +++++++++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 ++-
|
||||
2 files changed, 51 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 4f7760eb4fb23ea867a542d2d3abb4e24b312145
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Mon Feb 19 21:55:41 2018 +0100
|
||||
|
||||
Add Spyrus Inc Rosetta USB
|
||||
|
||||
readers/Spyrus_Rosetta_USB.txt | 49 ++++++++++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 ++-
|
||||
2 files changed, 51 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 11040a13bddc7ebb1ce10f854e21930942a76731
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Thu Feb 1 18:18:38 2018 +0100
|
||||
|
||||
Add KeyXentic Inc. KX906 Smart Card Reader
|
||||
|
||||
readers/KeyXentic_KX906_Smart_Card_Reader.txt | 65 +++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 5 ++-
|
||||
2 files changed, 69 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 146d4d9848e0ef2c2be9a197596e88af11b9b767
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Wed Jan 31 13:50:46 2018 +0100
|
||||
|
||||
Add Watchdata USB Key (idProduct: 0x0418)
|
||||
|
||||
readers/Watchdata_USB_Key3.txt | 47 ++++++++++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 ++-
|
||||
2 files changed, 49 insertions(+), 1 deletion(-)
|
||||
|
||||
commit b9d0f0fa72d5f39a994885ec4a7cc3833a1a9f6e
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Thu Jan 25 19:07:06 2018 +0100
|
||||
|
||||
Add HID Global OMNIKEY 5027CK CCID CONFIG IF
|
||||
|
||||
.../HID_Global_OMNIKEY_5027CK_CCID_CONFIG_IF.txt | 154 +++++++++++++++++++++
|
||||
readers/supported_readers.txt | 1 +
|
||||
2 files changed, 155 insertions(+)
|
||||
|
||||
commit 9ea5c611b37a8aeb916fcdf9d6f09549049231ae
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Thu Jan 25 19:05:26 2018 +0100
|
||||
|
||||
Add HID Global OMNIKEY 5023 Smart Card Reader
|
||||
|
||||
.../HID_Global_OMNIKEY_5023_Smart_Card_Reader.txt | 162 +++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 +-
|
||||
2 files changed, 164 insertions(+), 1 deletion(-)
|
||||
|
||||
commit a27a11711a9861acea3a9b43bba56ba157c670af
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Sun Jan 21 13:15:19 2018 +0100
|
||||
|
||||
The C3PO LTC31 v2 wrongly declares PIN support
|
||||
|
||||
The new firmware is bogus and declares PIN support but the reader has no
|
||||
pinpad.
|
||||
|
||||
Thanks to Jose Ramon Alvarez-Sanchez for the bug report.
|
||||
|
||||
src/ccid.c | 2 ++
|
||||
src/ccid.h | 1 +
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
commit 6ddc11399c4865eec15412d10b868667d94e5ff9
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Sun Jan 21 13:13:37 2018 +0100
|
||||
|
||||
LTC31v2: firmware upgrade from 0.50 to 2.50
|
||||
|
||||
The new firmware is bogus and declares PIN support but the reader has no
|
||||
pinpad.
|
||||
|
||||
Thanks to Jose Ramon Alvarez-Sanchez
|
||||
|
||||
readers/LTC31v2.txt | 16 +++++++++-------
|
||||
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
commit e637b6f1e3cc097d985dd1d49ac6e9b3831ca2c0
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Wed Nov 29 13:28:14 2017 +0100
|
||||
|
||||
Add Bit4id Digital-DNA Key
|
||||
|
||||
readers/Bit4id_Digital-DNA_Key_NO_BT.txt | 47 ++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 1 +
|
||||
2 files changed, 48 insertions(+)
|
||||
|
||||
commit 0bc1104293c6a61f3e6fdfbd337a515020d7d4d2
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Wed Nov 29 13:23:12 2017 +0100
|
||||
|
||||
Add Bit4id Digital-DNA Key BT
|
||||
|
||||
readers/Bit4id_Digital-DNA_Key_BT.txt | 47 +++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 ++-
|
||||
2 files changed, 49 insertions(+), 1 deletion(-)
|
||||
|
||||
commit ba726e894641c11df8054428da4256112a392417
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Nov 10 18:05:14 2017 +0100
|
||||
|
||||
Add Chicony HP Skylab USB Smartcard Keyboard
|
||||
|
||||
.../Chicony_HP_Skylab_USB_Smartcard_Keyboard.txt | 58 ++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 +-
|
||||
2 files changed, 60 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 373a0af0f91fde530ddd782e991a78bf42e7124d
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Oct 27 15:09:36 2017 +0200
|
||||
|
||||
IFDHControl: fix comment
|
||||
|
||||
src/ifdhandler.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
commit a9bab4d43756f3a4ecca490667897b8a7cc1e444
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Tue Oct 24 17:31:33 2017 +0200
|
||||
|
||||
Firmware upgrade for HID_Global_OMNIKEY_6121_Smart_Card_Reader
|
||||
|
||||
.../HID_Global_OMNIKEY_6121_Smart_Card_Reader.txt | 26 +++++++++++++---------
|
||||
1 file changed, 15 insertions(+), 11 deletions(-)
|
||||
|
||||
commit 76cc52bc4a1de391d87b840f8927e16aa2eec513
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Tue Oct 24 17:30:41 2017 +0200
|
||||
|
||||
Firmware upgrade for HID_Global_OMNIKEY_3x21_Smart_Card_Reader
|
||||
|
||||
.../HID_Global_OMNIKEY_3x21_Smart_Card_Reader.txt | 26 +++++++++++++---------
|
||||
1 file changed, 15 insertions(+), 11 deletions(-)
|
||||
|
||||
commit 20f2b6804f0b43b7e077993c317cb72e18f2debf
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Oct 20 18:18:42 2017 +0200
|
||||
|
||||
Add Bluink Ltd. Bluink CCID
|
||||
|
||||
readers/Bluink_CCID.txt | 61 +++++++++++++++++++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 +++
|
||||
2 files changed, 64 insertions(+)
|
||||
|
||||
commit 49b6709a7969a0d6a61f50eb65a142888ff156d1
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Oct 20 18:13:02 2017 +0200
|
||||
|
||||
Add Access IS NFC Smart Module
|
||||
|
||||
With idProduct 0x0164
|
||||
|
||||
readers/Access_IS_NFC_Smart_Module_0x0164.txt | 277 ++++++++++++++++++++++++++
|
||||
readers/supported_readers.txt | 3 +-
|
||||
2 files changed, 279 insertions(+), 1 deletion(-)
|
||||
|
||||
commit 63f13f83b2bac864460eba0a04bcca40750ed879
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Fri Oct 20 17:46:08 2017 +0200
|
||||
|
||||
Remove extra_egt() causing problems
|
||||
|
||||
Problem with ATR 3B DF 18 FF 81 F1 FE 43 00 3F 03 83 4D 49 46 41 52 45
|
||||
20 50 6C 75 73 20 53 41 4D 3B and reader "Elatec
|
||||
TWN4/B1.06/CPF3.05/S1SC1.32/P (Beta 3)".
|
||||
|
||||
The card declares TC1=0xFF
|
||||
The extra_egt() function replaces the value with 0x02 and the driver
|
||||
uses this value in the PC_to_RDR_ResetParameters.
|
||||
|
||||
From ISO 7816-3 2006 chapter "11.2 Character frame"
|
||||
" If N = 255, CGT = 11 etu in **both directions** of transmission."
|
||||
|
||||
So the card uses a CGT = 11 etu but the reader expects a CGT of a bit
|
||||
more than 12 etu. The card communicates faster than the reader expect.
|
||||
|
||||
This patch was introduced to use non-ISO/bogus cards more than 10 years
|
||||
ago. Now the patch is problematic so I remove it.
|
||||
|
||||
Thanks to Thomas Vetter for the bug report.
|
||||
|
||||
src/ifdhandler.c | 81 --------------------------------------------------------
|
||||
1 file changed, 81 deletions(-)
|
||||
|
||||
commit 70379da0cf79444d7035e0f42bea6f759f0a0886 (tag: ccid-1.4.28)
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Wed Oct 11 14:00:57 2017 +0200
|
||||
|
||||
|
@ -301,7 +959,7 @@ Date: Mon Jun 12 18:40:37 2017 +0200
|
|||
readers/supported_readers.txt | 5 +++-
|
||||
2 files changed, 57 insertions(+), 1 deletion(-)
|
||||
|
||||
commit a7dcbf296492f5056e1ba7abb8388531bb0a6708 (tag: ccid-1.4.27, github/master)
|
||||
commit a7dcbf296492f5056e1ba7abb8388531bb0a6708 (tag: ccid-1.4.27)
|
||||
Author: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
Date: Sun May 21 14:41:20 2017 +0200
|
||||
|
||||
|
|
5
INSTALL
5
INSTALL
|
@ -133,6 +133,5 @@ Test procedure:
|
|||
ccid_usb.c:224 Using USB bus/device: 001/047
|
||||
|
||||
If you don't see this the driver is not installed correctly or your
|
||||
reader is not yet supported. Read
|
||||
http://pcsclite.alioth.debian.org/ccid.html#CCID_compliant to know
|
||||
what to do.
|
||||
reader is not yet supported. Read https://ccid.apdu.fr/#CCID_compliant
|
||||
to know what to do.
|
||||
|
|
|
@ -34,7 +34,7 @@ then
|
|||
echo "ERROR!"
|
||||
echo "run ./MacOSX/configure from the source top directory"
|
||||
echo -e $NORMAL
|
||||
exit;
|
||||
exit -1
|
||||
fi
|
||||
|
||||
# find pcsc-lite header files in MacOSX/
|
||||
|
@ -56,7 +56,7 @@ then
|
|||
echo "*****************************"
|
||||
echo -en $NORMAL
|
||||
echo "Rename it to force a static link"
|
||||
exit
|
||||
exit -1
|
||||
fi
|
||||
|
||||
# RESPONSECODE is already defined by PCSC/wintypes.h
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* MUSCLE SmartCard Development ( http://pcsclite.alioth.debian.org/pcsclite.html )
|
||||
* MUSCLE SmartCard Development ( https://pcsclite.apdu.fr/ )
|
||||
*
|
||||
* Copyright (C) 1999-2004
|
||||
* David Corcoran <corcoran@musclecard.com>
|
||||
|
@ -125,7 +125,7 @@ PCSC_API void log_xxd(const int priority, const char *msg,
|
|||
|
||||
void DebugLogSuppress(const int);
|
||||
void DebugLogSetLogType(const int);
|
||||
int DebugLogSetCategory(const int);
|
||||
void DebugLogSetCategory(const int);
|
||||
void DebugLogCategory(const int, const unsigned char *, const int);
|
||||
PCSC_API void DebugLogSetLevel(const int level);
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* MUSCLE SmartCard Development ( http://pcsclite.alioth.debian.org/pcsclite.html )
|
||||
* MUSCLE SmartCard Development ( https://pcsclite.apdu.fr/ )
|
||||
*
|
||||
* Copyright (C) 1999-2004
|
||||
* David Corcoran <corcoran@musclecard.com>
|
||||
|
@ -98,9 +98,8 @@ also. You may chose not to support this feature but it is useful when
|
|||
reader vendors OEM products so you only distribute one driver.
|
||||
|
||||
|
||||
The CCID driver from Ludovic Rousseau
|
||||
http://pcsclite.alioth.debian.org/ccid.html uses this feature since the
|
||||
same driver supports many different readers.
|
||||
The CCID driver from Ludovic Rousseau https://ccid.apdu.fr/ uses this
|
||||
feature since the same driver supports many different readers.
|
||||
|
||||
@subsection ifdProductID
|
||||
|
||||
|
@ -617,16 +616,17 @@ don't mind loading a new driver for each reader then ignore Lun.
|
|||
- \ref TAG_IFD_THREAD_SAFE
|
||||
If the driver supports more than one reader (see
|
||||
\ref TAG_IFD_SIMULTANEOUS_ACCESS above) this tag indicates if the
|
||||
driver supports access to multiple readers at the same time.\n
|
||||
<tt>Value[0] = 1</tt> indicates the driver supports simultaneous accesses.
|
||||
driver supports access to multiple readers at the same time.
|
||||
- <tt>Value[0] = 0</tt>: the driver DOES NOT support simultaneous accesses.
|
||||
- <tt>Value[0] = 1</tt>: the driver supports simultaneous accesses.
|
||||
- \ref TAG_IFD_SLOTS_NUMBER
|
||||
Return the number of slots in this reader in <tt>Value[0]</tt>.
|
||||
- \ref TAG_IFD_SLOT_THREAD_SAFE
|
||||
If the reader has more than one slot (see \ref TAG_IFD_SLOTS_NUMBER
|
||||
above) this tag indicates if the driver supports access to multiple
|
||||
slots of the same reader at the same time.\n
|
||||
<tt>Value[0] = 1</tt> indicates the driver supports simultaneous slot
|
||||
accesses.
|
||||
slots of the same reader at the same time.
|
||||
- <tt>value[0] = 0</tt>: the driver supports only 1 slot access at a time.
|
||||
- <tt>value[0] = 1</tt>: the driver supports simultaneous slot accesses.
|
||||
- \ref TAG_IFD_POLLING_THREAD
|
||||
Unused/deprecated
|
||||
- \ref TAG_IFD_POLLING_THREAD_WITH_TIMEOUT
|
||||
|
@ -637,6 +637,10 @@ don't mind loading a new driver for each reader then ignore Lun.
|
|||
@endverbatim
|
||||
- \ref TAG_IFD_POLLING_THREAD_KILLABLE
|
||||
Tell if the polling thread can be killed (pthread_kill()) by pcscd
|
||||
- <tt>value[0] = 0</tt>: the driver can NOT be stopped using
|
||||
pthread_cancel(). The driver must then implement
|
||||
\ref TAG_IFD_STOP_POLLING_THREAD
|
||||
- <tt>value[0] = 1</tt>: the driver can be stopped using pthread_cancel()
|
||||
- \ref TAG_IFD_STOP_POLLING_THREAD
|
||||
Returns a pointer in @p Value to the function used to stop the polling
|
||||
thread returned by \ref TAG_IFD_POLLING_THREAD_WITH_TIMEOUT. The
|
||||
|
@ -649,6 +653,8 @@ don't mind loading a new driver for each reader then ignore Lun.
|
|||
|
||||
@return Error codes
|
||||
@retval IFD_SUCCESS Successful (\ref IFD_SUCCESS)
|
||||
@retval IFD_ERROR_INSUFFICIENT_BUFFER Buffer is too small (\ref IFD_ERROR_INSUFFICIENT_BUFFER)
|
||||
@retval IFD_COMMUNICATION_ERROR Error has occurred (\ref IFD_COMMUNICATION_ERROR)
|
||||
@retval IFD_ERROR_TAG Invalid tag given (\ref IFD_ERROR_TAG)
|
||||
@retval IFD_NO_SUCH_DEVICE The reader is no more present (\ref IFD_NO_SUCH_DEVICE)
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* MUSCLE SmartCard Development ( http://pcsclite.alioth.debian.org/pcsclite.html )
|
||||
* MUSCLE SmartCard Development ( https://pcsclite.apdu.fr/ )
|
||||
*
|
||||
* Copyright (C) 1999-2005
|
||||
* David Corcoran <corcoran@musclecard.com>
|
||||
|
|
26
Makefile.in
26
Makefile.in
|
@ -1,7 +1,7 @@
|
|||
# Makefile.in generated by automake 1.15 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.16.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -138,7 +138,7 @@ am__recursive_targets = \
|
|||
$(RECURSIVE_CLEAN_TARGETS) \
|
||||
$(am__extra_recursive_targets)
|
||||
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
|
||||
cscope distdir dist dist-all distcheck
|
||||
cscope distdir distdir-am dist dist-all distcheck
|
||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
|
||||
$(LISP)config.h.in
|
||||
# Read a list of newline-separated strings from the standard input,
|
||||
|
@ -163,8 +163,7 @@ CSCOPE = cscope
|
|||
DIST_SUBDIRS = $(SUBDIRS)
|
||||
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
|
||||
COPYING ChangeLog INSTALL NEWS README ar-lib compile \
|
||||
config.guess config.sub depcomp install-sh ltmain.sh missing \
|
||||
ylwrap
|
||||
config.guess config.sub install-sh ltmain.sh missing ylwrap
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
distdir = $(PACKAGE)-$(VERSION)
|
||||
top_distdir = $(distdir)
|
||||
|
@ -393,8 +392,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|||
echo ' $(SHELL) ./config.status'; \
|
||||
$(SHELL) ./config.status;; \
|
||||
*) \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
|
||||
esac;
|
||||
|
||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||
|
@ -536,7 +535,10 @@ distclean-tags:
|
|||
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
distdir: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) distdir-am
|
||||
|
||||
distdir-am: $(DISTFILES)
|
||||
$(am__remove_distdir)
|
||||
test -d "$(distdir)" || mkdir "$(distdir)"
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
|
@ -601,7 +603,7 @@ distdir: $(DISTFILES)
|
|||
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|
||||
|| chmod -R a+r "$(distdir)"
|
||||
dist-gzip: distdir
|
||||
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
||||
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
|
||||
$(am__post_remove_distdir)
|
||||
dist-bzip2: distdir
|
||||
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
|
||||
|
@ -626,7 +628,7 @@ dist-shar: distdir
|
|||
@echo WARNING: "Support for shar distribution archives is" \
|
||||
"deprecated." >&2
|
||||
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
|
||||
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
|
||||
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-zip: distdir
|
||||
|
@ -644,7 +646,7 @@ dist dist-all:
|
|||
distcheck: dist
|
||||
case '$(DIST_ARCHIVES)' in \
|
||||
*.tar.gz*) \
|
||||
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
|
||||
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
|
||||
*.tar.bz2*) \
|
||||
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
|
||||
*.tar.lz*) \
|
||||
|
@ -654,7 +656,7 @@ distcheck: dist
|
|||
*.tar.Z*) \
|
||||
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
||||
*.shar.gz*) \
|
||||
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
|
||||
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
|
||||
*.zip*) \
|
||||
unzip $(distdir).zip ;;\
|
||||
esac
|
||||
|
|
39
README
39
README
|
@ -24,13 +24,13 @@ CCID and ICCD readers:
|
|||
|
||||
A reader can be in one of these list:
|
||||
- supported
|
||||
See http://pcsclite.alioth.debian.org/ccid/supported.html
|
||||
- should working
|
||||
See http://pcsclite.alioth.debian.org/ccid/shouldwork.html
|
||||
See https://ccid.apdu.fr/ccid/supported.html
|
||||
- should work
|
||||
See https://ccid.apdu.fr/ccid/shouldwork.html
|
||||
- unsupported
|
||||
See http://pcsclite.alioth.debian.org/ccid/unsupported.html
|
||||
See https://ccid.apdu.fr/ccid/unsupported.html
|
||||
- disabled
|
||||
See http://pcsclite.alioth.debian.org/ccid/disabled.html
|
||||
See https://ccid.apdu.fr/ccid/disabled.html
|
||||
|
||||
|
||||
Supported operating systems:
|
||||
|
@ -39,8 +39,7 @@ Supported operating systems:
|
|||
- GNU/Linux (libusb 1.0)
|
||||
- MacOS X/Darwin (libusb 1.0)
|
||||
|
||||
See also http://pcsclite.alioth.debian.org/ccid.html for more
|
||||
information.
|
||||
See also https://ccid.apdu.fr/ for more information.
|
||||
|
||||
|
||||
Debug informations:
|
||||
|
@ -118,6 +117,32 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|||
History:
|
||||
========
|
||||
|
||||
1.4.30 - 19 September 2018, Ludovic Rousseau
|
||||
- The project moved to https://ccid.apdu.fr/
|
||||
- Add support of
|
||||
. ACS ACR33 ICC Reader
|
||||
. BIFIT ANGARA
|
||||
. Broadcom Corp 58200
|
||||
. Certgate GmbH AirID 2 USB
|
||||
. DC.Ltd DC4 5CCID READER
|
||||
. Genesys Logic CCID Card Reader
|
||||
. Genesys Logic Combo Card Reader
|
||||
. InfoThink IT-500U Reader
|
||||
. Spyrus Inc WorkSafe Pro (ProductID 0x3117)
|
||||
- Disabled readers
|
||||
. REINER SCT cyberJack RFID standard
|
||||
- Update reader names for
|
||||
. Fujitsu Keyboard KB100 SCR
|
||||
. Fujitsu Keyboard KB100 SCR eSIG
|
||||
. FujitsuTechnologySolutions GmbH Keyboard KB SCR2
|
||||
. Yubico YubiKey CCID
|
||||
. Yubico YubiKey FIDO+CCID
|
||||
. Yubico YubiKey OTP+CCID
|
||||
. Yubico YubiKey OTP+FIDO+CCID
|
||||
- Fix libusb config descriptor leak
|
||||
- Fix leaking an allocated bundle in case no matching reader was found
|
||||
|
||||
|
||||
1.4.29 - 21 February 2018, Ludovic Rousseau
|
||||
- Add support of
|
||||
. Access IS NFC Smart Module (With idProduct 0x0164)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# generated automatically by aclocal 1.15 -*- Autoconf -*-
|
||||
# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -296,7 +296,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
|
|||
AS_VAR_IF([$1], [""], [$5], [$4])dnl
|
||||
])dnl PKG_CHECK_VAR
|
||||
|
||||
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2002-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -308,10 +308,10 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl
|
|||
# generated from the m4 files accompanying Automake X.Y.
|
||||
# (This private macro should not be called outside this file.)
|
||||
AC_DEFUN([AM_AUTOMAKE_VERSION],
|
||||
[am__api_version='1.15'
|
||||
[am__api_version='1.16'
|
||||
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
||||
dnl require some minimum version. Point them to the right macro.
|
||||
m4_if([$1], [1.15], [],
|
||||
m4_if([$1], [1.16.1], [],
|
||||
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
||||
])
|
||||
|
||||
|
@ -327,12 +327,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
|
|||
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
||||
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
||||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
||||
[AM_AUTOMAKE_VERSION([1.15])dnl
|
||||
[AM_AUTOMAKE_VERSION([1.16.1])dnl
|
||||
m4_ifndef([AC_AUTOCONF_VERSION],
|
||||
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
||||
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
||||
|
||||
# Copyright (C) 2011-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2011-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -394,7 +394,7 @@ AC_SUBST([AR])dnl
|
|||
|
||||
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -446,7 +446,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
|
|||
|
||||
# AM_CONDITIONAL -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1997-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -477,7 +477,7 @@ AC_CONFIG_COMMANDS_PRE(
|
|||
Usually this means the macro was only invoked conditionally.]])
|
||||
fi])])
|
||||
|
||||
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -668,13 +668,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
|
|||
|
||||
# Generate code to set up dependency tracking. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
||||
|
||||
# _AM_OUTPUT_DEPENDENCY_COMMANDS
|
||||
# ------------------------------
|
||||
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
||||
|
@ -682,49 +681,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|||
# Older Autoconf quotes --file arguments for eval, but not when files
|
||||
# are listed without --file. Let's play safe and only enable the eval
|
||||
# if we detect the quoting.
|
||||
case $CONFIG_FILES in
|
||||
*\'*) eval set x "$CONFIG_FILES" ;;
|
||||
*) set x $CONFIG_FILES ;;
|
||||
esac
|
||||
# TODO: see whether this extra hack can be removed once we start
|
||||
# requiring Autoconf 2.70 or later.
|
||||
AS_CASE([$CONFIG_FILES],
|
||||
[*\'*], [eval set x "$CONFIG_FILES"],
|
||||
[*], [set x $CONFIG_FILES])
|
||||
shift
|
||||
for mf
|
||||
# Used to flag and report bootstrapping failures.
|
||||
am_rc=0
|
||||
for am_mf
|
||||
do
|
||||
# Strip MF so we end up with the name of the file.
|
||||
mf=`echo "$mf" | sed -e 's/:.*$//'`
|
||||
# Check whether this is an Automake generated Makefile or not.
|
||||
# We used to match only the files named 'Makefile.in', but
|
||||
# some people rename them; so instead we look at the file content.
|
||||
# Grep'ing the first line is not enough: some people post-process
|
||||
# each Makefile.in and add a new line on top of each file to say so.
|
||||
# Grep'ing the whole file is not good either: AIX grep has a line
|
||||
am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
|
||||
# Check whether this is an Automake generated Makefile which includes
|
||||
# dependency-tracking related rules and includes.
|
||||
# Grep'ing the whole file directly is not great: AIX grep has a line
|
||||
# limit of 2048, but all sed's we know have understand at least 4000.
|
||||
if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
||||
dirpart=`AS_DIRNAME("$mf")`
|
||||
else
|
||||
continue
|
||||
fi
|
||||
# Extract the definition of DEPDIR, am__include, and am__quote
|
||||
# from the Makefile without running 'make'.
|
||||
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
||||
test -z "$DEPDIR" && continue
|
||||
am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
||||
test -z "$am__include" && continue
|
||||
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
||||
# Find all dependency output files, they are included files with
|
||||
# $(DEPDIR) in their names. We invoke sed twice because it is the
|
||||
# simplest approach to changing $(DEPDIR) to its actual value in the
|
||||
# expansion.
|
||||
for file in `sed -n "
|
||||
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
||||
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
|
||||
# Make sure the directory exists.
|
||||
test -f "$dirpart/$file" && continue
|
||||
fdir=`AS_DIRNAME(["$file"])`
|
||||
AS_MKDIR_P([$dirpart/$fdir])
|
||||
# echo "creating $dirpart/$file"
|
||||
echo '# dummy' > "$dirpart/$file"
|
||||
done
|
||||
sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
|
||||
|| continue
|
||||
am_dirpart=`AS_DIRNAME(["$am_mf"])`
|
||||
am_filepart=`AS_BASENAME(["$am_mf"])`
|
||||
AM_RUN_LOG([cd "$am_dirpart" \
|
||||
&& sed -e '/# am--include-marker/d' "$am_filepart" \
|
||||
| $MAKE -f - am--depfiles]) || am_rc=$?
|
||||
done
|
||||
if test $am_rc -ne 0; then
|
||||
AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
|
||||
for automatic dependency tracking. Try re-running configure with the
|
||||
'--disable-dependency-tracking' option to at least be able to build
|
||||
the package (albeit without support for automatic dependency tracking).])
|
||||
fi
|
||||
AS_UNSET([am_dirpart])
|
||||
AS_UNSET([am_filepart])
|
||||
AS_UNSET([am_mf])
|
||||
AS_UNSET([am_rc])
|
||||
rm -f conftest-deps.mk
|
||||
}
|
||||
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
|
||||
|
||||
|
@ -733,18 +724,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|||
# -----------------------------
|
||||
# This macro should only be invoked once -- use via AC_REQUIRE.
|
||||
#
|
||||
# This code is only required when automatic dependency tracking
|
||||
# is enabled. FIXME. This creates each '.P' file that we will
|
||||
# need in order to bootstrap the dependency handling code.
|
||||
# This code is only required when automatic dependency tracking is enabled.
|
||||
# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
|
||||
# order to bootstrap the dependency handling code.
|
||||
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
||||
[AC_CONFIG_COMMANDS([depfiles],
|
||||
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
|
||||
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
|
||||
])
|
||||
[AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
|
||||
|
||||
# Do all the work for Automake. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -831,8 +821,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
|
|||
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
||||
# For better backward compatibility. To be removed once Automake 1.9.x
|
||||
# dies out for good. For more background, see:
|
||||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
|
||||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
||||
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
|
||||
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
||||
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
|
||||
# We need awk for the "check" target (and possibly the TAP driver). The
|
||||
# system "awk" is bad on some platforms.
|
||||
|
@ -899,7 +889,7 @@ END
|
|||
Aborting the configuration process, to ensure you take notice of the issue.
|
||||
|
||||
You can download and install GNU coreutils to get an 'rm' implementation
|
||||
that behaves properly: <http://www.gnu.org/software/coreutils/>.
|
||||
that behaves properly: <https://www.gnu.org/software/coreutils/>.
|
||||
|
||||
If you want to complete the configuration process using your problematic
|
||||
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
|
||||
|
@ -941,7 +931,7 @@ for _am_header in $config_headers :; do
|
|||
done
|
||||
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
|
||||
|
||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -962,7 +952,7 @@ if test x"${install_sh+set}" != xset; then
|
|||
fi
|
||||
AC_SUBST([install_sh])])
|
||||
|
||||
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2003-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -981,7 +971,7 @@ fi
|
|||
rmdir .tst 2>/dev/null
|
||||
AC_SUBST([am__leading_dot])])
|
||||
|
||||
# Copyright (C) 1998-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1998-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -1002,7 +992,7 @@ fi])
|
|||
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
|
||||
# From Jim Meyering
|
||||
|
||||
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -1037,7 +1027,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
|
|||
|
||||
# Check to see how 'make' treats includes. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -1045,49 +1035,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
|
|||
|
||||
# AM_MAKE_INCLUDE()
|
||||
# -----------------
|
||||
# Check to see how make treats includes.
|
||||
# Check whether make has an 'include' directive that can support all
|
||||
# the idioms we need for our automatic dependency tracking code.
|
||||
AC_DEFUN([AM_MAKE_INCLUDE],
|
||||
[am_make=${MAKE-make}
|
||||
cat > confinc << 'END'
|
||||
[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
|
||||
cat > confinc.mk << 'END'
|
||||
am__doit:
|
||||
@echo this is the am__doit target
|
||||
@echo this is the am__doit target >confinc.out
|
||||
.PHONY: am__doit
|
||||
END
|
||||
# If we don't find an include directive, just comment out the code.
|
||||
AC_MSG_CHECKING([for style of include used by $am_make])
|
||||
am__include="#"
|
||||
am__quote=
|
||||
_am_result=none
|
||||
# First try GNU make style include.
|
||||
echo "include confinc" > confmf
|
||||
# Ignore all kinds of additional output from 'make'.
|
||||
case `$am_make -s -f confmf 2> /dev/null` in #(
|
||||
*the\ am__doit\ target*)
|
||||
am__include=include
|
||||
am__quote=
|
||||
_am_result=GNU
|
||||
;;
|
||||
esac
|
||||
# Now try BSD make style include.
|
||||
if test "$am__include" = "#"; then
|
||||
echo '.include "confinc"' > confmf
|
||||
case `$am_make -s -f confmf 2> /dev/null` in #(
|
||||
*the\ am__doit\ target*)
|
||||
am__include=.include
|
||||
am__quote="\""
|
||||
_am_result=BSD
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
AC_SUBST([am__include])
|
||||
AC_SUBST([am__quote])
|
||||
AC_MSG_RESULT([$_am_result])
|
||||
rm -f confinc confmf
|
||||
])
|
||||
# BSD make does it like this.
|
||||
echo '.include "confinc.mk" # ignored' > confmf.BSD
|
||||
# Other make implementations (GNU, Solaris 10, AIX) do it like this.
|
||||
echo 'include confinc.mk # ignored' > confmf.GNU
|
||||
_am_result=no
|
||||
for s in GNU BSD; do
|
||||
AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
|
||||
AS_CASE([$?:`cat confinc.out 2>/dev/null`],
|
||||
['0:this is the am__doit target'],
|
||||
[AS_CASE([$s],
|
||||
[BSD], [am__include='.include' am__quote='"'],
|
||||
[am__include='include' am__quote=''])])
|
||||
if test "$am__include" != "#"; then
|
||||
_am_result="yes ($s style)"
|
||||
break
|
||||
fi
|
||||
done
|
||||
rm -f confinc.* confmf.*
|
||||
AC_MSG_RESULT([${_am_result}])
|
||||
AC_SUBST([am__include])])
|
||||
AC_SUBST([am__quote])])
|
||||
|
||||
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1997-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -1126,7 +1109,7 @@ fi
|
|||
|
||||
# Helper functions for option handling. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -1155,7 +1138,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
|
|||
AC_DEFUN([_AM_IF_OPTION],
|
||||
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
|
||||
|
||||
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -1202,7 +1185,7 @@ AC_LANG_POP([C])])
|
|||
# For backward compatibility.
|
||||
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
|
||||
|
||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -1221,7 +1204,7 @@ AC_DEFUN([AM_RUN_LOG],
|
|||
|
||||
# Check to make sure that the build environment is sane. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -1302,7 +1285,7 @@ AC_CONFIG_COMMANDS_PRE(
|
|||
rm -f conftest.file
|
||||
])
|
||||
|
||||
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2009-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -1362,7 +1345,7 @@ AC_SUBST([AM_BACKSLASH])dnl
|
|||
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
|
||||
])
|
||||
|
||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -1390,7 +1373,7 @@ fi
|
|||
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
||||
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
||||
|
||||
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2006-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -1409,7 +1392,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
|||
|
||||
# Check how to create a tarball. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2004-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
|
4
ar-lib
4
ar-lib
|
@ -4,7 +4,7 @@
|
|||
me=ar-lib
|
||||
scriptversion=2012-03-01.08; # UTC
|
||||
|
||||
# Copyright (C) 2010-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2010-2018 Free Software Foundation, Inc.
|
||||
# Written by Peter Rosin <peda@lysator.liu.se>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
@ -18,7 +18,7 @@ scriptversion=2012-03-01.08; # UTC
|
|||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
|
|
13
compile
13
compile
|
@ -1,9 +1,9 @@
|
|||
#! /bin/sh
|
||||
# Wrapper for compilers which do not understand '-c -o'.
|
||||
|
||||
scriptversion=2012-10-14.11; # UTC
|
||||
scriptversion=2018-03-07.03; # UTC
|
||||
|
||||
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
|
||||
# Written by Tom Tromey <tromey@cygnus.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
|
|||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
|
@ -255,7 +255,8 @@ EOF
|
|||
echo "compile $scriptversion"
|
||||
exit $?
|
||||
;;
|
||||
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
|
||||
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
|
||||
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
|
||||
func_cl_wrapper "$@" # Doesn't return...
|
||||
;;
|
||||
esac
|
||||
|
@ -339,9 +340,9 @@ exit $ret
|
|||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# sh-indentation: 2
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# eval: (add-hook 'before-save-hook 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC"
|
||||
# time-stamp-time-zone: "UTC0"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,8 +1,8 @@
|
|||
#! /bin/sh
|
||||
# Configuration validation subroutine script.
|
||||
# Copyright 1992-2016 Free Software Foundation, Inc.
|
||||
# Copyright 1992-2018 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2016-11-04'
|
||||
timestamp='2018-02-22'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
|
@ -15,7 +15,7 @@ timestamp='2016-11-04'
|
|||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
# along with this program; if not, see <https://www.gnu.org/licenses/>.
|
||||
#
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
|
@ -33,7 +33,7 @@ timestamp='2016-11-04'
|
|||
# Otherwise, we print the canonical config type on stdout and succeed.
|
||||
|
||||
# You can get the latest version of this script from:
|
||||
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
|
||||
# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
|
||||
|
||||
# This file is supposed to be the same for all GNU packages
|
||||
# and recognize all the CPU types, system types and aliases
|
||||
|
@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
|
|||
|
||||
Canonicalize a configuration name.
|
||||
|
||||
Operation modes:
|
||||
Options:
|
||||
-h, --help print this help, then exit
|
||||
-t, --time-stamp print date of last modification, then exit
|
||||
-v, --version print version number, then exit
|
||||
|
@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
|
|||
version="\
|
||||
GNU config.sub ($timestamp)
|
||||
|
||||
Copyright 1992-2016 Free Software Foundation, Inc.
|
||||
Copyright 1992-2018 Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
|
@ -94,7 +94,7 @@ while test $# -gt 0 ; do
|
|||
|
||||
*local*)
|
||||
# First pass through any local machine types.
|
||||
echo $1
|
||||
echo "$1"
|
||||
exit ;;
|
||||
|
||||
* )
|
||||
|
@ -112,7 +112,7 @@ esac
|
|||
|
||||
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
|
||||
# Here we must recognize all the valid KERNEL-OS combinations.
|
||||
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||
maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||
case $maybe_os in
|
||||
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
|
||||
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
||||
|
@ -120,16 +120,16 @@ case $maybe_os in
|
|||
kopensolaris*-gnu* | cloudabi*-eabi* | \
|
||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
os=-$maybe_os
|
||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||
basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||
;;
|
||||
android-linux)
|
||||
os=-linux-android
|
||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
|
||||
basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
|
||||
;;
|
||||
*)
|
||||
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
|
||||
if [ $basic_machine != $1 ]
|
||||
then os=`echo $1 | sed 's/.*-/-/'`
|
||||
basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
|
||||
if [ "$basic_machine" != "$1" ]
|
||||
then os=`echo "$1" | sed 's/.*-/-/'`
|
||||
else os=; fi
|
||||
;;
|
||||
esac
|
||||
|
@ -178,44 +178,44 @@ case $os in
|
|||
;;
|
||||
-sco6)
|
||||
os=-sco5v6
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco5)
|
||||
os=-sco3.2v5
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco4)
|
||||
os=-sco3.2v4
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco3.2.[4-9]*)
|
||||
os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco3.2v[4-9]*)
|
||||
# Don't forget version if it is 3.2v4 or newer.
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco5v6*)
|
||||
# Don't forget version if it is 3.2v4 or newer.
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco*)
|
||||
os=-sco3.2v2
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-udk*)
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-isc)
|
||||
os=-isc2.2
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-clix*)
|
||||
basic_machine=clipper-intergraph
|
||||
;;
|
||||
-isc*)
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-lynx*178)
|
||||
os=-lynxos178
|
||||
|
@ -227,10 +227,7 @@ case $os in
|
|||
os=-lynxos
|
||||
;;
|
||||
-ptx*)
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
|
||||
;;
|
||||
-windowsnt*)
|
||||
os=`echo $os | sed -e 's/windowsnt/winnt/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
|
||||
;;
|
||||
-psos*)
|
||||
os=-psos
|
||||
|
@ -263,7 +260,7 @@ case $basic_machine in
|
|||
| fido | fr30 | frv | ft32 \
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| hexagon \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
| i370 | i860 | i960 | ia16 | ia64 \
|
||||
| ip2k | iq2000 \
|
||||
| k1om \
|
||||
| le32 | le64 \
|
||||
|
@ -299,7 +296,7 @@ case $basic_machine in
|
|||
| nios | nios2 | nios2eb | nios2el \
|
||||
| ns16k | ns32k \
|
||||
| open8 | or1k | or1knd | or32 \
|
||||
| pdp10 | pdp11 | pj | pjl \
|
||||
| pdp10 | pj | pjl \
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle \
|
||||
| pru \
|
||||
| pyramid \
|
||||
|
@ -315,7 +312,7 @@ case $basic_machine in
|
|||
| ubicom32 \
|
||||
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
|
||||
| visium \
|
||||
| we32k \
|
||||
| wasm32 \
|
||||
| x86 | xc16x | xstormy16 | xtensa \
|
||||
| z8k | z80)
|
||||
basic_machine=$basic_machine-unknown
|
||||
|
@ -336,7 +333,7 @@ case $basic_machine in
|
|||
basic_machine=$basic_machine-unknown
|
||||
os=-none
|
||||
;;
|
||||
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
|
||||
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
|
||||
;;
|
||||
ms1)
|
||||
basic_machine=mt-unknown
|
||||
|
@ -365,7 +362,7 @@ case $basic_machine in
|
|||
;;
|
||||
# Object if more than one company name word.
|
||||
*-*-*)
|
||||
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
|
||||
echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
|
||||
exit 1
|
||||
;;
|
||||
# Recognize the basic CPU types with company name.
|
||||
|
@ -388,7 +385,7 @@ case $basic_machine in
|
|||
| h8300-* | h8500-* \
|
||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||
| hexagon-* \
|
||||
| i*86-* | i860-* | i960-* | ia64-* \
|
||||
| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
|
||||
| ip2k-* | iq2000-* \
|
||||
| k1om-* \
|
||||
| le32-* | le64-* \
|
||||
|
@ -446,6 +443,7 @@ case $basic_machine in
|
|||
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
|
||||
| vax-* \
|
||||
| visium-* \
|
||||
| wasm32-* \
|
||||
| we32k-* \
|
||||
| x86-* | x86_64-* | xc16x-* | xps100-* \
|
||||
| xstormy16-* | xtensa*-* \
|
||||
|
@ -459,7 +457,7 @@ case $basic_machine in
|
|||
# Recognize the various machine names and aliases which stand
|
||||
# for a CPU type and a company and sometimes even an OS.
|
||||
386bsd)
|
||||
basic_machine=i386-unknown
|
||||
basic_machine=i386-pc
|
||||
os=-bsd
|
||||
;;
|
||||
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
|
||||
|
@ -493,7 +491,7 @@ case $basic_machine in
|
|||
basic_machine=x86_64-pc
|
||||
;;
|
||||
amd64-*)
|
||||
basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
amdahl)
|
||||
basic_machine=580-amdahl
|
||||
|
@ -538,7 +536,7 @@ case $basic_machine in
|
|||
os=-linux
|
||||
;;
|
||||
blackfin-*)
|
||||
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
os=-linux
|
||||
;;
|
||||
bluegene*)
|
||||
|
@ -546,13 +544,13 @@ case $basic_machine in
|
|||
os=-cnk
|
||||
;;
|
||||
c54x-*)
|
||||
basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
c55x-*)
|
||||
basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
c6x-*)
|
||||
basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
c90)
|
||||
basic_machine=c90-cray
|
||||
|
@ -641,7 +639,7 @@ case $basic_machine in
|
|||
basic_machine=rs6000-bull
|
||||
os=-bosx
|
||||
;;
|
||||
dpx2* | dpx2*-bull)
|
||||
dpx2*)
|
||||
basic_machine=m68k-bull
|
||||
os=-sysv3
|
||||
;;
|
||||
|
@ -650,7 +648,7 @@ case $basic_machine in
|
|||
os=$os"spe"
|
||||
;;
|
||||
e500v[12]-*)
|
||||
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
os=$os"spe"
|
||||
;;
|
||||
ebmon29k)
|
||||
|
@ -742,9 +740,6 @@ case $basic_machine in
|
|||
hp9k8[0-9][0-9] | hp8[0-9][0-9])
|
||||
basic_machine=hppa1.0-hp
|
||||
;;
|
||||
hppa-next)
|
||||
os=-nextstep3
|
||||
;;
|
||||
hppaosf)
|
||||
basic_machine=hppa1.1-hp
|
||||
os=-osf
|
||||
|
@ -757,26 +752,26 @@ case $basic_machine in
|
|||
basic_machine=i370-ibm
|
||||
;;
|
||||
i*86v32)
|
||||
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
|
||||
os=-sysv32
|
||||
;;
|
||||
i*86v4*)
|
||||
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
|
||||
os=-sysv4
|
||||
;;
|
||||
i*86v)
|
||||
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
|
||||
os=-sysv
|
||||
;;
|
||||
i*86sol2)
|
||||
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
|
||||
basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
|
||||
os=-solaris2
|
||||
;;
|
||||
i386mach)
|
||||
basic_machine=i386-mach
|
||||
os=-mach
|
||||
;;
|
||||
i386-vsta | vsta)
|
||||
vsta)
|
||||
basic_machine=i386-unknown
|
||||
os=-vsta
|
||||
;;
|
||||
|
@ -795,19 +790,16 @@ case $basic_machine in
|
|||
os=-sysv
|
||||
;;
|
||||
leon-*|leon[3-9]-*)
|
||||
basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
|
||||
basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
|
||||
;;
|
||||
m68knommu)
|
||||
basic_machine=m68k-unknown
|
||||
os=-linux
|
||||
;;
|
||||
m68knommu-*)
|
||||
basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
os=-linux
|
||||
;;
|
||||
m88k-omron*)
|
||||
basic_machine=m88k-omron
|
||||
;;
|
||||
magnum | m3230)
|
||||
basic_machine=mips-mips
|
||||
os=-sysv
|
||||
|
@ -839,10 +831,10 @@ case $basic_machine in
|
|||
os=-mint
|
||||
;;
|
||||
mips3*-*)
|
||||
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
|
||||
basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
|
||||
;;
|
||||
mips3*)
|
||||
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
|
||||
basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
|
||||
;;
|
||||
monitor)
|
||||
basic_machine=m68k-rom68k
|
||||
|
@ -861,7 +853,7 @@ case $basic_machine in
|
|||
os=-msdos
|
||||
;;
|
||||
ms1-*)
|
||||
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
|
||||
basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
|
||||
;;
|
||||
msys)
|
||||
basic_machine=i686-pc
|
||||
|
@ -903,7 +895,7 @@ case $basic_machine in
|
|||
basic_machine=v70-nec
|
||||
os=-sysv
|
||||
;;
|
||||
next | m*-next )
|
||||
next | m*-next)
|
||||
basic_machine=m68k-next
|
||||
case $os in
|
||||
-nextstep* )
|
||||
|
@ -948,6 +940,12 @@ case $basic_machine in
|
|||
nsr-tandem)
|
||||
basic_machine=nsr-tandem
|
||||
;;
|
||||
nsv-tandem)
|
||||
basic_machine=nsv-tandem
|
||||
;;
|
||||
nsx-tandem)
|
||||
basic_machine=nsx-tandem
|
||||
;;
|
||||
op50n-* | op60c-*)
|
||||
basic_machine=hppa1.1-oki
|
||||
os=-proelf
|
||||
|
@ -980,7 +978,7 @@ case $basic_machine in
|
|||
os=-linux
|
||||
;;
|
||||
parisc-*)
|
||||
basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
os=-linux
|
||||
;;
|
||||
pbd)
|
||||
|
@ -996,7 +994,7 @@ case $basic_machine in
|
|||
basic_machine=i386-pc
|
||||
;;
|
||||
pc98-*)
|
||||
basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
pentium | p5 | k5 | k6 | nexgen | viac3)
|
||||
basic_machine=i586-pc
|
||||
|
@ -1011,16 +1009,16 @@ case $basic_machine in
|
|||
basic_machine=i786-pc
|
||||
;;
|
||||
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
|
||||
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
pentiumpro-* | p6-* | 6x86-* | athlon-*)
|
||||
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
|
||||
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
pentium4-*)
|
||||
basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
pn)
|
||||
basic_machine=pn-gould
|
||||
|
@ -1030,23 +1028,23 @@ case $basic_machine in
|
|||
ppc | ppcbe) basic_machine=powerpc-unknown
|
||||
;;
|
||||
ppc-* | ppcbe-*)
|
||||
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
ppcle | powerpclittle)
|
||||
basic_machine=powerpcle-unknown
|
||||
;;
|
||||
ppcle-* | powerpclittle-*)
|
||||
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
ppc64) basic_machine=powerpc64-unknown
|
||||
;;
|
||||
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
ppc64le | powerpc64little)
|
||||
basic_machine=powerpc64le-unknown
|
||||
;;
|
||||
ppc64le-* | powerpc64little-*)
|
||||
basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
ps2)
|
||||
basic_machine=i386-ibm
|
||||
|
@ -1100,17 +1098,10 @@ case $basic_machine in
|
|||
sequent)
|
||||
basic_machine=i386-sequent
|
||||
;;
|
||||
sh)
|
||||
basic_machine=sh-hitachi
|
||||
os=-hms
|
||||
;;
|
||||
sh5el)
|
||||
basic_machine=sh5le-unknown
|
||||
;;
|
||||
sh64)
|
||||
basic_machine=sh64-unknown
|
||||
;;
|
||||
sparclite-wrs | simso-wrs)
|
||||
simso-wrs)
|
||||
basic_machine=sparclite-wrs
|
||||
os=-vxworks
|
||||
;;
|
||||
|
@ -1129,7 +1120,7 @@ case $basic_machine in
|
|||
os=-sysv4
|
||||
;;
|
||||
strongarm-* | thumb-*)
|
||||
basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
sun2)
|
||||
basic_machine=m68000-sun
|
||||
|
@ -1251,6 +1242,9 @@ case $basic_machine in
|
|||
basic_machine=hppa1.1-winbond
|
||||
os=-proelf
|
||||
;;
|
||||
x64)
|
||||
basic_machine=x86_64-pc
|
||||
;;
|
||||
xbox)
|
||||
basic_machine=i686-pc
|
||||
os=-mingw32
|
||||
|
@ -1259,20 +1253,12 @@ case $basic_machine in
|
|||
basic_machine=xps100-honeywell
|
||||
;;
|
||||
xscale-* | xscalee[bl]-*)
|
||||
basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
|
||||
basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
|
||||
;;
|
||||
ymp)
|
||||
basic_machine=ymp-cray
|
||||
os=-unicos
|
||||
;;
|
||||
z8k-*-coff)
|
||||
basic_machine=z8k-unknown
|
||||
os=-sim
|
||||
;;
|
||||
z80-*-coff)
|
||||
basic_machine=z80-unknown
|
||||
os=-sim
|
||||
;;
|
||||
none)
|
||||
basic_machine=none-none
|
||||
os=-none
|
||||
|
@ -1301,10 +1287,6 @@ case $basic_machine in
|
|||
vax)
|
||||
basic_machine=vax-dec
|
||||
;;
|
||||
pdp10)
|
||||
# there are many clones, so DEC is not a safe bet
|
||||
basic_machine=pdp10-unknown
|
||||
;;
|
||||
pdp11)
|
||||
basic_machine=pdp11-dec
|
||||
;;
|
||||
|
@ -1314,9 +1296,6 @@ case $basic_machine in
|
|||
sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||
basic_machine=sh-unknown
|
||||
;;
|
||||
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
|
||||
basic_machine=sparc-sun
|
||||
;;
|
||||
cydra)
|
||||
basic_machine=cydra-cydrome
|
||||
;;
|
||||
|
@ -1336,7 +1315,7 @@ case $basic_machine in
|
|||
# Make sure to match an already-canonicalized machine name.
|
||||
;;
|
||||
*)
|
||||
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
|
||||
echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
@ -1344,10 +1323,10 @@ esac
|
|||
# Here we canonicalize certain aliases for manufacturers.
|
||||
case $basic_machine in
|
||||
*-digital*)
|
||||
basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
|
||||
basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
|
||||
;;
|
||||
*-commodore*)
|
||||
basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
|
||||
basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
|
@ -1358,8 +1337,8 @@ esac
|
|||
if [ x"$os" != x"" ]
|
||||
then
|
||||
case $os in
|
||||
# First match some system type aliases
|
||||
# that might get confused with valid system types.
|
||||
# First match some system type aliases that might get confused
|
||||
# with valid system types.
|
||||
# -solaris* is a basic system type, with this one exception.
|
||||
-auroraux)
|
||||
os=-auroraux
|
||||
|
@ -1370,18 +1349,19 @@ case $os in
|
|||
-solaris)
|
||||
os=-solaris2
|
||||
;;
|
||||
-svr4*)
|
||||
os=-sysv4
|
||||
;;
|
||||
-unixware*)
|
||||
os=-sysv4.2uw
|
||||
;;
|
||||
-gnu/linux*)
|
||||
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
|
||||
;;
|
||||
# First accept the basic system types.
|
||||
# es1800 is here to avoid being matched by es* (a different OS)
|
||||
-es1800*)
|
||||
os=-ose
|
||||
;;
|
||||
# Now accept the basic system types.
|
||||
# The portable systems comes first.
|
||||
# Each alternative MUST END IN A *, to match a version number.
|
||||
# Each alternative MUST end in a * to match a version number.
|
||||
# -sysv* is not here because it comes later, after sysvr4.
|
||||
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
|
||||
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
|
||||
|
@ -1391,25 +1371,26 @@ case $os in
|
|||
| -aos* | -aros* | -cloudabi* | -sortix* \
|
||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
||||
| -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
|
||||
| -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
|
||||
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
||||
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
| -chorusos* | -chorusrdb* | -cegcc* \
|
||||
| -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
|
||||
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
|
||||
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
|
||||
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
|
||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
|
||||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
||||
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
|
||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
| -morphos* | -superux* | -rtmk* | -windiss* \
|
||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
|
||||
| -onefs* | -tirtos* | -phoenix* | -fuchsia*)
|
||||
| -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
|
||||
| -midnightbsd*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
|
@ -1426,12 +1407,12 @@ case $os in
|
|||
-nto*)
|
||||
os=`echo $os | sed -e 's|nto|nto-qnx|'`
|
||||
;;
|
||||
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
|
||||
| -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
|
||||
-sim | -xray | -os68k* | -v88r* \
|
||||
| -windows* | -osx | -abug | -netware* | -os9* \
|
||||
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
|
||||
;;
|
||||
-mac*)
|
||||
os=`echo $os | sed -e 's|mac|macos|'`
|
||||
os=`echo "$os" | sed -e 's|mac|macos|'`
|
||||
;;
|
||||
-linux-dietlibc)
|
||||
os=-linux-dietlibc
|
||||
|
@ -1440,10 +1421,10 @@ case $os in
|
|||
os=`echo $os | sed -e 's|linux|linux-gnu|'`
|
||||
;;
|
||||
-sunos5*)
|
||||
os=`echo $os | sed -e 's|sunos5|solaris2|'`
|
||||
os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
|
||||
;;
|
||||
-sunos6*)
|
||||
os=`echo $os | sed -e 's|sunos6|solaris3|'`
|
||||
os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
|
||||
;;
|
||||
-opened*)
|
||||
os=-openedition
|
||||
|
@ -1454,12 +1435,6 @@ case $os in
|
|||
-wince*)
|
||||
os=-wince
|
||||
;;
|
||||
-osfrose*)
|
||||
os=-osfrose
|
||||
;;
|
||||
-osf*)
|
||||
os=-osf
|
||||
;;
|
||||
-utek*)
|
||||
os=-bsd
|
||||
;;
|
||||
|
@ -1484,7 +1459,7 @@ case $os in
|
|||
-nova*)
|
||||
os=-rtmk-nova
|
||||
;;
|
||||
-ns2 )
|
||||
-ns2)
|
||||
os=-nextstep2
|
||||
;;
|
||||
-nsk*)
|
||||
|
@ -1506,7 +1481,7 @@ case $os in
|
|||
-oss*)
|
||||
os=-sysv3
|
||||
;;
|
||||
-svr4)
|
||||
-svr4*)
|
||||
os=-sysv4
|
||||
;;
|
||||
-svr3)
|
||||
|
@ -1521,24 +1496,28 @@ case $os in
|
|||
-ose*)
|
||||
os=-ose
|
||||
;;
|
||||
-es1800*)
|
||||
os=-ose
|
||||
;;
|
||||
-xenix)
|
||||
os=-xenix
|
||||
;;
|
||||
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
|
||||
os=-mint
|
||||
;;
|
||||
-aros*)
|
||||
os=-aros
|
||||
;;
|
||||
-zvmoe)
|
||||
os=-zvmoe
|
||||
;;
|
||||
-dicos*)
|
||||
os=-dicos
|
||||
;;
|
||||
-pikeos*)
|
||||
# Until real need of OS specific support for
|
||||
# particular features comes up, bare metal
|
||||
# configurations are quite functional.
|
||||
case $basic_machine in
|
||||
arm*)
|
||||
os=-eabi
|
||||
;;
|
||||
*)
|
||||
os=-elf
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
-nacl*)
|
||||
;;
|
||||
-ios)
|
||||
|
@ -1548,7 +1527,7 @@ case $os in
|
|||
*)
|
||||
# Get rid of the `-' at the beginning of $os.
|
||||
os=`echo $os | sed 's/[^-]*-//'`
|
||||
echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
|
||||
echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
@ -1638,12 +1617,12 @@ case $basic_machine in
|
|||
sparc-* | *-sun)
|
||||
os=-sunos4.1.1
|
||||
;;
|
||||
pru-*)
|
||||
os=-elf
|
||||
;;
|
||||
*-be)
|
||||
os=-beos
|
||||
;;
|
||||
*-haiku)
|
||||
os=-haiku
|
||||
;;
|
||||
*-ibm)
|
||||
os=-aix
|
||||
;;
|
||||
|
@ -1683,7 +1662,7 @@ case $basic_machine in
|
|||
m88k-omron*)
|
||||
os=-luna
|
||||
;;
|
||||
*-next )
|
||||
*-next)
|
||||
os=-nextstep
|
||||
;;
|
||||
*-sequent)
|
||||
|
@ -1698,9 +1677,6 @@ case $basic_machine in
|
|||
i370-*)
|
||||
os=-mvs
|
||||
;;
|
||||
*-next)
|
||||
os=-nextstep3
|
||||
;;
|
||||
*-gould)
|
||||
os=-sysv
|
||||
;;
|
||||
|
@ -1810,15 +1786,15 @@ case $basic_machine in
|
|||
vendor=stratus
|
||||
;;
|
||||
esac
|
||||
basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
|
||||
basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
|
||||
;;
|
||||
esac
|
||||
|
||||
echo $basic_machine$os
|
||||
echo "$basic_machine$os"
|
||||
exit
|
||||
|
||||
# Local variables:
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# eval: (add-hook 'write-file-functions 'time-stamp)
|
||||
# time-stamp-start: "timestamp='"
|
||||
# time-stamp-format: "%:y-%02m-%02d"
|
||||
# time-stamp-end: "'"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for ccid 1.4.29.
|
||||
# Generated by GNU Autoconf 2.69 for ccid 1.4.30.
|
||||
#
|
||||
#
|
||||
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
||||
|
@ -587,8 +587,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='ccid'
|
||||
PACKAGE_TARNAME='ccid'
|
||||
PACKAGE_VERSION='1.4.29'
|
||||
PACKAGE_STRING='ccid 1.4.29'
|
||||
PACKAGE_VERSION='1.4.30'
|
||||
PACKAGE_STRING='ccid 1.4.30'
|
||||
PACKAGE_BUGREPORT=''
|
||||
PACKAGE_URL=''
|
||||
|
||||
|
@ -696,7 +696,6 @@ am__nodep
|
|||
AMDEPBACKSLASH
|
||||
AMDEP_FALSE
|
||||
AMDEP_TRUE
|
||||
am__quote
|
||||
am__include
|
||||
DEPDIR
|
||||
OBJEXT
|
||||
|
@ -782,7 +781,8 @@ PACKAGE_VERSION
|
|||
PACKAGE_TARNAME
|
||||
PACKAGE_NAME
|
||||
PATH_SEPARATOR
|
||||
SHELL'
|
||||
SHELL
|
||||
am__quote'
|
||||
ac_subst_files=''
|
||||
ac_user_opts='
|
||||
enable_option_checking
|
||||
|
@ -1378,7 +1378,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures ccid 1.4.29 to adapt to many kinds of systems.
|
||||
\`configure' configures ccid 1.4.30 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
@ -1449,7 +1449,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of ccid 1.4.29:";;
|
||||
short | recursive ) echo "Configuration of ccid 1.4.30:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
@ -1593,7 +1593,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
ccid configure 1.4.29
|
||||
ccid configure 1.4.30
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
|
@ -2012,7 +2012,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by ccid $as_me 1.4.29, which was
|
||||
It was created by ccid $as_me 1.4.30, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
@ -2390,7 +2390,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
|
|||
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
|
||||
|
||||
|
||||
am__api_version='1.15'
|
||||
am__api_version='1.16'
|
||||
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
# so one script is as good as another. But avoid the broken or
|
||||
|
@ -2876,7 +2876,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='ccid'
|
||||
VERSION='1.4.29'
|
||||
VERSION='1.4.30'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
@ -2906,8 +2906,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
|
|||
|
||||
# For better backward compatibility. To be removed once Automake 1.9.x
|
||||
# dies out for good. For more background, see:
|
||||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
|
||||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
||||
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
|
||||
# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
||||
mkdir_p='$(MKDIR_P)'
|
||||
|
||||
# We need awk for the "check" target (and possibly the TAP driver). The
|
||||
|
@ -2958,7 +2958,7 @@ END
|
|||
Aborting the configuration process, to ensure you take notice of the issue.
|
||||
|
||||
You can download and install GNU coreutils to get an 'rm' implementation
|
||||
that behaves properly: <http://www.gnu.org/software/coreutils/>.
|
||||
that behaves properly: <https://www.gnu.org/software/coreutils/>.
|
||||
|
||||
If you want to complete the configuration process using your problematic
|
||||
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
|
||||
|
@ -3969,45 +3969,45 @@ DEPDIR="${am__leading_dot}deps"
|
|||
|
||||
ac_config_commands="$ac_config_commands depfiles"
|
||||
|
||||
|
||||
am_make=${MAKE-make}
|
||||
cat > confinc << 'END'
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
|
||||
$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
|
||||
cat > confinc.mk << 'END'
|
||||
am__doit:
|
||||
@echo this is the am__doit target
|
||||
@echo this is the am__doit target >confinc.out
|
||||
.PHONY: am__doit
|
||||
END
|
||||
# If we don't find an include directive, just comment out the code.
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
|
||||
$as_echo_n "checking for style of include used by $am_make... " >&6; }
|
||||
am__include="#"
|
||||
am__quote=
|
||||
_am_result=none
|
||||
# First try GNU make style include.
|
||||
echo "include confinc" > confmf
|
||||
# Ignore all kinds of additional output from 'make'.
|
||||
case `$am_make -s -f confmf 2> /dev/null` in #(
|
||||
*the\ am__doit\ target*)
|
||||
am__include=include
|
||||
am__quote=
|
||||
_am_result=GNU
|
||||
;;
|
||||
esac
|
||||
# Now try BSD make style include.
|
||||
if test "$am__include" = "#"; then
|
||||
echo '.include "confinc"' > confmf
|
||||
case `$am_make -s -f confmf 2> /dev/null` in #(
|
||||
*the\ am__doit\ target*)
|
||||
am__include=.include
|
||||
am__quote="\""
|
||||
_am_result=BSD
|
||||
# BSD make does it like this.
|
||||
echo '.include "confinc.mk" # ignored' > confmf.BSD
|
||||
# Other make implementations (GNU, Solaris 10, AIX) do it like this.
|
||||
echo 'include confinc.mk # ignored' > confmf.GNU
|
||||
_am_result=no
|
||||
for s in GNU BSD; do
|
||||
{ echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
|
||||
(${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }
|
||||
case $?:`cat confinc.out 2>/dev/null` in #(
|
||||
'0:this is the am__doit target') :
|
||||
case $s in #(
|
||||
BSD) :
|
||||
am__include='.include' am__quote='"' ;; #(
|
||||
*) :
|
||||
am__include='include' am__quote='' ;;
|
||||
esac ;; #(
|
||||
*) :
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
|
||||
$as_echo "$_am_result" >&6; }
|
||||
rm -f confinc confmf
|
||||
esac
|
||||
if test "$am__include" != "#"; then
|
||||
_am_result="yes ($s style)"
|
||||
break
|
||||
fi
|
||||
done
|
||||
rm -f confinc.* confmf.*
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
|
||||
$as_echo "${_am_result}" >&6; }
|
||||
|
||||
# Check whether --enable-dependency-tracking was given.
|
||||
if test "${enable_dependency_tracking+set}" = set; then :
|
||||
|
@ -14711,7 +14711,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by ccid $as_me 1.4.29, which was
|
||||
This file was extended by ccid $as_me 1.4.30, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
@ -14777,7 +14777,7 @@ _ACEOF
|
|||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
ccid config.status 1.4.29
|
||||
ccid config.status 1.4.30
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
@ -14896,7 +14896,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|||
#
|
||||
# INIT-COMMANDS
|
||||
#
|
||||
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
|
||||
AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
|
||||
|
||||
|
||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||
|
@ -15798,29 +15798,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
|
|||
# Older Autoconf quotes --file arguments for eval, but not when files
|
||||
# are listed without --file. Let's play safe and only enable the eval
|
||||
# if we detect the quoting.
|
||||
case $CONFIG_FILES in
|
||||
*\'*) eval set x "$CONFIG_FILES" ;;
|
||||
*) set x $CONFIG_FILES ;;
|
||||
esac
|
||||
# TODO: see whether this extra hack can be removed once we start
|
||||
# requiring Autoconf 2.70 or later.
|
||||
case $CONFIG_FILES in #(
|
||||
*\'*) :
|
||||
eval set x "$CONFIG_FILES" ;; #(
|
||||
*) :
|
||||
set x $CONFIG_FILES ;; #(
|
||||
*) :
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
for mf
|
||||
# Used to flag and report bootstrapping failures.
|
||||
am_rc=0
|
||||
for am_mf
|
||||
do
|
||||
# Strip MF so we end up with the name of the file.
|
||||
mf=`echo "$mf" | sed -e 's/:.*$//'`
|
||||
# Check whether this is an Automake generated Makefile or not.
|
||||
# We used to match only the files named 'Makefile.in', but
|
||||
# some people rename them; so instead we look at the file content.
|
||||
# Grep'ing the first line is not enough: some people post-process
|
||||
# each Makefile.in and add a new line on top of each file to say so.
|
||||
# Grep'ing the whole file is not good either: AIX grep has a line
|
||||
am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
|
||||
# Check whether this is an Automake generated Makefile which includes
|
||||
# dependency-tracking related rules and includes.
|
||||
# Grep'ing the whole file directly is not great: AIX grep has a line
|
||||
# limit of 2048, but all sed's we know have understand at least 4000.
|
||||
if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
||||
dirpart=`$as_dirname -- "$mf" ||
|
||||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||||
X"$mf" : 'X\(//\)[^/]' \| \
|
||||
X"$mf" : 'X\(//\)$' \| \
|
||||
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
|
||||
$as_echo X"$mf" |
|
||||
sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
|
||||
|| continue
|
||||
am_dirpart=`$as_dirname -- "$am_mf" ||
|
||||
$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||||
X"$am_mf" : 'X\(//\)[^/]' \| \
|
||||
X"$am_mf" : 'X\(//\)$' \| \
|
||||
X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
|
||||
$as_echo X"$am_mf" |
|
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
||||
s//\1/
|
||||
q
|
||||
|
@ -15838,53 +15844,48 @@ $as_echo X"$mf" |
|
|||
q
|
||||
}
|
||||
s/.*/./; q'`
|
||||
else
|
||||
continue
|
||||
fi
|
||||
# Extract the definition of DEPDIR, am__include, and am__quote
|
||||
# from the Makefile without running 'make'.
|
||||
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
||||
test -z "$DEPDIR" && continue
|
||||
am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
||||
test -z "$am__include" && continue
|
||||
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
||||
# Find all dependency output files, they are included files with
|
||||
# $(DEPDIR) in their names. We invoke sed twice because it is the
|
||||
# simplest approach to changing $(DEPDIR) to its actual value in the
|
||||
# expansion.
|
||||
for file in `sed -n "
|
||||
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
||||
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
|
||||
# Make sure the directory exists.
|
||||
test -f "$dirpart/$file" && continue
|
||||
fdir=`$as_dirname -- "$file" ||
|
||||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||||
X"$file" : 'X\(//\)[^/]' \| \
|
||||
X"$file" : 'X\(//\)$' \| \
|
||||
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
|
||||
$as_echo X"$file" |
|
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
||||
am_filepart=`$as_basename -- "$am_mf" ||
|
||||
$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
|
||||
X"$am_mf" : 'X\(//\)$' \| \
|
||||
X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
|
||||
$as_echo X/"$am_mf" |
|
||||
sed '/^.*\/\([^/][^/]*\)\/*$/{
|
||||
s//\1/
|
||||
q
|
||||
}
|
||||
/^X\(\/\/\)[^/].*/{
|
||||
/^X\/\(\/\/\)$/{
|
||||
s//\1/
|
||||
q
|
||||
}
|
||||
/^X\(\/\/\)$/{
|
||||
s//\1/
|
||||
q
|
||||
}
|
||||
/^X\(\/\).*/{
|
||||
/^X\/\(\/\).*/{
|
||||
s//\1/
|
||||
q
|
||||
}
|
||||
s/.*/./; q'`
|
||||
as_dir=$dirpart/$fdir; as_fn_mkdir_p
|
||||
# echo "creating $dirpart/$file"
|
||||
echo '# dummy' > "$dirpart/$file"
|
||||
done
|
||||
{ echo "$as_me:$LINENO: cd "$am_dirpart" \
|
||||
&& sed -e '/# am--include-marker/d' "$am_filepart" \
|
||||
| $MAKE -f - am--depfiles" >&5
|
||||
(cd "$am_dirpart" \
|
||||
&& sed -e '/# am--include-marker/d' "$am_filepart" \
|
||||
| $MAKE -f - am--depfiles) >&5 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } || am_rc=$?
|
||||
done
|
||||
if test $am_rc -ne 0; then
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
as_fn_error $? "Something went wrong bootstrapping makefile fragments
|
||||
for automatic dependency tracking. Try re-running configure with the
|
||||
'--disable-dependency-tracking' option to at least be able to build
|
||||
the package (albeit without support for automatic dependency tracking).
|
||||
See \`config.log' for more details" "$LINENO" 5; }
|
||||
fi
|
||||
{ am_dirpart=; unset am_dirpart;}
|
||||
{ am_filepart=; unset am_filepart;}
|
||||
{ am_mf=; unset am_mf;}
|
||||
{ am_rc=; unset am_rc;}
|
||||
rm -f conftest-deps.mk
|
||||
}
|
||||
;;
|
||||
"libtool":C)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# Require autoconf 2.61
|
||||
AC_PREREQ([2.69])
|
||||
|
||||
AC_INIT([ccid],[1.4.29])
|
||||
AC_INIT([ccid],[1.4.30])
|
||||
AC_CONFIG_SRCDIR(src/ifdhandler.c)
|
||||
AC_CONFIG_AUX_DIR([.])
|
||||
AM_INIT_AUTOMAKE(1.8 dist-bzip2 no-dist-gzip subdir-objects)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Makefile.in generated by automake 1.15 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.16.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -132,7 +132,9 @@ am__v_at_0 = @
|
|||
am__v_at_1 =
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
am__maybe_remake_depfiles = depfiles
|
||||
am__depfiles_remade = \
|
||||
./$(DEPDIR)/Kobil_mIDentity_switch-Kobil_mIDentity_switch.Po
|
||||
am__mv = mv -f
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
|
@ -351,8 +353,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|||
*config.status*) \
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
||||
*) \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
|
||||
esac;
|
||||
|
||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||
|
@ -383,7 +385,13 @@ mostlyclean-compile:
|
|||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Kobil_mIDentity_switch-Kobil_mIDentity_switch.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Kobil_mIDentity_switch-Kobil_mIDentity_switch.Po@am__quote@ # am--include-marker
|
||||
|
||||
$(am__depfiles_remade):
|
||||
@$(MKDIR_P) $(@D)
|
||||
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
|
||||
|
||||
am--depfiles: $(am__depfiles_remade)
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
|
||||
|
@ -481,7 +489,10 @@ cscopelist-am: $(am__tagged_files)
|
|||
distclean-tags:
|
||||
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
distdir: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) distdir-am
|
||||
|
||||
distdir-am: $(DISTFILES)
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
list='$(DISTFILES)'; \
|
||||
|
@ -551,7 +562,7 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
|
|||
mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f ./$(DEPDIR)/Kobil_mIDentity_switch-Kobil_mIDentity_switch.Po
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-compile distclean-generic \
|
||||
distclean-tags
|
||||
|
@ -597,7 +608,7 @@ install-ps-am:
|
|||
installcheck-am:
|
||||
|
||||
maintainer-clean: maintainer-clean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f ./$(DEPDIR)/Kobil_mIDentity_switch-Kobil_mIDentity_switch.Po
|
||||
-rm -f Makefile
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||
|
||||
|
@ -618,9 +629,9 @@ uninstall-am:
|
|||
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
|
||||
clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
|
||||
ctags-am distclean distclean-compile distclean-generic \
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
|
||||
clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
|
||||
ctags ctags-am distclean distclean-compile distclean-generic \
|
||||
distclean-libtool distclean-tags distdir dvi dvi-am html \
|
||||
html-am info info-am install install-am install-data \
|
||||
install-data-am install-dvi install-dvi-am install-exec \
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Makefile.in generated by automake 1.15 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.16.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -135,7 +135,7 @@ am__recursive_targets = \
|
|||
$(RECURSIVE_CLEAN_TARGETS) \
|
||||
$(am__extra_recursive_targets)
|
||||
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
|
||||
distdir
|
||||
distdir distdir-am
|
||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||
# Read a list of newline-separated strings from the standard input,
|
||||
# and print each of them once, without duplicates. Input order is
|
||||
|
@ -348,8 +348,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|||
*config.status*) \
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
||||
*) \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
|
||||
esac;
|
||||
|
||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||
|
@ -466,7 +466,10 @@ cscopelist-am: $(am__tagged_files)
|
|||
distclean-tags:
|
||||
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
distdir: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) distdir-am
|
||||
|
||||
distdir-am: $(DISTFILES)
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
list='$(DISTFILES)'; \
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Makefile.in generated by automake 1.15 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.16.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -131,7 +131,9 @@ am__v_at_0 = @
|
|||
am__v_at_1 =
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
am__maybe_remake_depfiles = depfiles
|
||||
am__depfiles_remade = \
|
||||
./$(DEPDIR)/RSA_SecurID_getpasswd-RSA_SecurID_getpasswd.Po
|
||||
am__mv = mv -f
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
|
@ -348,8 +350,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|||
*config.status*) \
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
||||
*) \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
|
||||
esac;
|
||||
|
||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||
|
@ -380,7 +382,13 @@ mostlyclean-compile:
|
|||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RSA_SecurID_getpasswd-RSA_SecurID_getpasswd.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RSA_SecurID_getpasswd-RSA_SecurID_getpasswd.Po@am__quote@ # am--include-marker
|
||||
|
||||
$(am__depfiles_remade):
|
||||
@$(MKDIR_P) $(@D)
|
||||
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
|
||||
|
||||
am--depfiles: $(am__depfiles_remade)
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
|
||||
|
@ -478,7 +486,10 @@ cscopelist-am: $(am__tagged_files)
|
|||
distclean-tags:
|
||||
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
distdir: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) distdir-am
|
||||
|
||||
distdir-am: $(DISTFILES)
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
list='$(DISTFILES)'; \
|
||||
|
@ -548,7 +559,7 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
|
|||
mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f ./$(DEPDIR)/RSA_SecurID_getpasswd-RSA_SecurID_getpasswd.Po
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-compile distclean-generic \
|
||||
distclean-tags
|
||||
|
@ -594,7 +605,7 @@ install-ps-am:
|
|||
installcheck-am:
|
||||
|
||||
maintainer-clean: maintainer-clean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f ./$(DEPDIR)/RSA_SecurID_getpasswd-RSA_SecurID_getpasswd.Po
|
||||
-rm -f Makefile
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||
|
||||
|
@ -615,9 +626,9 @@ uninstall-am:
|
|||
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
|
||||
clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
|
||||
ctags-am distclean distclean-compile distclean-generic \
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
|
||||
clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
|
||||
ctags ctags-am distclean distclean-compile distclean-generic \
|
||||
distclean-libtool distclean-tags distdir dvi dvi-am html \
|
||||
html-am info info-am install install-am install-data \
|
||||
install-data-am install-dvi install-dvi-am install-exec \
|
||||
|
|
10
depcomp
10
depcomp
|
@ -1,9 +1,9 @@
|
|||
#! /bin/sh
|
||||
# depcomp - compile a program generating dependencies as side-effects
|
||||
|
||||
scriptversion=2013-05-30.07; # UTC
|
||||
scriptversion=2018-03-07.03; # UTC
|
||||
|
||||
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
|
@ -16,7 +16,7 @@ scriptversion=2013-05-30.07; # UTC
|
|||
# GNU General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
|
@ -783,9 +783,9 @@ exit 0
|
|||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# sh-indentation: 2
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# eval: (add-hook 'before-save-hook 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC"
|
||||
# time-stamp-time-zone: "UTC0"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Makefile.in generated by automake 1.15 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.16.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -133,7 +133,9 @@ am__v_at_0 = @
|
|||
am__v_at_1 =
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
am__maybe_remake_depfiles = depfiles
|
||||
am__depfiles_remade = ./$(DEPDIR)/scardcontrol-PCSCv2part10.Po \
|
||||
./$(DEPDIR)/scardcontrol-scardcontrol.Po
|
||||
am__mv = mv -f
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
|
@ -349,8 +351,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|||
*config.status*) \
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
||||
*) \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
|
||||
esac;
|
||||
|
||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||
|
@ -381,8 +383,14 @@ mostlyclean-compile:
|
|||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scardcontrol-PCSCv2part10.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scardcontrol-scardcontrol.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scardcontrol-PCSCv2part10.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scardcontrol-scardcontrol.Po@am__quote@ # am--include-marker
|
||||
|
||||
$(am__depfiles_remade):
|
||||
@$(MKDIR_P) $(@D)
|
||||
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
|
||||
|
||||
am--depfiles: $(am__depfiles_remade)
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
|
||||
|
@ -494,7 +502,10 @@ cscopelist-am: $(am__tagged_files)
|
|||
distclean-tags:
|
||||
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
distdir: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) distdir-am
|
||||
|
||||
distdir-am: $(DISTFILES)
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
list='$(DISTFILES)'; \
|
||||
|
@ -564,7 +575,8 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
|
|||
mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f ./$(DEPDIR)/scardcontrol-PCSCv2part10.Po
|
||||
-rm -f ./$(DEPDIR)/scardcontrol-scardcontrol.Po
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-compile distclean-generic \
|
||||
distclean-tags
|
||||
|
@ -610,7 +622,8 @@ install-ps-am:
|
|||
installcheck-am:
|
||||
|
||||
maintainer-clean: maintainer-clean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f ./$(DEPDIR)/scardcontrol-PCSCv2part10.Po
|
||||
-rm -f ./$(DEPDIR)/scardcontrol-scardcontrol.Po
|
||||
-rm -f Makefile
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||
|
||||
|
@ -631,9 +644,9 @@ uninstall-am:
|
|||
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
|
||||
clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
|
||||
ctags-am distclean distclean-compile distclean-generic \
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
|
||||
clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
|
||||
ctags ctags-am distclean distclean-compile distclean-generic \
|
||||
distclean-libtool distclean-tags distdir dvi dvi-am html \
|
||||
html-am info info-am install install-am install-data \
|
||||
install-data-am install-dvi install-dvi-am install-exec \
|
||||
|
|
36
install-sh
36
install-sh
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
# install - install a program, script, or datafile
|
||||
|
||||
scriptversion=2014-09-12.12; # UTC
|
||||
scriptversion=2018-03-11.20; # UTC
|
||||
|
||||
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
||||
# later released in X11R6 (xc/config/util/install.sh) with the
|
||||
|
@ -271,15 +271,18 @@ do
|
|||
fi
|
||||
dst=$dst_arg
|
||||
|
||||
# If destination is a directory, append the input filename; won't work
|
||||
# if double slashes aren't ignored.
|
||||
# If destination is a directory, append the input filename.
|
||||
if test -d "$dst"; then
|
||||
if test "$is_target_a_directory" = never; then
|
||||
echo "$0: $dst_arg: Is a directory" >&2
|
||||
exit 1
|
||||
fi
|
||||
dstdir=$dst
|
||||
dst=$dstdir/`basename "$src"`
|
||||
dstbase=`basename "$src"`
|
||||
case $dst in
|
||||
*/) dst=$dst$dstbase;;
|
||||
*) dst=$dst/$dstbase;;
|
||||
esac
|
||||
dstdir_status=0
|
||||
else
|
||||
dstdir=`dirname "$dst"`
|
||||
|
@ -288,6 +291,11 @@ do
|
|||
fi
|
||||
fi
|
||||
|
||||
case $dstdir in
|
||||
*/) dstdirslash=$dstdir;;
|
||||
*) dstdirslash=$dstdir/;;
|
||||
esac
|
||||
|
||||
obsolete_mkdir_used=false
|
||||
|
||||
if test $dstdir_status != 0; then
|
||||
|
@ -324,14 +332,16 @@ do
|
|||
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
|
||||
;;
|
||||
*)
|
||||
# $RANDOM is not portable (e.g. dash); use it when possible to
|
||||
# lower collision chance
|
||||
# Note that $RANDOM variable is not portable (e.g. dash); Use it
|
||||
# here however when possible just to lower collision chance.
|
||||
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
|
||||
|
||||
trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
|
||||
|
||||
# As "mkdir -p" follows symlinks and we work in /tmp possibly; so
|
||||
# create the $tmpdir first (and fail if unsuccessful) to make sure
|
||||
# that nobody tries to guess the $tmpdir name.
|
||||
# Because "mkdir -p" follows existing symlinks and we likely work
|
||||
# directly in world-writeable /tmp, make sure that the '$tmpdir'
|
||||
# directory is successfully created first before we actually test
|
||||
# 'mkdir -p' feature.
|
||||
if (umask $mkdir_umask &&
|
||||
$mkdirprog $mkdir_mode "$tmpdir" &&
|
||||
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
|
||||
|
@ -434,8 +444,8 @@ do
|
|||
else
|
||||
|
||||
# Make a couple of temp file names in the proper directory.
|
||||
dsttmp=$dstdir/_inst.$$_
|
||||
rmtmp=$dstdir/_rm.$$_
|
||||
dsttmp=${dstdirslash}_inst.$$_
|
||||
rmtmp=${dstdirslash}_rm.$$_
|
||||
|
||||
# Trap to clean up those temp files at exit.
|
||||
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
|
||||
|
@ -500,9 +510,9 @@ do
|
|||
done
|
||||
|
||||
# Local variables:
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# eval: (add-hook 'before-save-hook 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC"
|
||||
# time-stamp-time-zone: "UTC0"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
|
|
556
ltmain.sh
556
ltmain.sh
|
@ -31,7 +31,7 @@
|
|||
|
||||
PROGRAM=libtool
|
||||
PACKAGE=libtool
|
||||
VERSION="2.4.6 Debian-2.4.6-2"
|
||||
VERSION="2.4.6 Debian-2.4.6-4"
|
||||
package_revision=2.4.6
|
||||
|
||||
|
||||
|
@ -64,7 +64,7 @@ package_revision=2.4.6
|
|||
# libraries, which are installed to $pkgauxdir.
|
||||
|
||||
# Set a version string for this script.
|
||||
scriptversion=2015-01-20.17; # UTC
|
||||
scriptversion=2015-10-12.13; # UTC
|
||||
|
||||
# General shell script boiler plate, and helper functions.
|
||||
# Written by Gary V. Vaughan, 2004
|
||||
|
@ -580,16 +580,16 @@ if test yes = "$_G_HAVE_PLUSEQ_OP"; then
|
|||
{
|
||||
$debug_cmd
|
||||
|
||||
func_quote_for_eval "$2"
|
||||
eval "$1+=\\ \$func_quote_for_eval_result"
|
||||
func_quote_arg pretty "$2"
|
||||
eval "$1+=\\ \$func_quote_arg_result"
|
||||
}'
|
||||
else
|
||||
func_append_quoted ()
|
||||
{
|
||||
$debug_cmd
|
||||
|
||||
func_quote_for_eval "$2"
|
||||
eval "$1=\$$1\\ \$func_quote_for_eval_result"
|
||||
func_quote_arg pretty "$2"
|
||||
eval "$1=\$$1\\ \$func_quote_arg_result"
|
||||
}
|
||||
fi
|
||||
|
||||
|
@ -1091,85 +1091,181 @@ func_relative_path ()
|
|||
}
|
||||
|
||||
|
||||
# func_quote_for_eval ARG...
|
||||
# --------------------------
|
||||
# Aesthetically quote ARGs to be evaled later.
|
||||
# This function returns two values:
|
||||
# i) func_quote_for_eval_result
|
||||
# double-quoted, suitable for a subsequent eval
|
||||
# ii) func_quote_for_eval_unquoted_result
|
||||
# has all characters that are still active within double
|
||||
# quotes backslashified.
|
||||
func_quote_for_eval ()
|
||||
# func_quote_portable EVAL ARG
|
||||
# ----------------------------
|
||||
# Internal function to portably implement func_quote_arg. Note that we still
|
||||
# keep attention to performance here so we as much as possible try to avoid
|
||||
# calling sed binary (so far O(N) complexity as long as func_append is O(1)).
|
||||
func_quote_portable ()
|
||||
{
|
||||
$debug_cmd
|
||||
|
||||
func_quote_for_eval_unquoted_result=
|
||||
func_quote_for_eval_result=
|
||||
while test 0 -lt $#; do
|
||||
case $1 in
|
||||
func_quote_portable_result=$2
|
||||
|
||||
# one-time-loop (easy break)
|
||||
while true
|
||||
do
|
||||
if $1; then
|
||||
func_quote_portable_result=`$ECHO "$2" | $SED \
|
||||
-e "$sed_double_quote_subst" -e "$sed_double_backslash"`
|
||||
break
|
||||
fi
|
||||
|
||||
# Quote for eval.
|
||||
case $func_quote_portable_result in
|
||||
*[\\\`\"\$]*)
|
||||
_G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
|
||||
*)
|
||||
_G_unquoted_arg=$1 ;;
|
||||
esac
|
||||
if test -n "$func_quote_for_eval_unquoted_result"; then
|
||||
func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
|
||||
else
|
||||
func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
|
||||
fi
|
||||
case $func_quote_portable_result in
|
||||
*[\[\*\?]*)
|
||||
func_quote_portable_result=`$ECHO "$func_quote_portable_result" | $SED "$sed_quote_subst"`
|
||||
break
|
||||
;;
|
||||
esac
|
||||
|
||||
case $_G_unquoted_arg in
|
||||
# Double-quote args containing shell metacharacters to delay
|
||||
# word splitting, command substitution and variable expansion
|
||||
# for a subsequent eval.
|
||||
# Many Bourne shells cannot handle close brackets correctly
|
||||
# in scan sets, so we specify it separately.
|
||||
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
||||
_G_quoted_arg=\"$_G_unquoted_arg\"
|
||||
func_quote_portable_old_IFS=$IFS
|
||||
for _G_char in '\' '`' '"' '$'
|
||||
do
|
||||
# STATE($1) PREV($2) SEPARATOR($3)
|
||||
set start "" ""
|
||||
func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy
|
||||
IFS=$_G_char
|
||||
for _G_part in $func_quote_portable_result
|
||||
do
|
||||
case $1 in
|
||||
quote)
|
||||
func_append func_quote_portable_result "$3$2"
|
||||
set quote "$_G_part" "\\$_G_char"
|
||||
;;
|
||||
start)
|
||||
set first "" ""
|
||||
func_quote_portable_result=
|
||||
;;
|
||||
first)
|
||||
set quote "$_G_part" ""
|
||||
;;
|
||||
esac
|
||||
done
|
||||
done
|
||||
IFS=$func_quote_portable_old_IFS
|
||||
;;
|
||||
*)
|
||||
_G_quoted_arg=$_G_unquoted_arg
|
||||
;;
|
||||
*) ;;
|
||||
esac
|
||||
|
||||
if test -n "$func_quote_for_eval_result"; then
|
||||
func_append func_quote_for_eval_result " $_G_quoted_arg"
|
||||
else
|
||||
func_append func_quote_for_eval_result "$_G_quoted_arg"
|
||||
fi
|
||||
shift
|
||||
break
|
||||
done
|
||||
|
||||
func_quote_portable_unquoted_result=$func_quote_portable_result
|
||||
case $func_quote_portable_result in
|
||||
# double-quote args containing shell metacharacters to delay
|
||||
# word splitting, command substitution and variable expansion
|
||||
# for a subsequent eval.
|
||||
# many bourne shells cannot handle close brackets correctly
|
||||
# in scan sets, so we specify it separately.
|
||||
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
||||
func_quote_portable_result=\"$func_quote_portable_result\"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
|
||||
# func_quote_for_expand ARG
|
||||
# -------------------------
|
||||
# Aesthetically quote ARG to be evaled later; same as above,
|
||||
# but do not quote variable references.
|
||||
func_quote_for_expand ()
|
||||
# func_quotefast_eval ARG
|
||||
# -----------------------
|
||||
# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG',
|
||||
# but optimized for speed. Result is stored in $func_quotefast_eval.
|
||||
if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then
|
||||
func_quotefast_eval ()
|
||||
{
|
||||
printf -v func_quotefast_eval_result %q "$1"
|
||||
}
|
||||
else
|
||||
func_quotefast_eval ()
|
||||
{
|
||||
func_quote_portable false "$1"
|
||||
func_quotefast_eval_result=$func_quote_portable_result
|
||||
}
|
||||
fi
|
||||
|
||||
|
||||
# func_quote_arg MODEs ARG
|
||||
# ------------------------
|
||||
# Quote one ARG to be evaled later. MODEs argument may contain zero ore more
|
||||
# specifiers listed below separated by ',' character. This function returns two
|
||||
# values:
|
||||
# i) func_quote_arg_result
|
||||
# double-quoted (when needed), suitable for a subsequent eval
|
||||
# ii) func_quote_arg_unquoted_result
|
||||
# has all characters that are still active within double
|
||||
# quotes backslashified. Available only if 'unquoted' is specified.
|
||||
#
|
||||
# Available modes:
|
||||
# ----------------
|
||||
# 'eval' (default)
|
||||
# - escape shell special characters
|
||||
# 'expand'
|
||||
# - the same as 'eval'; but do not quote variable references
|
||||
# 'pretty'
|
||||
# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might
|
||||
# later used in func_quote to get output like: 'echo "a b"' instead of
|
||||
# 'echo a\ b'. This is slower than default on some shells.
|
||||
# 'unquoted'
|
||||
# - produce also $func_quote_arg_unquoted_result which does not contain
|
||||
# wrapping double-quotes.
|
||||
#
|
||||
# Examples for 'func_quote_arg pretty,unquoted string':
|
||||
#
|
||||
# string | *_result | *_unquoted_result
|
||||
# ------------+-----------------------+-------------------
|
||||
# " | \" | \"
|
||||
# a b | "a b" | a b
|
||||
# "a b" | "\"a b\"" | \"a b\"
|
||||
# * | "*" | *
|
||||
# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\"
|
||||
#
|
||||
# Examples for 'func_quote_arg pretty,unquoted,expand string':
|
||||
#
|
||||
# string | *_result | *_unquoted_result
|
||||
# --------------+---------------------+--------------------
|
||||
# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\"
|
||||
func_quote_arg ()
|
||||
{
|
||||
$debug_cmd
|
||||
|
||||
case $1 in
|
||||
*[\\\`\"]*)
|
||||
_G_arg=`$ECHO "$1" | $SED \
|
||||
-e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
|
||||
*)
|
||||
_G_arg=$1 ;;
|
||||
esac
|
||||
|
||||
case $_G_arg in
|
||||
# Double-quote args containing shell metacharacters to delay
|
||||
# word splitting and command substitution for a subsequent eval.
|
||||
# Many Bourne shells cannot handle close brackets correctly
|
||||
# in scan sets, so we specify it separately.
|
||||
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
||||
_G_arg=\"$_G_arg\"
|
||||
_G_quote_expand=false
|
||||
case ,$1, in
|
||||
*,expand,*)
|
||||
_G_quote_expand=:
|
||||
;;
|
||||
esac
|
||||
|
||||
func_quote_for_expand_result=$_G_arg
|
||||
case ,$1, in
|
||||
*,pretty,*|*,expand,*|*,unquoted,*)
|
||||
func_quote_portable $_G_quote_expand "$2"
|
||||
func_quote_arg_result=$func_quote_portable_result
|
||||
func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result
|
||||
;;
|
||||
*)
|
||||
# Faster quote-for-eval for some shells.
|
||||
func_quotefast_eval "$2"
|
||||
func_quote_arg_result=$func_quotefast_eval_result
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
|
||||
# func_quote MODEs ARGs...
|
||||
# ------------------------
|
||||
# Quote all ARGs to be evaled later and join them into single command. See
|
||||
# func_quote_arg's description for more info.
|
||||
func_quote ()
|
||||
{
|
||||
$debug_cmd
|
||||
_G_func_quote_mode=$1 ; shift
|
||||
func_quote_result=
|
||||
while test 0 -lt $#; do
|
||||
func_quote_arg "$_G_func_quote_mode" "$1"
|
||||
if test -n "$func_quote_result"; then
|
||||
func_append func_quote_result " $func_quote_arg_result"
|
||||
else
|
||||
func_append func_quote_result "$func_quote_arg_result"
|
||||
fi
|
||||
shift
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
|
@ -1215,8 +1311,8 @@ func_show_eval ()
|
|||
_G_cmd=$1
|
||||
_G_fail_exp=${2-':'}
|
||||
|
||||
func_quote_for_expand "$_G_cmd"
|
||||
eval "func_notquiet $func_quote_for_expand_result"
|
||||
func_quote_arg pretty,expand "$_G_cmd"
|
||||
eval "func_notquiet $func_quote_arg_result"
|
||||
|
||||
$opt_dry_run || {
|
||||
eval "$_G_cmd"
|
||||
|
@ -1241,8 +1337,8 @@ func_show_eval_locale ()
|
|||
_G_fail_exp=${2-':'}
|
||||
|
||||
$opt_quiet || {
|
||||
func_quote_for_expand "$_G_cmd"
|
||||
eval "func_echo $func_quote_for_expand_result"
|
||||
func_quote_arg expand,pretty "$_G_cmd"
|
||||
eval "func_echo $func_quote_arg_result"
|
||||
}
|
||||
|
||||
$opt_dry_run || {
|
||||
|
@ -1370,7 +1466,7 @@ func_lt_ver ()
|
|||
#! /bin/sh
|
||||
|
||||
# Set a version string for this script.
|
||||
scriptversion=2014-01-07.03; # UTC
|
||||
scriptversion=2015-10-12.13; # UTC
|
||||
|
||||
# A portable, pluggable option parser for Bourne shell.
|
||||
# Written by Gary V. Vaughan, 2010
|
||||
|
@ -1530,6 +1626,8 @@ func_run_hooks ()
|
|||
{
|
||||
$debug_cmd
|
||||
|
||||
_G_rc_run_hooks=false
|
||||
|
||||
case " $hookable_fns " in
|
||||
*" $1 "*) ;;
|
||||
*) func_fatal_error "'$1' does not support hook funcions.n" ;;
|
||||
|
@ -1538,16 +1636,16 @@ func_run_hooks ()
|
|||
eval _G_hook_fns=\$$1_hooks; shift
|
||||
|
||||
for _G_hook in $_G_hook_fns; do
|
||||
eval $_G_hook '"$@"'
|
||||
|
||||
# store returned options list back into positional
|
||||
# parameters for next 'cmd' execution.
|
||||
eval _G_hook_result=\$${_G_hook}_result
|
||||
eval set dummy "$_G_hook_result"; shift
|
||||
if eval $_G_hook '"$@"'; then
|
||||
# store returned options list back into positional
|
||||
# parameters for next 'cmd' execution.
|
||||
eval _G_hook_result=\$${_G_hook}_result
|
||||
eval set dummy "$_G_hook_result"; shift
|
||||
_G_rc_run_hooks=:
|
||||
fi
|
||||
done
|
||||
|
||||
func_quote_for_eval ${1+"$@"}
|
||||
func_run_hooks_result=$func_quote_for_eval_result
|
||||
$_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
|
||||
}
|
||||
|
||||
|
||||
|
@ -1557,10 +1655,16 @@ func_run_hooks ()
|
|||
## --------------- ##
|
||||
|
||||
# In order to add your own option parsing hooks, you must accept the
|
||||
# full positional parameter list in your hook function, remove any
|
||||
# options that you action, and then pass back the remaining unprocessed
|
||||
# full positional parameter list in your hook function, you may remove/edit
|
||||
# any options that you action, and then pass back the remaining unprocessed
|
||||
# options in '<hooked_function_name>_result', escaped suitably for
|
||||
# 'eval'. Like this:
|
||||
# 'eval'. In this case you also must return $EXIT_SUCCESS to let the
|
||||
# hook's caller know that it should pay attention to
|
||||
# '<hooked_function_name>_result'. Returning $EXIT_FAILURE signalizes that
|
||||
# arguments are left untouched by the hook and therefore caller will ignore the
|
||||
# result variable.
|
||||
#
|
||||
# Like this:
|
||||
#
|
||||
# my_options_prep ()
|
||||
# {
|
||||
|
@ -1570,9 +1674,11 @@ func_run_hooks ()
|
|||
# usage_message=$usage_message'
|
||||
# -s, --silent don'\''t print informational messages
|
||||
# '
|
||||
#
|
||||
# func_quote_for_eval ${1+"$@"}
|
||||
# my_options_prep_result=$func_quote_for_eval_result
|
||||
# # No change in '$@' (ignored completely by this hook). There is
|
||||
# # no need to do the equivalent (but slower) action:
|
||||
# # func_quote eval ${1+"$@"}
|
||||
# # my_options_prep_result=$func_quote_result
|
||||
# false
|
||||
# }
|
||||
# func_add_hook func_options_prep my_options_prep
|
||||
#
|
||||
|
@ -1581,25 +1687,37 @@ func_run_hooks ()
|
|||
# {
|
||||
# $debug_cmd
|
||||
#
|
||||
# args_changed=false
|
||||
#
|
||||
# # Note that for efficiency, we parse as many options as we can
|
||||
# # recognise in a loop before passing the remainder back to the
|
||||
# # caller on the first unrecognised argument we encounter.
|
||||
# while test $# -gt 0; do
|
||||
# opt=$1; shift
|
||||
# case $opt in
|
||||
# --silent|-s) opt_silent=: ;;
|
||||
# --silent|-s) opt_silent=:
|
||||
# args_changed=:
|
||||
# ;;
|
||||
# # Separate non-argument short options:
|
||||
# -s*) func_split_short_opt "$_G_opt"
|
||||
# set dummy "$func_split_short_opt_name" \
|
||||
# "-$func_split_short_opt_arg" ${1+"$@"}
|
||||
# shift
|
||||
# args_changed=:
|
||||
# ;;
|
||||
# *) set dummy "$_G_opt" "$*"; shift; break ;;
|
||||
# *) # Make sure the first unrecognised option "$_G_opt"
|
||||
# # is added back to "$@", we could need that later
|
||||
# # if $args_changed is true.
|
||||
# set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
|
||||
# esac
|
||||
# done
|
||||
#
|
||||
# func_quote_for_eval ${1+"$@"}
|
||||
# my_silent_option_result=$func_quote_for_eval_result
|
||||
# if $args_changed; then
|
||||
# func_quote eval ${1+"$@"}
|
||||
# my_silent_option_result=$func_quote_result
|
||||
# fi
|
||||
#
|
||||
# $args_changed
|
||||
# }
|
||||
# func_add_hook func_parse_options my_silent_option
|
||||
#
|
||||
|
@ -1611,16 +1729,32 @@ func_run_hooks ()
|
|||
# $opt_silent && $opt_verbose && func_fatal_help "\
|
||||
# '--silent' and '--verbose' options are mutually exclusive."
|
||||
#
|
||||
# func_quote_for_eval ${1+"$@"}
|
||||
# my_option_validation_result=$func_quote_for_eval_result
|
||||
# false
|
||||
# }
|
||||
# func_add_hook func_validate_options my_option_validation
|
||||
#
|
||||
# You'll alse need to manually amend $usage_message to reflect the extra
|
||||
# You'll also need to manually amend $usage_message to reflect the extra
|
||||
# options you parse. It's preferable to append if you can, so that
|
||||
# multiple option parsing hooks can be added safely.
|
||||
|
||||
|
||||
# func_options_finish [ARG]...
|
||||
# ----------------------------
|
||||
# Finishing the option parse loop (call 'func_options' hooks ATM).
|
||||
func_options_finish ()
|
||||
{
|
||||
$debug_cmd
|
||||
|
||||
_G_func_options_finish_exit=false
|
||||
if func_run_hooks func_options ${1+"$@"}; then
|
||||
func_options_finish_result=$func_run_hooks_result
|
||||
_G_func_options_finish_exit=:
|
||||
fi
|
||||
|
||||
$_G_func_options_finish_exit
|
||||
}
|
||||
|
||||
|
||||
# func_options [ARG]...
|
||||
# ---------------------
|
||||
# All the functions called inside func_options are hookable. See the
|
||||
|
@ -1630,17 +1764,28 @@ func_options ()
|
|||
{
|
||||
$debug_cmd
|
||||
|
||||
func_options_prep ${1+"$@"}
|
||||
eval func_parse_options \
|
||||
${func_options_prep_result+"$func_options_prep_result"}
|
||||
eval func_validate_options \
|
||||
${func_parse_options_result+"$func_parse_options_result"}
|
||||
_G_rc_options=false
|
||||
|
||||
eval func_run_hooks func_options \
|
||||
${func_validate_options_result+"$func_validate_options_result"}
|
||||
for my_func in options_prep parse_options validate_options options_finish
|
||||
do
|
||||
if eval func_$my_func '${1+"$@"}'; then
|
||||
eval _G_res_var='$'"func_${my_func}_result"
|
||||
eval set dummy "$_G_res_var" ; shift
|
||||
_G_rc_options=:
|
||||
fi
|
||||
done
|
||||
|
||||
# save modified positional parameters for caller
|
||||
func_options_result=$func_run_hooks_result
|
||||
# Save modified positional parameters for caller. As a top-level
|
||||
# options-parser function we always need to set the 'func_options_result'
|
||||
# variable (regardless the $_G_rc_options value).
|
||||
if $_G_rc_options; then
|
||||
func_options_result=$_G_res_var
|
||||
else
|
||||
func_quote eval ${1+"$@"}
|
||||
func_options_result=$func_quote_result
|
||||
fi
|
||||
|
||||
$_G_rc_options
|
||||
}
|
||||
|
||||
|
||||
|
@ -1649,9 +1794,9 @@ func_options ()
|
|||
# All initialisations required before starting the option parse loop.
|
||||
# Note that when calling hook functions, we pass through the list of
|
||||
# positional parameters. If a hook function modifies that list, and
|
||||
# needs to propogate that back to rest of this script, then the complete
|
||||
# needs to propagate that back to rest of this script, then the complete
|
||||
# modified list must be put in 'func_run_hooks_result' before
|
||||
# returning.
|
||||
# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
|
||||
func_hookable func_options_prep
|
||||
func_options_prep ()
|
||||
{
|
||||
|
@ -1661,10 +1806,14 @@ func_options_prep ()
|
|||
opt_verbose=false
|
||||
opt_warning_types=
|
||||
|
||||
func_run_hooks func_options_prep ${1+"$@"}
|
||||
_G_rc_options_prep=false
|
||||
if func_run_hooks func_options_prep ${1+"$@"}; then
|
||||
_G_rc_options_prep=:
|
||||
# save modified positional parameters for caller
|
||||
func_options_prep_result=$func_run_hooks_result
|
||||
fi
|
||||
|
||||
# save modified positional parameters for caller
|
||||
func_options_prep_result=$func_run_hooks_result
|
||||
$_G_rc_options_prep
|
||||
}
|
||||
|
||||
|
||||
|
@ -1678,18 +1827,20 @@ func_parse_options ()
|
|||
|
||||
func_parse_options_result=
|
||||
|
||||
_G_rc_parse_options=false
|
||||
# this just eases exit handling
|
||||
while test $# -gt 0; do
|
||||
# Defer to hook functions for initial option parsing, so they
|
||||
# get priority in the event of reusing an option name.
|
||||
func_run_hooks func_parse_options ${1+"$@"}
|
||||
|
||||
# Adjust func_parse_options positional parameters to match
|
||||
eval set dummy "$func_run_hooks_result"; shift
|
||||
if func_run_hooks func_parse_options ${1+"$@"}; then
|
||||
eval set dummy "$func_run_hooks_result"; shift
|
||||
_G_rc_parse_options=:
|
||||
fi
|
||||
|
||||
# Break out of the loop if we already parsed every option.
|
||||
test $# -gt 0 || break
|
||||
|
||||
_G_match_parse_options=:
|
||||
_G_opt=$1
|
||||
shift
|
||||
case $_G_opt in
|
||||
|
@ -1704,7 +1855,10 @@ func_parse_options ()
|
|||
;;
|
||||
|
||||
--warnings|--warning|-W)
|
||||
test $# = 0 && func_missing_arg $_G_opt && break
|
||||
if test $# = 0 && func_missing_arg $_G_opt; then
|
||||
_G_rc_parse_options=:
|
||||
break
|
||||
fi
|
||||
case " $warning_categories $1" in
|
||||
*" $1 "*)
|
||||
# trailing space prevents matching last $1 above
|
||||
|
@ -1757,15 +1911,25 @@ func_parse_options ()
|
|||
shift
|
||||
;;
|
||||
|
||||
--) break ;;
|
||||
--) _G_rc_parse_options=: ; break ;;
|
||||
-*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
|
||||
*) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
|
||||
*) set dummy "$_G_opt" ${1+"$@"}; shift
|
||||
_G_match_parse_options=false
|
||||
break
|
||||
;;
|
||||
esac
|
||||
|
||||
$_G_match_parse_options && _G_rc_parse_options=:
|
||||
done
|
||||
|
||||
# save modified positional parameters for caller
|
||||
func_quote_for_eval ${1+"$@"}
|
||||
func_parse_options_result=$func_quote_for_eval_result
|
||||
|
||||
if $_G_rc_parse_options; then
|
||||
# save modified positional parameters for caller
|
||||
func_quote eval ${1+"$@"}
|
||||
func_parse_options_result=$func_quote_result
|
||||
fi
|
||||
|
||||
$_G_rc_parse_options
|
||||
}
|
||||
|
||||
|
||||
|
@ -1778,16 +1942,21 @@ func_validate_options ()
|
|||
{
|
||||
$debug_cmd
|
||||
|
||||
_G_rc_validate_options=false
|
||||
|
||||
# Display all warnings if -W was not given.
|
||||
test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
|
||||
|
||||
func_run_hooks func_validate_options ${1+"$@"}
|
||||
if func_run_hooks func_validate_options ${1+"$@"}; then
|
||||
# save modified positional parameters for caller
|
||||
func_validate_options_result=$func_run_hooks_result
|
||||
_G_rc_validate_options=:
|
||||
fi
|
||||
|
||||
# Bail if the options were screwed!
|
||||
$exit_cmd $EXIT_FAILURE
|
||||
|
||||
# save modified positional parameters for caller
|
||||
func_validate_options_result=$func_run_hooks_result
|
||||
$_G_rc_validate_options
|
||||
}
|
||||
|
||||
|
||||
|
@ -2068,7 +2237,7 @@ include the following information:
|
|||
compiler: $LTCC
|
||||
compiler flags: $LTCFLAGS
|
||||
linker: $LD (gnu? $with_gnu_ld)
|
||||
version: $progname $scriptversion Debian-2.4.6-2
|
||||
version: $progname $scriptversion Debian-2.4.6-4
|
||||
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
|
||||
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
|
||||
|
||||
|
@ -2270,6 +2439,8 @@ libtool_options_prep ()
|
|||
nonopt=
|
||||
preserve_args=
|
||||
|
||||
_G_rc_lt_options_prep=:
|
||||
|
||||
# Shorthand for --mode=foo, only valid as the first argument
|
||||
case $1 in
|
||||
clean|clea|cle|cl)
|
||||
|
@ -2293,11 +2464,18 @@ libtool_options_prep ()
|
|||
uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
|
||||
shift; set dummy --mode uninstall ${1+"$@"}; shift
|
||||
;;
|
||||
*)
|
||||
_G_rc_lt_options_prep=false
|
||||
;;
|
||||
esac
|
||||
|
||||
# Pass back the list of options.
|
||||
func_quote_for_eval ${1+"$@"}
|
||||
libtool_options_prep_result=$func_quote_for_eval_result
|
||||
if $_G_rc_lt_options_prep; then
|
||||
# Pass back the list of options.
|
||||
func_quote eval ${1+"$@"}
|
||||
libtool_options_prep_result=$func_quote_result
|
||||
fi
|
||||
|
||||
$_G_rc_lt_options_prep
|
||||
}
|
||||
func_add_hook func_options_prep libtool_options_prep
|
||||
|
||||
|
@ -2309,9 +2487,12 @@ libtool_parse_options ()
|
|||
{
|
||||
$debug_cmd
|
||||
|
||||
_G_rc_lt_parse_options=false
|
||||
|
||||
# Perform our own loop to consume as many options as possible in
|
||||
# each iteration.
|
||||
while test $# -gt 0; do
|
||||
_G_match_lt_parse_options=:
|
||||
_G_opt=$1
|
||||
shift
|
||||
case $_G_opt in
|
||||
|
@ -2386,15 +2567,22 @@ libtool_parse_options ()
|
|||
func_append preserve_args " $_G_opt"
|
||||
;;
|
||||
|
||||
# An option not handled by this hook function:
|
||||
*) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
|
||||
# An option not handled by this hook function:
|
||||
*) set dummy "$_G_opt" ${1+"$@"} ; shift
|
||||
_G_match_lt_parse_options=false
|
||||
break
|
||||
;;
|
||||
esac
|
||||
$_G_match_lt_parse_options && _G_rc_lt_parse_options=:
|
||||
done
|
||||
|
||||
if $_G_rc_lt_parse_options; then
|
||||
# save modified positional parameters for caller
|
||||
func_quote eval ${1+"$@"}
|
||||
libtool_parse_options_result=$func_quote_result
|
||||
fi
|
||||
|
||||
# save modified positional parameters for caller
|
||||
func_quote_for_eval ${1+"$@"}
|
||||
libtool_parse_options_result=$func_quote_for_eval_result
|
||||
$_G_rc_lt_parse_options
|
||||
}
|
||||
func_add_hook func_parse_options libtool_parse_options
|
||||
|
||||
|
@ -2451,8 +2639,8 @@ libtool_validate_options ()
|
|||
}
|
||||
|
||||
# Pass back the unparsed argument list
|
||||
func_quote_for_eval ${1+"$@"}
|
||||
libtool_validate_options_result=$func_quote_for_eval_result
|
||||
func_quote eval ${1+"$@"}
|
||||
libtool_validate_options_result=$func_quote_result
|
||||
}
|
||||
func_add_hook func_validate_options libtool_validate_options
|
||||
|
||||
|
@ -3418,8 +3606,8 @@ func_mode_compile ()
|
|||
esac
|
||||
done
|
||||
|
||||
func_quote_for_eval "$libobj"
|
||||
test "X$libobj" != "X$func_quote_for_eval_result" \
|
||||
func_quote_arg pretty "$libobj"
|
||||
test "X$libobj" != "X$func_quote_arg_result" \
|
||||
&& $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
|
||||
&& func_warning "libobj name '$libobj' may not contain shell special characters."
|
||||
func_dirname_and_basename "$obj" "/" ""
|
||||
|
@ -3492,8 +3680,8 @@ compiler."
|
|||
|
||||
func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
|
||||
srcfile=$func_to_tool_file_result
|
||||
func_quote_for_eval "$srcfile"
|
||||
qsrcfile=$func_quote_for_eval_result
|
||||
func_quote_arg pretty "$srcfile"
|
||||
qsrcfile=$func_quote_arg_result
|
||||
|
||||
# Only build a PIC object if we are building libtool libraries.
|
||||
if test yes = "$build_libtool_libs"; then
|
||||
|
@ -4096,8 +4284,8 @@ func_mode_install ()
|
|||
case $nonopt in *shtool*) :;; *) false;; esac
|
||||
then
|
||||
# Aesthetically quote it.
|
||||
func_quote_for_eval "$nonopt"
|
||||
install_prog="$func_quote_for_eval_result "
|
||||
func_quote_arg pretty "$nonopt"
|
||||
install_prog="$func_quote_arg_result "
|
||||
arg=$1
|
||||
shift
|
||||
else
|
||||
|
@ -4107,8 +4295,8 @@ func_mode_install ()
|
|||
|
||||
# The real first argument should be the name of the installation program.
|
||||
# Aesthetically quote it.
|
||||
func_quote_for_eval "$arg"
|
||||
func_append install_prog "$func_quote_for_eval_result"
|
||||
func_quote_arg pretty "$arg"
|
||||
func_append install_prog "$func_quote_arg_result"
|
||||
install_shared_prog=$install_prog
|
||||
case " $install_prog " in
|
||||
*[\\\ /]cp\ *) install_cp=: ;;
|
||||
|
@ -4165,12 +4353,12 @@ func_mode_install ()
|
|||
esac
|
||||
|
||||
# Aesthetically quote the argument.
|
||||
func_quote_for_eval "$arg"
|
||||
func_append install_prog " $func_quote_for_eval_result"
|
||||
func_quote_arg pretty "$arg"
|
||||
func_append install_prog " $func_quote_arg_result"
|
||||
if test -n "$arg2"; then
|
||||
func_quote_for_eval "$arg2"
|
||||
func_quote_arg pretty "$arg2"
|
||||
fi
|
||||
func_append install_shared_prog " $func_quote_for_eval_result"
|
||||
func_append install_shared_prog " $func_quote_arg_result"
|
||||
done
|
||||
|
||||
test -z "$install_prog" && \
|
||||
|
@ -4181,8 +4369,8 @@ func_mode_install ()
|
|||
|
||||
if test -n "$install_override_mode" && $no_mode; then
|
||||
if $install_cp; then :; else
|
||||
func_quote_for_eval "$install_override_mode"
|
||||
func_append install_shared_prog " -m $func_quote_for_eval_result"
|
||||
func_quote_arg pretty "$install_override_mode"
|
||||
func_append install_shared_prog " -m $func_quote_arg_result"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
@ -4478,8 +4666,8 @@ func_mode_install ()
|
|||
relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
|
||||
|
||||
$opt_quiet || {
|
||||
func_quote_for_expand "$relink_command"
|
||||
eval "func_echo $func_quote_for_expand_result"
|
||||
func_quote_arg expand,pretty "$relink_command"
|
||||
eval "func_echo $func_quote_arg_result"
|
||||
}
|
||||
if eval "$relink_command"; then :
|
||||
else
|
||||
|
@ -5258,7 +5446,8 @@ else
|
|||
if test \"\$libtool_execute_magic\" != \"$magic\"; then
|
||||
file=\"\$0\""
|
||||
|
||||
qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
|
||||
func_quote_arg pretty "$ECHO"
|
||||
qECHO=$func_quote_arg_result
|
||||
$ECHO "\
|
||||
|
||||
# A function that is used when there is no print builtin or printf.
|
||||
|
@ -5268,7 +5457,7 @@ func_fallback_echo ()
|
|||
\$1
|
||||
_LTECHO_EOF'
|
||||
}
|
||||
ECHO=\"$qECHO\"
|
||||
ECHO=$qECHO
|
||||
fi
|
||||
|
||||
# Very basic option parsing. These options are (a) specific to
|
||||
|
@ -6611,9 +6800,9 @@ func_mode_link ()
|
|||
while test "$#" -gt 0; do
|
||||
arg=$1
|
||||
shift
|
||||
func_quote_for_eval "$arg"
|
||||
qarg=$func_quote_for_eval_unquoted_result
|
||||
func_append libtool_args " $func_quote_for_eval_result"
|
||||
func_quote_arg pretty,unquoted "$arg"
|
||||
qarg=$func_quote_arg_unquoted_result
|
||||
func_append libtool_args " $func_quote_arg_result"
|
||||
|
||||
# If the previous option needs an argument, assign it.
|
||||
if test -n "$prev"; then
|
||||
|
@ -7211,9 +7400,9 @@ func_mode_link ()
|
|||
save_ifs=$IFS; IFS=,
|
||||
for flag in $args; do
|
||||
IFS=$save_ifs
|
||||
func_quote_for_eval "$flag"
|
||||
func_append arg " $func_quote_for_eval_result"
|
||||
func_append compiler_flags " $func_quote_for_eval_result"
|
||||
func_quote_arg pretty "$flag"
|
||||
func_append arg " $func_quote_arg_result"
|
||||
func_append compiler_flags " $func_quote_arg_result"
|
||||
done
|
||||
IFS=$save_ifs
|
||||
func_stripname ' ' '' "$arg"
|
||||
|
@ -7227,10 +7416,10 @@ func_mode_link ()
|
|||
save_ifs=$IFS; IFS=,
|
||||
for flag in $args; do
|
||||
IFS=$save_ifs
|
||||
func_quote_for_eval "$flag"
|
||||
func_append arg " $wl$func_quote_for_eval_result"
|
||||
func_append compiler_flags " $wl$func_quote_for_eval_result"
|
||||
func_append linker_flags " $func_quote_for_eval_result"
|
||||
func_quote_arg pretty "$flag"
|
||||
func_append arg " $wl$func_quote_arg_result"
|
||||
func_append compiler_flags " $wl$func_quote_arg_result"
|
||||
func_append linker_flags " $func_quote_arg_result"
|
||||
done
|
||||
IFS=$save_ifs
|
||||
func_stripname ' ' '' "$arg"
|
||||
|
@ -7254,8 +7443,8 @@ func_mode_link ()
|
|||
|
||||
# -msg_* for osf cc
|
||||
-msg_*)
|
||||
func_quote_for_eval "$arg"
|
||||
arg=$func_quote_for_eval_result
|
||||
func_quote_arg pretty "$arg"
|
||||
arg=$func_quote_arg_result
|
||||
;;
|
||||
|
||||
# Flags to be passed through unchanged, with rationale:
|
||||
|
@ -7279,8 +7468,8 @@ func_mode_link ()
|
|||
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
|
||||
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
|
||||
-specs=*|-fsanitize=*)
|
||||
func_quote_for_eval "$arg"
|
||||
arg=$func_quote_for_eval_result
|
||||
func_quote_arg pretty "$arg"
|
||||
arg=$func_quote_arg_result
|
||||
func_append compile_command " $arg"
|
||||
func_append finalize_command " $arg"
|
||||
func_append compiler_flags " $arg"
|
||||
|
@ -7301,15 +7490,15 @@ func_mode_link ()
|
|||
continue
|
||||
else
|
||||
# Otherwise treat like 'Some other compiler flag' below
|
||||
func_quote_for_eval "$arg"
|
||||
arg=$func_quote_for_eval_result
|
||||
func_quote_arg pretty "$arg"
|
||||
arg=$func_quote_arg_result
|
||||
fi
|
||||
;;
|
||||
|
||||
# Some other compiler flag.
|
||||
-* | +*)
|
||||
func_quote_for_eval "$arg"
|
||||
arg=$func_quote_for_eval_result
|
||||
func_quote_arg pretty "$arg"
|
||||
arg=$func_quote_arg_result
|
||||
;;
|
||||
|
||||
*.$objext)
|
||||
|
@ -7429,8 +7618,8 @@ func_mode_link ()
|
|||
*)
|
||||
# Unknown arguments in both finalize_command and compile_command need
|
||||
# to be aesthetically quoted because they are evaled later.
|
||||
func_quote_for_eval "$arg"
|
||||
arg=$func_quote_for_eval_result
|
||||
func_quote_arg pretty "$arg"
|
||||
arg=$func_quote_arg_result
|
||||
;;
|
||||
esac # arg
|
||||
|
||||
|
@ -9942,8 +10131,8 @@ EOF
|
|||
for cmd in $concat_cmds; do
|
||||
IFS=$save_ifs
|
||||
$opt_quiet || {
|
||||
func_quote_for_expand "$cmd"
|
||||
eval "func_echo $func_quote_for_expand_result"
|
||||
func_quote_arg expand,pretty "$cmd"
|
||||
eval "func_echo $func_quote_arg_result"
|
||||
}
|
||||
$opt_dry_run || eval "$cmd" || {
|
||||
lt_exit=$?
|
||||
|
@ -10036,8 +10225,8 @@ EOF
|
|||
eval cmd=\"$cmd\"
|
||||
IFS=$save_ifs
|
||||
$opt_quiet || {
|
||||
func_quote_for_expand "$cmd"
|
||||
eval "func_echo $func_quote_for_expand_result"
|
||||
func_quote_arg expand,pretty "$cmd"
|
||||
eval "func_echo $func_quote_arg_result"
|
||||
}
|
||||
$opt_dry_run || eval "$cmd" || {
|
||||
lt_exit=$?
|
||||
|
@ -10511,12 +10700,12 @@ EOF
|
|||
elif eval var_value=\$$var; test -z "$var_value"; then
|
||||
relink_command="$var=; export $var; $relink_command"
|
||||
else
|
||||
func_quote_for_eval "$var_value"
|
||||
relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
|
||||
func_quote_arg pretty "$var_value"
|
||||
relink_command="$var=$func_quote_arg_result; export $var; $relink_command"
|
||||
fi
|
||||
done
|
||||
relink_command="(cd `pwd`; $relink_command)"
|
||||
relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
|
||||
func_quote_arg pretty,unquoted "(cd `pwd`; $relink_command)"
|
||||
relink_command=$func_quote_arg_unquoted_result
|
||||
fi
|
||||
|
||||
# Only actually do things if not in dry run mode.
|
||||
|
@ -10756,13 +10945,14 @@ EOF
|
|||
elif eval var_value=\$$var; test -z "$var_value"; then
|
||||
relink_command="$var=; export $var; $relink_command"
|
||||
else
|
||||
func_quote_for_eval "$var_value"
|
||||
relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
|
||||
func_quote_arg pretty,unquoted "$var_value"
|
||||
relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command"
|
||||
fi
|
||||
done
|
||||
# Quote the link command for shipping.
|
||||
relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
|
||||
func_quote_arg pretty,unquoted "$relink_command"
|
||||
relink_command=$func_quote_arg_unquoted_result
|
||||
if test yes = "$hardcode_automatic"; then
|
||||
relink_command=
|
||||
fi
|
||||
|
|
|
@ -6438,7 +6438,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
|
||||
|
||||
else
|
||||
GXX=no
|
||||
|
@ -6813,7 +6813,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
# dependencies.
|
||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
||||
;;
|
||||
*)
|
||||
if test yes = "$GXX"; then
|
||||
|
@ -6878,7 +6878,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|||
# explicitly linking system object files so we need to strip them
|
||||
# from the output so that they don't get included in the library
|
||||
# dependencies.
|
||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
|
||||
;;
|
||||
*)
|
||||
if test yes = "$GXX"; then
|
||||
|
@ -7217,7 +7217,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
|
||||
|
||||
else
|
||||
# FIXME: insert proper C++ library support
|
||||
|
@ -7301,7 +7301,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
|
||||
else
|
||||
# g++ 2.7 appears to require '-G' NOT '-shared' on this
|
||||
# platform.
|
||||
|
@ -7312,7 +7312,7 @@ if test yes != "$_lt_caught_CXX_error"; then
|
|||
# Commands to make compiler produce verbose output that lists
|
||||
# what "hidden" libraries, object files and flags are used when
|
||||
# linking a shared library.
|
||||
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
|
||||
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
|
||||
fi
|
||||
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
|
||||
|
|
16
missing
16
missing
|
@ -1,9 +1,9 @@
|
|||
#! /bin/sh
|
||||
# Common wrapper for a few potentially missing GNU programs.
|
||||
|
||||
scriptversion=2013-10-28.13; # UTC
|
||||
scriptversion=2018-03-07.03; # UTC
|
||||
|
||||
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
|
||||
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
@ -17,7 +17,7 @@ scriptversion=2013-10-28.13; # UTC
|
|||
# GNU General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
|
@ -101,9 +101,9 @@ else
|
|||
exit $st
|
||||
fi
|
||||
|
||||
perl_URL=http://www.perl.org/
|
||||
flex_URL=http://flex.sourceforge.net/
|
||||
gnu_software_URL=http://www.gnu.org/software
|
||||
perl_URL=https://www.perl.org/
|
||||
flex_URL=https://github.com/westes/flex
|
||||
gnu_software_URL=https://www.gnu.org/software
|
||||
|
||||
program_details ()
|
||||
{
|
||||
|
@ -207,9 +207,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
|
|||
exit $st
|
||||
|
||||
# Local variables:
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# eval: (add-hook 'before-save-hook 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC"
|
||||
# time-stamp-time-zone: "UTC0"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Makefile.in generated by automake 1.15 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.16.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -287,8 +287,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|||
*config.status*) \
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
||||
*) \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
|
||||
esac;
|
||||
|
||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||
|
@ -312,7 +312,10 @@ ctags CTAGS:
|
|||
cscope cscopelist:
|
||||
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
distdir: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) distdir-am
|
||||
|
||||
distdir-am: $(DISTFILES)
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
list='$(DISTFILES)'; \
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#
|
||||
# List of readers supported by the CCID driver
|
||||
# Generated: 2018-02-20
|
||||
# Generated: 2018-09-04
|
||||
#
|
||||
# DO NOT EDIT BY HAND
|
||||
|
||||
# Website: http://pcsclite.alioth.debian.org/ccid.html
|
||||
# Website: https://ccid.apdu.fr/
|
||||
|
||||
##########################
|
||||
# section: supported
|
||||
|
@ -133,6 +133,7 @@
|
|||
0x072F:0x223F:ACS ACR1255U-J1
|
||||
0x072F:0x8201:ACS APG8201 PINhandy 1
|
||||
0x072F:0x8202:ACS APG8201 USB Reader
|
||||
0x072F:0x8300:ACS ACR33 ICC Reader
|
||||
0x072F:0x90DB:ACS CryptoMate64
|
||||
0x072F:0xB000:ACS ACR3901U ICC Reader
|
||||
0x072F:0xB100:ACS ACR39U ICC Reader
|
||||
|
@ -203,6 +204,7 @@
|
|||
0x23A0:0x0001:BIFIT USB-Token iBank2key
|
||||
0x23A0:0x0002:BIFIT iBank2Key
|
||||
0x23A0:0x0003:BIFIT iToken
|
||||
0x23A0:0x0008:BIFIT ANGARA
|
||||
|
||||
# Bit4id
|
||||
0x25DD:0x1101:Bit4id miniLector-s
|
||||
|
@ -227,6 +229,7 @@
|
|||
0x0A5C:0x5832:Broadcom Corp 5880
|
||||
0x0A5C:0x5833:Broadcom Corp 5880
|
||||
0x0A5C:0x5834:Broadcom Corp 5880
|
||||
0x0A5C:0x5842:Broadcom Corp 58200
|
||||
|
||||
# C3PO
|
||||
0x0783:0x0007:C3PO TLTC2USB
|
||||
|
@ -240,6 +243,9 @@
|
|||
# CCB
|
||||
0x8829:0xCCB2:CCB eSafeLD
|
||||
|
||||
# Certgate GmbH
|
||||
0x2DFF:0xB601:Certgate GmbH AirID 2 USB
|
||||
|
||||
# charismathics
|
||||
0x19E7:0x0002:charismathics plug'n'crypt CCID token
|
||||
|
||||
|
@ -268,6 +274,9 @@
|
|||
0x0982:0x0008:COVADIS VEGA-ALPHA
|
||||
0x0982:0x0040:COVADIS Auriga
|
||||
|
||||
# DC.Ltd
|
||||
0x257B:0xC305:DC.Ltd DC4 5CCID READER
|
||||
|
||||
# DUALi
|
||||
0x1DB2:0x0801:DUALi DE-620 Combi
|
||||
0x1DB2:0x088B:DUALi DRAGON NFC READER
|
||||
|
@ -310,6 +319,8 @@
|
|||
0x096E:0x0859:FT CCID
|
||||
|
||||
# Fujitsu
|
||||
0x0BF8:0x1022:Fujitsu Keyboard KB100 SCR
|
||||
0x0BF8:0x1023:Fujitsu Keyboard KB100 SCR eSIG
|
||||
0x0BF8:0x1024:Fujitsu Smartcard Reader D323
|
||||
|
||||
# Fujitsu Siemens Computers
|
||||
|
@ -318,9 +329,7 @@
|
|||
|
||||
# FujitsuTechnologySolutions GmbH
|
||||
0x0BF8:0x1017:FujitsuTechnologySolutions GmbH SmartCase KB SCR eSIG
|
||||
0x0BF8:0x1021:FujitsuTechnologySolutions GmbH Smartcard Keyboard G87-914x
|
||||
0x0BF8:0x1022:FujitsuTechnologySolutions GmbH Keyboard KB100 SCR
|
||||
0x0BF8:0x1023:FujitsuTechnologySolutions GmbH Keyboard KB100 SCR eSIG
|
||||
0x0BF8:0x1021:FujitsuTechnologySolutions GmbH Keyboard KB SCR2
|
||||
|
||||
# GEMALTO
|
||||
0x08E6:0x3440:GEMALTO CT1100
|
||||
|
@ -345,6 +354,10 @@
|
|||
# Generic USB
|
||||
0x076B:0x3A21:Generic USB Smart Card Reader
|
||||
|
||||
# Genesys Logic
|
||||
0x05E3:0x0757:Genesys Logic CCID Card Reader
|
||||
0x05E3:0x0758:Genesys Logic Combo Card Reader
|
||||
|
||||
# German Privacy Foundation
|
||||
0x20A0:0x4107:German Privacy Foundation Crypto Stick v1.2
|
||||
|
||||
|
@ -430,6 +443,7 @@
|
|||
|
||||
# InfoThink
|
||||
0x1FC9:0x0102:InfoThink IT-102MU Reader
|
||||
0x1403:0x7506:InfoThink IT-500U Reader
|
||||
|
||||
# Inside Secure
|
||||
0x2406:0x6300:Inside Secure VaultIC 420 Smart Object
|
||||
|
@ -570,7 +584,6 @@
|
|||
0x1C6A:0x7050:Regula RFID Reader
|
||||
|
||||
# REINER SCT
|
||||
0x0C4B:0x0500:REINER SCT cyberJack RFID standard
|
||||
0x0C4B:0x0504:REINER SCT cyberJack go
|
||||
0x0C4B:0x0520:REINER SCT tanJack Bluetooth
|
||||
0x0C4B:0x0580:REINER SCT cyberJack one
|
||||
|
@ -633,6 +646,7 @@
|
|||
# Spyrus Inc
|
||||
0x08DF:0x0004:Spyrus Inc Rosetta USB
|
||||
0x08DF:0x3115:Spyrus Inc WorkSafe Pro
|
||||
0x08DF:0x3117:Spyrus Inc WorkSafe Pro
|
||||
0x08DF:0x3201:Spyrus Inc PocketVault P-3X
|
||||
|
||||
# SYNNIX
|
||||
|
@ -705,10 +719,10 @@
|
|||
0x1050:0x0112:Yubico Yubikey NEO CCID
|
||||
0x1050:0x0115:Yubico Yubikey NEO U2F+CCID
|
||||
0x1050:0x0116:Yubico Yubikey NEO OTP+U2F+CCID
|
||||
0x1050:0x0404:Yubico Yubikey 4 CCID
|
||||
0x1050:0x0405:Yubico Yubikey 4 OTP+CCID
|
||||
0x1050:0x0406:Yubico Yubikey 4 U2F+CCID
|
||||
0x1050:0x0407:Yubico Yubikey 4 OTP+U2F+CCID
|
||||
0x1050:0x0404:Yubico YubiKey CCID
|
||||
0x1050:0x0405:Yubico YubiKey OTP+CCID
|
||||
0x1050:0x0406:Yubico YubiKey FIDO+CCID
|
||||
0x1050:0x0407:Yubico YubiKey OTP+FIDO+CCID
|
||||
|
||||
##########################
|
||||
# section: unsupported
|
||||
|
@ -802,6 +816,9 @@
|
|||
# Precise Biometrics
|
||||
#0x08C3:0x0406:Precise Biometrics Precise 200 MC Upgrade
|
||||
|
||||
# REINER SCT
|
||||
#0x0C4B:0x0500:REINER SCT cyberJack RFID standard
|
||||
|
||||
# Reiner-SCT
|
||||
#0x0C4B:0x0300:Reiner-SCT cyberJack pinpad(a)
|
||||
|
||||
|
|
240
src/Makefile.in
240
src/Makefile.in
|
@ -1,7 +1,7 @@
|
|||
# Makefile.in generated by automake 1.15 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.16.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
@ -110,6 +110,7 @@ mkinstalldirs = $(install_sh) -d
|
|||
CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
PROGRAMS = $(noinst_PROGRAMS)
|
||||
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||
am__vpath_adj = case $$p in \
|
||||
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
|
@ -198,7 +199,6 @@ libccidtwin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
|
|||
$(libccidtwin_la_CFLAGS) $(CFLAGS) $(libccidtwin_la_LDFLAGS) \
|
||||
$(LDFLAGS) -o $@
|
||||
@WITH_TWIN_SERIAL_TRUE@am_libccidtwin_la_rpath = -rpath $(libdir)
|
||||
PROGRAMS = $(noinst_PROGRAMS)
|
||||
am__objects_11 = parse-tokenparser.$(OBJEXT) parse-strlcpy.$(OBJEXT) \
|
||||
parse-simclist.$(OBJEXT)
|
||||
am_parse_OBJECTS = parse-parse.$(OBJEXT) parse-debug.$(OBJEXT) \
|
||||
|
@ -222,7 +222,38 @@ am__v_at_0 = @
|
|||
am__v_at_1 =
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
am__maybe_remake_depfiles = depfiles
|
||||
am__depfiles_remade = ./$(DEPDIR)/libccid_la-ccid.Plo \
|
||||
./$(DEPDIR)/libccid_la-ccid_usb.Plo \
|
||||
./$(DEPDIR)/libccid_la-commands.Plo \
|
||||
./$(DEPDIR)/libccid_la-debug.Plo \
|
||||
./$(DEPDIR)/libccid_la-ifdhandler.Plo \
|
||||
./$(DEPDIR)/libccid_la-simclist.Plo \
|
||||
./$(DEPDIR)/libccid_la-strlcpy.Plo \
|
||||
./$(DEPDIR)/libccid_la-tokenparser.Plo \
|
||||
./$(DEPDIR)/libccid_la-utils.Plo \
|
||||
./$(DEPDIR)/libccidtwin_la-ccid.Plo \
|
||||
./$(DEPDIR)/libccidtwin_la-ccid_serial.Plo \
|
||||
./$(DEPDIR)/libccidtwin_la-commands.Plo \
|
||||
./$(DEPDIR)/libccidtwin_la-debug.Plo \
|
||||
./$(DEPDIR)/libccidtwin_la-ifdhandler.Plo \
|
||||
./$(DEPDIR)/libccidtwin_la-simclist.Plo \
|
||||
./$(DEPDIR)/libccidtwin_la-strlcpy.Plo \
|
||||
./$(DEPDIR)/libccidtwin_la-tokenparser.Plo \
|
||||
./$(DEPDIR)/libccidtwin_la-utils.Plo \
|
||||
./$(DEPDIR)/parse-ccid_usb.Po ./$(DEPDIR)/parse-debug.Po \
|
||||
./$(DEPDIR)/parse-parse.Po ./$(DEPDIR)/parse-simclist.Po \
|
||||
./$(DEPDIR)/parse-strlcpy.Po ./$(DEPDIR)/parse-tokenparser.Po \
|
||||
openct/$(DEPDIR)/libccid_la-buffer.Plo \
|
||||
openct/$(DEPDIR)/libccid_la-checksum.Plo \
|
||||
openct/$(DEPDIR)/libccid_la-proto-t1.Plo \
|
||||
openct/$(DEPDIR)/libccidtwin_la-buffer.Plo \
|
||||
openct/$(DEPDIR)/libccidtwin_la-checksum.Plo \
|
||||
openct/$(DEPDIR)/libccidtwin_la-proto-t1.Plo \
|
||||
towitoko/$(DEPDIR)/libccid_la-atr.Plo \
|
||||
towitoko/$(DEPDIR)/libccid_la-pps.Plo \
|
||||
towitoko/$(DEPDIR)/libccidtwin_la-atr.Plo \
|
||||
towitoko/$(DEPDIR)/libccidtwin_la-pps.Plo
|
||||
am__mv = mv -f
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
|
@ -509,8 +540,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|||
*config.status*) \
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
||||
*) \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
|
||||
esac;
|
||||
|
||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||
|
@ -522,6 +553,15 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
|||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
$(am__aclocal_m4_deps):
|
||||
|
||||
clean-noinstPROGRAMS:
|
||||
@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
|
||||
echo " rm -f" $$list; \
|
||||
rm -f $$list || exit $$?; \
|
||||
test -n "$(EXEEXT)" || exit 0; \
|
||||
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
|
||||
echo " rm -f" $$list; \
|
||||
rm -f $$list
|
||||
|
||||
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
|
||||
@$(NORMAL_INSTALL)
|
||||
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
|
||||
|
@ -595,15 +635,6 @@ openct/libccidtwin_la-proto-t1.lo: openct/$(am__dirstamp) \
|
|||
libccidtwin.la: $(libccidtwin_la_OBJECTS) $(libccidtwin_la_DEPENDENCIES) $(EXTRA_libccidtwin_la_DEPENDENCIES)
|
||||
$(AM_V_CCLD)$(libccidtwin_la_LINK) $(am_libccidtwin_la_rpath) $(libccidtwin_la_OBJECTS) $(libccidtwin_la_LIBADD) $(LIBS)
|
||||
|
||||
clean-noinstPROGRAMS:
|
||||
@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
|
||||
echo " rm -f" $$list; \
|
||||
rm -f $$list || exit $$?; \
|
||||
test -n "$(EXEEXT)" || exit 0; \
|
||||
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
|
||||
echo " rm -f" $$list; \
|
||||
rm -f $$list
|
||||
|
||||
parse$(EXEEXT): $(parse_OBJECTS) $(parse_DEPENDENCIES) $(EXTRA_parse_DEPENDENCIES)
|
||||
@rm -f parse$(EXEEXT)
|
||||
$(AM_V_CCLD)$(parse_LINK) $(parse_OBJECTS) $(parse_LDADD) $(LIBS)
|
||||
|
@ -618,40 +649,46 @@ mostlyclean-compile:
|
|||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-ccid.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-ccid_usb.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-commands.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-debug.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-ifdhandler.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-simclist.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-strlcpy.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-tokenparser.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-utils.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-ccid.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-ccid_serial.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-commands.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-debug.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-ifdhandler.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-simclist.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-strlcpy.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-tokenparser.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-utils.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-ccid_usb.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-debug.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-parse.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-simclist.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-strlcpy.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-tokenparser.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@openct/$(DEPDIR)/libccid_la-buffer.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@openct/$(DEPDIR)/libccid_la-checksum.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@openct/$(DEPDIR)/libccid_la-proto-t1.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@openct/$(DEPDIR)/libccidtwin_la-buffer.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@openct/$(DEPDIR)/libccidtwin_la-checksum.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@openct/$(DEPDIR)/libccidtwin_la-proto-t1.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@towitoko/$(DEPDIR)/libccid_la-atr.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@towitoko/$(DEPDIR)/libccid_la-pps.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@towitoko/$(DEPDIR)/libccidtwin_la-atr.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@towitoko/$(DEPDIR)/libccidtwin_la-pps.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-ccid.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-ccid_usb.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-commands.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-debug.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-ifdhandler.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-simclist.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-strlcpy.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-tokenparser.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccid_la-utils.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-ccid.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-ccid_serial.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-commands.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-debug.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-ifdhandler.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-simclist.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-strlcpy.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-tokenparser.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libccidtwin_la-utils.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-ccid_usb.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-debug.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-parse.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-simclist.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-strlcpy.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-tokenparser.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@openct/$(DEPDIR)/libccid_la-buffer.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@openct/$(DEPDIR)/libccid_la-checksum.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@openct/$(DEPDIR)/libccid_la-proto-t1.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@openct/$(DEPDIR)/libccidtwin_la-buffer.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@openct/$(DEPDIR)/libccidtwin_la-checksum.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@openct/$(DEPDIR)/libccidtwin_la-proto-t1.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@towitoko/$(DEPDIR)/libccid_la-atr.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@towitoko/$(DEPDIR)/libccid_la-pps.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@towitoko/$(DEPDIR)/libccidtwin_la-atr.Plo@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@towitoko/$(DEPDIR)/libccidtwin_la-pps.Plo@am__quote@ # am--include-marker
|
||||
|
||||
$(am__depfiles_remade):
|
||||
@$(MKDIR_P) $(@D)
|
||||
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
|
||||
|
||||
am--depfiles: $(am__depfiles_remade)
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
|
||||
|
@ -1020,7 +1057,10 @@ cscopelist-am: $(am__tagged_files)
|
|||
distclean-tags:
|
||||
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
distdir: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) distdir-am
|
||||
|
||||
distdir-am: $(DISTFILES)
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
list='$(DISTFILES)'; \
|
||||
|
@ -1052,7 +1092,7 @@ distdir: $(DISTFILES)
|
|||
done
|
||||
check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
|
||||
all-am: Makefile $(PROGRAMS) $(LTLIBRARIES)
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(libdir)"; do \
|
||||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
|
@ -1097,7 +1137,40 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
|
|||
clean-noinstPROGRAMS mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -rf ./$(DEPDIR) openct/$(DEPDIR) towitoko/$(DEPDIR)
|
||||
-rm -f ./$(DEPDIR)/libccid_la-ccid.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-ccid_usb.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-commands.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-debug.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-ifdhandler.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-simclist.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-strlcpy.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-tokenparser.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-utils.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-ccid.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-ccid_serial.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-commands.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-debug.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-ifdhandler.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-simclist.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-strlcpy.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-tokenparser.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-utils.Plo
|
||||
-rm -f ./$(DEPDIR)/parse-ccid_usb.Po
|
||||
-rm -f ./$(DEPDIR)/parse-debug.Po
|
||||
-rm -f ./$(DEPDIR)/parse-parse.Po
|
||||
-rm -f ./$(DEPDIR)/parse-simclist.Po
|
||||
-rm -f ./$(DEPDIR)/parse-strlcpy.Po
|
||||
-rm -f ./$(DEPDIR)/parse-tokenparser.Po
|
||||
-rm -f openct/$(DEPDIR)/libccid_la-buffer.Plo
|
||||
-rm -f openct/$(DEPDIR)/libccid_la-checksum.Plo
|
||||
-rm -f openct/$(DEPDIR)/libccid_la-proto-t1.Plo
|
||||
-rm -f openct/$(DEPDIR)/libccidtwin_la-buffer.Plo
|
||||
-rm -f openct/$(DEPDIR)/libccidtwin_la-checksum.Plo
|
||||
-rm -f openct/$(DEPDIR)/libccidtwin_la-proto-t1.Plo
|
||||
-rm -f towitoko/$(DEPDIR)/libccid_la-atr.Plo
|
||||
-rm -f towitoko/$(DEPDIR)/libccid_la-pps.Plo
|
||||
-rm -f towitoko/$(DEPDIR)/libccidtwin_la-atr.Plo
|
||||
-rm -f towitoko/$(DEPDIR)/libccidtwin_la-pps.Plo
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-compile distclean-generic \
|
||||
distclean-tags
|
||||
|
@ -1143,7 +1216,40 @@ install-ps-am:
|
|||
installcheck-am:
|
||||
|
||||
maintainer-clean: maintainer-clean-am
|
||||
-rm -rf ./$(DEPDIR) openct/$(DEPDIR) towitoko/$(DEPDIR)
|
||||
-rm -f ./$(DEPDIR)/libccid_la-ccid.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-ccid_usb.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-commands.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-debug.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-ifdhandler.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-simclist.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-strlcpy.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-tokenparser.Plo
|
||||
-rm -f ./$(DEPDIR)/libccid_la-utils.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-ccid.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-ccid_serial.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-commands.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-debug.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-ifdhandler.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-simclist.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-strlcpy.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-tokenparser.Plo
|
||||
-rm -f ./$(DEPDIR)/libccidtwin_la-utils.Plo
|
||||
-rm -f ./$(DEPDIR)/parse-ccid_usb.Po
|
||||
-rm -f ./$(DEPDIR)/parse-debug.Po
|
||||
-rm -f ./$(DEPDIR)/parse-parse.Po
|
||||
-rm -f ./$(DEPDIR)/parse-simclist.Po
|
||||
-rm -f ./$(DEPDIR)/parse-strlcpy.Po
|
||||
-rm -f ./$(DEPDIR)/parse-tokenparser.Po
|
||||
-rm -f openct/$(DEPDIR)/libccid_la-buffer.Plo
|
||||
-rm -f openct/$(DEPDIR)/libccid_la-checksum.Plo
|
||||
-rm -f openct/$(DEPDIR)/libccid_la-proto-t1.Plo
|
||||
-rm -f openct/$(DEPDIR)/libccidtwin_la-buffer.Plo
|
||||
-rm -f openct/$(DEPDIR)/libccidtwin_la-checksum.Plo
|
||||
-rm -f openct/$(DEPDIR)/libccidtwin_la-proto-t1.Plo
|
||||
-rm -f towitoko/$(DEPDIR)/libccid_la-atr.Plo
|
||||
-rm -f towitoko/$(DEPDIR)/libccid_la-pps.Plo
|
||||
-rm -f towitoko/$(DEPDIR)/libccidtwin_la-atr.Plo
|
||||
-rm -f towitoko/$(DEPDIR)/libccidtwin_la-pps.Plo
|
||||
-rm -f Makefile
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||
|
||||
|
@ -1164,20 +1270,20 @@ uninstall-am: uninstall-libLTLIBRARIES
|
|||
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
|
||||
clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \
|
||||
cscopelist-am ctags ctags-am distclean distclean-compile \
|
||||
distclean-generic distclean-libtool distclean-tags distdir dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-data install-data-am install-dvi install-dvi-am \
|
||||
install-exec install-exec-am install-html install-html-am \
|
||||
install-info install-info-am install-libLTLIBRARIES \
|
||||
install-man install-pdf install-pdf-am install-ps \
|
||||
install-ps-am install-strip installcheck installcheck-am \
|
||||
installdirs maintainer-clean maintainer-clean-generic \
|
||||
mostlyclean mostlyclean-compile mostlyclean-generic \
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
|
||||
uninstall-am uninstall-libLTLIBRARIES
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
|
||||
clean-generic clean-libLTLIBRARIES clean-libtool \
|
||||
clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
|
||||
distclean-compile distclean-generic distclean-libtool \
|
||||
distclean-tags distdir dvi dvi-am html html-am info info-am \
|
||||
install install-am install-data install-data-am install-dvi \
|
||||
install-dvi-am install-exec install-exec-am install-html \
|
||||
install-html-am install-info install-info-am \
|
||||
install-libLTLIBRARIES install-man install-pdf install-pdf-am \
|
||||
install-ps install-ps-am install-strip installcheck \
|
||||
installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
||||
tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
|
||||
|
||||
.PRECIOUS: Makefile
|
||||
|
||||
|
|
|
@ -607,6 +607,7 @@ again:
|
|||
usb_interface = get_ccid_usb_interface(config_desc, &num);
|
||||
if (usb_interface == NULL)
|
||||
{
|
||||
libusb_free_config_descriptor(config_desc);
|
||||
(void)libusb_close(dev_handle);
|
||||
if (0 == num)
|
||||
DEBUG_CRITICAL3("Can't find a CCID interface on %d/%d",
|
||||
|
@ -618,6 +619,7 @@ again:
|
|||
device_descriptor = get_ccid_device_descriptor(usb_interface);
|
||||
if (NULL == device_descriptor)
|
||||
{
|
||||
libusb_free_config_descriptor(config_desc);
|
||||
(void)libusb_close(dev_handle);
|
||||
DEBUG_CRITICAL3("Unable to find the device descriptor for %d/%d",
|
||||
bus_number, device_address);
|
||||
|
@ -628,6 +630,7 @@ again:
|
|||
interface = usb_interface->altsetting->bInterfaceNumber;
|
||||
if (interface_number >= 0 && interface != interface_number)
|
||||
{
|
||||
libusb_free_config_descriptor(config_desc);
|
||||
/* an interface was specified and it is not the
|
||||
* current one */
|
||||
DEBUG_INFO3("Found interface %d but expecting %d",
|
||||
|
@ -644,6 +647,7 @@ again:
|
|||
r = libusb_claim_interface(dev_handle, interface);
|
||||
if (r < 0)
|
||||
{
|
||||
libusb_free_config_descriptor(config_desc);
|
||||
(void)libusb_close(dev_handle);
|
||||
DEBUG_CRITICAL4("Can't claim interface %d/%d: %s",
|
||||
bus_number, device_address, libusb_error_name(r));
|
||||
|
@ -660,6 +664,7 @@ again:
|
|||
/* check for firmware bugs */
|
||||
if (ccid_check_firmware(&desc))
|
||||
{
|
||||
libusb_free_config_descriptor(config_desc);
|
||||
(void)libusb_close(dev_handle);
|
||||
return_value = STATUS_UNSUCCESSFUL;
|
||||
goto end2;
|
||||
|
@ -760,6 +765,7 @@ again:
|
|||
else
|
||||
usbDevice[reader_index].multislot_extension = NULL;
|
||||
|
||||
libusb_free_config_descriptor(config_desc);
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
@ -781,6 +787,10 @@ end:
|
|||
goto again_libusb;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* free bundle list */
|
||||
bundleRelease(&plist);
|
||||
|
||||
/* failed */
|
||||
close_libusb_if_needed();
|
||||
|
||||
|
@ -1352,9 +1362,9 @@ int InterruptRead(int reader_index, int timeout /* in ms */)
|
|||
|
||||
default:
|
||||
/* if libusb_interrupt_transfer() times out we get EILSEQ or EAGAIN */
|
||||
DEBUG_COMM4("InterruptRead (%d/%d): %s",
|
||||
DEBUG_COMM4("InterruptRead (%d/%d): %d",
|
||||
usbDevice[reader_index].bus_number,
|
||||
usbDevice[reader_index].device_address, libusb_error_name(ret));
|
||||
usbDevice[reader_index].device_address, ret);
|
||||
return_value = IFD_COMMUNICATION_ERROR;
|
||||
}
|
||||
|
||||
|
@ -1386,7 +1396,8 @@ void InterruptStop(int reader_index)
|
|||
|
||||
ret = libusb_cancel_transfer(transfer);
|
||||
if (ret < 0)
|
||||
DEBUG_CRITICAL2("libusb_cancel_transfer failed: %d", ret);
|
||||
DEBUG_CRITICAL2("libusb_cancel_transfer failed: %s",
|
||||
libusb_error_name(ret));
|
||||
}
|
||||
} /* InterruptStop */
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* This handles GCC attributes
|
||||
*
|
||||
* MUSCLE SmartCard Development ( http://pcsclite.alioth.debian.org/pcsclite.html )
|
||||
* MUSCLE SmartCard Development ( https://pcsclite.apdu.fr/ )
|
||||
*
|
||||
* Copyright (C) 2005-2010
|
||||
* Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* MUSCLE SmartCard Development ( http://pcsclite.alioth.debian.org/pcsclite.html )
|
||||
* MUSCLE SmartCard Development ( https://pcsclite.apdu.fr/ )
|
||||
*
|
||||
* Copyright (C) 2003
|
||||
* Toni Andjelkovic <toni@soth.at>
|
||||
|
|
123
src/simclist.c
123
src/simclist.c
|
@ -264,6 +264,8 @@ static inline long get_random(void) {
|
|||
int list_init(list_t *restrict l) {
|
||||
if (l == NULL) return -1;
|
||||
|
||||
memset(l, 0, sizeof *l);
|
||||
|
||||
seed_random();
|
||||
|
||||
l->numels = 0;
|
||||
|
@ -271,6 +273,9 @@ int list_init(list_t *restrict l) {
|
|||
/* head/tail sentinels and mid pointer */
|
||||
l->head_sentinel = (struct list_entry_s *)malloc(sizeof(struct list_entry_s));
|
||||
l->tail_sentinel = (struct list_entry_s *)malloc(sizeof(struct list_entry_s));
|
||||
if (NULL == l->tail_sentinel || NULL == l->head_sentinel)
|
||||
return -1;
|
||||
|
||||
l->head_sentinel->next = l->tail_sentinel;
|
||||
l->tail_sentinel->prev = l->head_sentinel;
|
||||
l->head_sentinel->prev = l->tail_sentinel->next = l->mid = NULL;
|
||||
|
@ -284,12 +289,15 @@ int list_init(list_t *restrict l) {
|
|||
/* free-list attributes */
|
||||
l->spareels = (struct list_entry_s **)malloc(SIMCLIST_MAX_SPARE_ELEMS * sizeof(struct list_entry_s *));
|
||||
l->spareelsnum = 0;
|
||||
if (NULL == l->spareels)
|
||||
return -1;
|
||||
|
||||
#ifdef SIMCLIST_WITH_THREADS
|
||||
l->threadcount = 0;
|
||||
#endif
|
||||
|
||||
list_attributes_setdefaults(l);
|
||||
if (list_attributes_setdefaults(l))
|
||||
return -1;
|
||||
|
||||
assert(list_repOk(l));
|
||||
assert(list_attrOk(l));
|
||||
|
@ -435,10 +443,16 @@ static inline struct list_entry_s *list_findpos(const list_t *restrict l, int po
|
|||
float x;
|
||||
int i;
|
||||
|
||||
if (NULL == l->head_sentinel || NULL == l->tail_sentinel)
|
||||
return NULL;
|
||||
|
||||
/* accept 1 slot overflow for fetching head and tail sentinels */
|
||||
if (posstart < -1 || posstart > (int)l->numels) return NULL;
|
||||
|
||||
x = (float)(posstart+1) / l->numels;
|
||||
if( l->numels != 0 )
|
||||
x = (float)(posstart+1) / l->numels;
|
||||
else
|
||||
x = 1;
|
||||
if (x <= 0.25) {
|
||||
/* first quarter: get to posstart from head */
|
||||
for (i = -1, ptr = l->head_sentinel; i < posstart; ptr = ptr->next, i++);
|
||||
|
@ -463,6 +477,9 @@ void *list_extract_at(list_t *restrict l, unsigned int pos) {
|
|||
if (l->iter_active || pos >= l->numels) return NULL;
|
||||
|
||||
tmp = list_findpos(l, pos);
|
||||
if (NULL == tmp)
|
||||
return NULL;
|
||||
|
||||
data = tmp->data;
|
||||
|
||||
tmp->data = NULL; /* save data from list_drop_elem() free() */
|
||||
|
@ -493,6 +510,11 @@ int list_insert_at(list_t *restrict l, const void *data, unsigned int pos) {
|
|||
/* make room for user' data (has to be copied) */
|
||||
size_t datalen = l->attrs.meter(data);
|
||||
lent->data = (struct list_entry_s *)malloc(datalen);
|
||||
if (NULL == lent->data)
|
||||
{
|
||||
free(lent);
|
||||
return -1;
|
||||
}
|
||||
memcpy(lent->data, data, datalen);
|
||||
} else {
|
||||
lent->data = (void*)data;
|
||||
|
@ -500,6 +522,12 @@ int list_insert_at(list_t *restrict l, const void *data, unsigned int pos) {
|
|||
|
||||
/* actually append element */
|
||||
prec = list_findpos(l, pos-1);
|
||||
if (NULL == prec)
|
||||
{
|
||||
free(lent->data);
|
||||
free(lent);
|
||||
return -1;
|
||||
}
|
||||
succ = prec->next;
|
||||
|
||||
prec->next = lent;
|
||||
|
@ -629,34 +657,36 @@ int list_clear(list_t *restrict l) {
|
|||
|
||||
if (l->iter_active) return -1;
|
||||
|
||||
if (l->attrs.copy_data) { /* also free user data */
|
||||
/* spare a loop conditional with two loops: spareing elems and freeing elems */
|
||||
for (s = l->head_sentinel->next; l->spareelsnum < SIMCLIST_MAX_SPARE_ELEMS && s != l->tail_sentinel; s = s->next) {
|
||||
/* move elements as spares as long as there is room */
|
||||
if (s->data != NULL) free(s->data);
|
||||
l->spareels[l->spareelsnum++] = s;
|
||||
if (l->head_sentinel && l->tail_sentinel) {
|
||||
if (l->attrs.copy_data) { /* also free user data */
|
||||
/* spare a loop conditional with two loops: spareing elems and freeing elems */
|
||||
for (s = l->head_sentinel->next; l->spareelsnum < SIMCLIST_MAX_SPARE_ELEMS && s != l->tail_sentinel; s = s->next) {
|
||||
/* move elements as spares as long as there is room */
|
||||
if (s->data != NULL) free(s->data);
|
||||
l->spareels[l->spareelsnum++] = s;
|
||||
}
|
||||
while (s != l->tail_sentinel) {
|
||||
/* free the remaining elems */
|
||||
if (s->data != NULL) free(s->data);
|
||||
s = s->next;
|
||||
free(s->prev);
|
||||
}
|
||||
l->head_sentinel->next = l->tail_sentinel;
|
||||
l->tail_sentinel->prev = l->head_sentinel;
|
||||
} else { /* only free element containers */
|
||||
/* spare a loop conditional with two loops: spareing elems and freeing elems */
|
||||
for (s = l->head_sentinel->next; l->spareelsnum < SIMCLIST_MAX_SPARE_ELEMS && s != l->tail_sentinel; s = s->next) {
|
||||
/* move elements as spares as long as there is room */
|
||||
l->spareels[l->spareelsnum++] = s;
|
||||
}
|
||||
while (s != l->tail_sentinel) {
|
||||
/* free the remaining elems */
|
||||
s = s->next;
|
||||
free(s->prev);
|
||||
}
|
||||
l->head_sentinel->next = l->tail_sentinel;
|
||||
l->tail_sentinel->prev = l->head_sentinel;
|
||||
}
|
||||
while (s != l->tail_sentinel) {
|
||||
/* free the remaining elems */
|
||||
if (s->data != NULL) free(s->data);
|
||||
s = s->next;
|
||||
free(s->prev);
|
||||
}
|
||||
l->head_sentinel->next = l->tail_sentinel;
|
||||
l->tail_sentinel->prev = l->head_sentinel;
|
||||
} else { /* only free element containers */
|
||||
/* spare a loop conditional with two loops: spareing elems and freeing elems */
|
||||
for (s = l->head_sentinel->next; l->spareelsnum < SIMCLIST_MAX_SPARE_ELEMS && s != l->tail_sentinel; s = s->next) {
|
||||
/* move elements as spares as long as there is room */
|
||||
l->spareels[l->spareelsnum++] = s;
|
||||
}
|
||||
while (s != l->tail_sentinel) {
|
||||
/* free the remaining elems */
|
||||
s = s->next;
|
||||
free(s->prev);
|
||||
}
|
||||
l->head_sentinel->next = l->tail_sentinel;
|
||||
l->tail_sentinel->prev = l->head_sentinel;
|
||||
}
|
||||
l->numels = 0;
|
||||
l->mid = NULL;
|
||||
|
@ -678,6 +708,9 @@ int list_locate(const list_t *restrict l, const void *data) {
|
|||
struct list_entry_s *el;
|
||||
int pos = 0;
|
||||
|
||||
if (NULL == l->head_sentinel || NULL == l->tail_sentinel)
|
||||
return -1;
|
||||
|
||||
if (l->attrs.comparator != NULL) {
|
||||
/* use comparator */
|
||||
for (el = l->head_sentinel->next; el != l->tail_sentinel; el = el->next, pos++) {
|
||||
|
@ -699,6 +732,9 @@ void *list_seek(list_t *restrict l, const void *indicator) {
|
|||
|
||||
if (l->attrs.seeker == NULL) return NULL;
|
||||
|
||||
if (NULL == l->head_sentinel || NULL == l->tail_sentinel)
|
||||
return NULL;
|
||||
|
||||
for (iter = l->head_sentinel->next; iter != l->tail_sentinel; iter = iter->next) {
|
||||
if (l->attrs.seeker(iter->data, indicator) != 0) return iter->data;
|
||||
}
|
||||
|
@ -719,7 +755,12 @@ int list_concat(const list_t *l1, const list_t *l2, list_t *restrict dest) {
|
|||
if (l1 == NULL || l2 == NULL || dest == NULL || l1 == dest || l2 == dest)
|
||||
return -1;
|
||||
|
||||
list_init(dest);
|
||||
if (NULL == l1->head_sentinel || NULL == l1->tail_sentinel
|
||||
|| NULL == l2->head_sentinel || NULL == l2->tail_sentinel)
|
||||
return -1;
|
||||
|
||||
if (list_init(dest))
|
||||
return -1;
|
||||
|
||||
dest->numels = l1->numels + l2->numels;
|
||||
if (dest->numels == 0)
|
||||
|
@ -730,6 +771,8 @@ int list_concat(const list_t *l1, const list_t *l2, list_t *restrict dest) {
|
|||
el = dest->head_sentinel;
|
||||
while (srcel != l1->tail_sentinel) {
|
||||
el->next = (struct list_entry_s *)malloc(sizeof(struct list_entry_s));
|
||||
if (NULL == el->next)
|
||||
return -1;
|
||||
el->next->prev = el;
|
||||
el = el->next;
|
||||
el->data = srcel->data;
|
||||
|
@ -740,6 +783,8 @@ int list_concat(const list_t *l1, const list_t *l2, list_t *restrict dest) {
|
|||
srcel = l2->head_sentinel->next;
|
||||
while (srcel != l2->tail_sentinel) {
|
||||
el->next = (struct list_entry_s *)malloc(sizeof(struct list_entry_s));
|
||||
if (NULL == el->next)
|
||||
return -1;
|
||||
el->next->prev = el;
|
||||
el = el->next;
|
||||
el->data = srcel->data;
|
||||
|
@ -769,6 +814,10 @@ int list_sort(list_t *restrict l, int versus) {
|
|||
|
||||
if (l->numels <= 1)
|
||||
return 0;
|
||||
|
||||
if (NULL == l->head_sentinel || NULL == l->tail_sentinel)
|
||||
return -1;
|
||||
|
||||
list_sort_quicksort(l, versus, 0, l->head_sentinel->next, l->numels-1, l->tail_sentinel->prev);
|
||||
assert(list_repOk(l));
|
||||
return 0;
|
||||
|
@ -907,6 +956,8 @@ static void list_sort_quicksort(list_t *restrict l, int versus,
|
|||
/* prepare wrapped args, then start thread */
|
||||
if (l->threadcount < SIMCLIST_MAXTHREADS-1) {
|
||||
struct list_sort_wrappedparams *wp = (struct list_sort_wrappedparams *)malloc(sizeof(struct list_sort_wrappedparams));
|
||||
if (NULL == wp)
|
||||
return -1;
|
||||
l->threadcount++;
|
||||
traised = 1;
|
||||
wp->l = l;
|
||||
|
@ -937,6 +988,8 @@ static void list_sort_quicksort(list_t *restrict l, int versus,
|
|||
|
||||
int list_iterator_start(list_t *restrict l) {
|
||||
if (l->iter_active) return 0;
|
||||
if (NULL == l->head_sentinel)
|
||||
return -1;
|
||||
l->iter_pos = 0;
|
||||
l->iter_active = 1;
|
||||
l->iter_curentry = l->head_sentinel->next;
|
||||
|
@ -1281,6 +1334,8 @@ int list_restore_filedescriptor(list_t *restrict l, int fd, size_t *restrict len
|
|||
if (l->attrs.unserializer != NULL) {
|
||||
/* use unserializer */
|
||||
buf = malloc(header.elemlen);
|
||||
if (NULL == buf)
|
||||
return -1;
|
||||
for (cnt = 0; cnt < header.numels; cnt++) {
|
||||
READ_ERRCHECK(fd, buf, header.elemlen);
|
||||
list_append(l, l->attrs.unserializer(buf, & elsize));
|
||||
|
@ -1290,6 +1345,8 @@ int list_restore_filedescriptor(list_t *restrict l, int fd, size_t *restrict len
|
|||
/* copy verbatim into memory */
|
||||
for (cnt = 0; cnt < header.numels; cnt++) {
|
||||
buf = malloc(header.elemlen);
|
||||
if (NULL == buf)
|
||||
return -1;
|
||||
READ_ERRCHECK(fd, buf, header.elemlen);
|
||||
list_append(l, buf);
|
||||
}
|
||||
|
@ -1303,6 +1360,8 @@ int list_restore_filedescriptor(list_t *restrict l, int fd, size_t *restrict len
|
|||
for (cnt = 0; cnt < header.numels; cnt++) {
|
||||
READ_ERRCHECK(fd, & elsize, sizeof(elsize));
|
||||
buf = malloc((size_t)elsize);
|
||||
if (NULL == buf)
|
||||
return -1;
|
||||
READ_ERRCHECK(fd, buf, elsize);
|
||||
totreadlen += elsize;
|
||||
list_append(l, l->attrs.unserializer(buf, & elsize));
|
||||
|
@ -1313,6 +1372,8 @@ int list_restore_filedescriptor(list_t *restrict l, int fd, size_t *restrict len
|
|||
for (cnt = 0; cnt < header.numels; cnt++) {
|
||||
READ_ERRCHECK(fd, & elsize, sizeof(elsize));
|
||||
buf = malloc(elsize);
|
||||
if (NULL == buf)
|
||||
return -1;
|
||||
READ_ERRCHECK(fd, buf, elsize);
|
||||
totreadlen += elsize;
|
||||
list_append(l, buf);
|
||||
|
@ -1404,7 +1465,7 @@ static int list_drop_elem(list_t *restrict l, struct list_entry_s *tmp, unsigned
|
|||
if (l->attrs.copy_data && tmp->data != NULL)
|
||||
free(tmp->data);
|
||||
|
||||
if (l->spareelsnum < SIMCLIST_MAX_SPARE_ELEMS) {
|
||||
if (l->spareels != NULL && l->spareelsnum < SIMCLIST_MAX_SPARE_ELEMS) {
|
||||
l->spareels[l->spareelsnum++] = tmp;
|
||||
} else {
|
||||
free(tmp);
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* MUSCLE SmartCard Development ( http://pcsclite.alioth.debian.org/pcsclite.html )
|
||||
* MUSCLE SmartCard Development ( https://pcsclite.apdu.fr/ )
|
||||
*
|
||||
* Copyright (C) 2004-2010
|
||||
* Ludovic Rousseau <ludovic.rousseau@free.fr>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#define FLEX_SCANNER
|
||||
#define YY_FLEX_MAJOR_VERSION 2
|
||||
#define YY_FLEX_MINOR_VERSION 6
|
||||
#define YY_FLEX_SUBMINOR_VERSION 1
|
||||
#define YY_FLEX_SUBMINOR_VERSION 4
|
||||
#if YY_FLEX_SUBMINOR_VERSION > 0
|
||||
#define FLEX_BETA
|
||||
#endif
|
||||
|
@ -83,10 +83,16 @@ typedef unsigned int flex_uint32_t;
|
|||
#define UINT32_MAX (4294967295U)
|
||||
#endif
|
||||
|
||||
#ifndef SIZE_MAX
|
||||
#define SIZE_MAX (~(size_t)0)
|
||||
#endif
|
||||
|
||||
#endif /* ! C99 */
|
||||
|
||||
#endif /* ! FLEXINT_H */
|
||||
|
||||
/* begin standard C++ headers. */
|
||||
|
||||
/* TODO: this is always defined, so inline it */
|
||||
#define yyconst const
|
||||
|
||||
|
@ -99,32 +105,26 @@ typedef unsigned int flex_uint32_t;
|
|||
/* Returned upon end-of-file. */
|
||||
#define YY_NULL 0
|
||||
|
||||
/* Promotes a possibly negative, possibly signed char to an unsigned
|
||||
* integer for use as an array index. If the signed char is negative,
|
||||
* we want to instead treat it as an 8-bit unsigned char, hence the
|
||||
* double cast.
|
||||
/* Promotes a possibly negative, possibly signed char to an
|
||||
* integer in range [0..255] for use as an array index.
|
||||
*/
|
||||
#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
|
||||
#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
|
||||
|
||||
/* Enter a start condition. This macro really ought to take a parameter,
|
||||
* but we do it the disgusting crufty way forced on us by the ()-less
|
||||
* definition of BEGIN.
|
||||
*/
|
||||
#define BEGIN (yy_start) = 1 + 2 *
|
||||
|
||||
/* Translate the current start state into a value that can be later handed
|
||||
* to BEGIN to return to the state. The YYSTATE alias is for lex
|
||||
* compatibility.
|
||||
*/
|
||||
#define YY_START (((yy_start) - 1) / 2)
|
||||
#define YYSTATE YY_START
|
||||
|
||||
/* Action number for EOF rule of a given start state. */
|
||||
#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
|
||||
|
||||
/* Special action meaning "start processing a new file". */
|
||||
#define YY_NEW_FILE yyrestart(yyin )
|
||||
|
||||
#define YY_NEW_FILE yyrestart( yyin )
|
||||
#define YY_END_OF_BUFFER_CHAR 0
|
||||
|
||||
/* Size of default input buffer. */
|
||||
|
@ -161,7 +161,7 @@ extern FILE *yyin, *yyout;
|
|||
#define EOB_ACT_CONTINUE_SCAN 0
|
||||
#define EOB_ACT_END_OF_FILE 1
|
||||
#define EOB_ACT_LAST_MATCH 2
|
||||
|
||||
|
||||
#define YY_LESS_LINENO(n)
|
||||
#define YY_LINENO_REWIND_TO(ptr)
|
||||
|
||||
|
@ -178,7 +178,6 @@ extern FILE *yyin, *yyout;
|
|||
YY_DO_BEFORE_ACTION; /* set up yytext again */ \
|
||||
} \
|
||||
while ( 0 )
|
||||
|
||||
#define unput(c) yyunput( c, (yytext_ptr) )
|
||||
|
||||
#ifndef YY_STRUCT_YY_BUFFER_STATE
|
||||
|
@ -221,7 +220,7 @@ struct yy_buffer_state
|
|||
|
||||
int yy_bs_lineno; /**< The line count. */
|
||||
int yy_bs_column; /**< The column count. */
|
||||
|
||||
|
||||
/* Whether to try to fill the input buffer when we reach the
|
||||
* end of it.
|
||||
*/
|
||||
|
@ -260,7 +259,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
|
|||
#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
|
||||
? (yy_buffer_stack)[(yy_buffer_stack_top)] \
|
||||
: NULL)
|
||||
|
||||
/* Same as previous macro, but useful when we know that the buffer stack is not
|
||||
* NULL or when we need an lvalue. For internal use only.
|
||||
*/
|
||||
|
@ -281,65 +279,59 @@ static int yy_start = 0; /* start state number */
|
|||
*/
|
||||
static int yy_did_buffer_switch_on_eof;
|
||||
|
||||
void yyrestart (FILE *input_file );
|
||||
void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer );
|
||||
YY_BUFFER_STATE yy_create_buffer (FILE *file,int size );
|
||||
void yy_delete_buffer (YY_BUFFER_STATE b );
|
||||
void yy_flush_buffer (YY_BUFFER_STATE b );
|
||||
void yypush_buffer_state (YY_BUFFER_STATE new_buffer );
|
||||
void yypop_buffer_state (void );
|
||||
void yyrestart ( FILE *input_file );
|
||||
void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer );
|
||||
YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size );
|
||||
void yy_delete_buffer ( YY_BUFFER_STATE b );
|
||||
void yy_flush_buffer ( YY_BUFFER_STATE b );
|
||||
void yypush_buffer_state ( YY_BUFFER_STATE new_buffer );
|
||||
void yypop_buffer_state ( void );
|
||||
|
||||
static void yyensure_buffer_stack (void );
|
||||
static void yy_load_buffer_state (void );
|
||||
static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file );
|
||||
static void yyensure_buffer_stack ( void );
|
||||
static void yy_load_buffer_state ( void );
|
||||
static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file );
|
||||
#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
|
||||
|
||||
#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
|
||||
YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size );
|
||||
YY_BUFFER_STATE yy_scan_string ( const char *yy_str );
|
||||
YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len );
|
||||
|
||||
YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size );
|
||||
YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str );
|
||||
YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len );
|
||||
|
||||
void *yyalloc (yy_size_t );
|
||||
void *yyrealloc (void *,yy_size_t );
|
||||
void yyfree (void * );
|
||||
void *yyalloc ( yy_size_t );
|
||||
void *yyrealloc ( void *, yy_size_t );
|
||||
void yyfree ( void * );
|
||||
|
||||
#define yy_new_buffer yy_create_buffer
|
||||
|
||||
#define yy_set_interactive(is_interactive) \
|
||||
{ \
|
||||
if ( ! YY_CURRENT_BUFFER ){ \
|
||||
yyensure_buffer_stack (); \
|
||||
YY_CURRENT_BUFFER_LVALUE = \
|
||||
yy_create_buffer(yyin,YY_BUF_SIZE ); \
|
||||
yy_create_buffer( yyin, YY_BUF_SIZE ); \
|
||||
} \
|
||||
YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
|
||||
}
|
||||
|
||||
#define yy_set_bol(at_bol) \
|
||||
{ \
|
||||
if ( ! YY_CURRENT_BUFFER ){\
|
||||
yyensure_buffer_stack (); \
|
||||
YY_CURRENT_BUFFER_LVALUE = \
|
||||
yy_create_buffer(yyin,YY_BUF_SIZE ); \
|
||||
yy_create_buffer( yyin, YY_BUF_SIZE ); \
|
||||
} \
|
||||
YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
|
||||
}
|
||||
|
||||
#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
|
||||
|
||||
/* Begin user sect3 */
|
||||
|
||||
#define yywrap() (/*CONSTCOND*/1)
|
||||
#define YY_SKIP_YYWRAP
|
||||
|
||||
typedef unsigned char YY_CHAR;
|
||||
typedef flex_uint8_t YY_CHAR;
|
||||
|
||||
FILE *yyin = NULL, *yyout = NULL;
|
||||
|
||||
typedef int yy_state_type;
|
||||
|
||||
extern int yylineno;
|
||||
|
||||
int yylineno = 1;
|
||||
|
||||
extern char *yytext;
|
||||
|
@ -348,10 +340,10 @@ extern char *yytext;
|
|||
#endif
|
||||
#define yytext_ptr yytext
|
||||
|
||||
static yy_state_type yy_get_previous_state (void );
|
||||
static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
|
||||
static int yy_get_next_buffer (void );
|
||||
static void yynoreturn yy_fatal_error (yyconst char* msg );
|
||||
static yy_state_type yy_get_previous_state ( void );
|
||||
static yy_state_type yy_try_NUL_trans ( yy_state_type current_state );
|
||||
static int yy_get_next_buffer ( void );
|
||||
static void yynoreturn yy_fatal_error ( const char* msg );
|
||||
|
||||
/* Done after the current pattern has been matched and before the
|
||||
* corresponding action - sets up yytext.
|
||||
|
@ -362,7 +354,6 @@ static void yynoreturn yy_fatal_error (yyconst char* msg );
|
|||
(yy_hold_char) = *yy_cp; \
|
||||
*yy_cp = '\0'; \
|
||||
(yy_c_buf_p) = yy_cp;
|
||||
|
||||
#define YY_NUM_RULES 7
|
||||
#define YY_END_OF_BUFFER 8
|
||||
/* This struct is not used in this scanner,
|
||||
|
@ -372,7 +363,7 @@ struct yy_trans_info
|
|||
flex_int32_t yy_verify;
|
||||
flex_int32_t yy_nxt;
|
||||
};
|
||||
static yyconst flex_int16_t yy_accept[39] =
|
||||
static const flex_int16_t yy_accept[39] =
|
||||
{ 0,
|
||||
0, 0, 8, 6, 4, 2, 1, 6, 1, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
|
@ -380,7 +371,7 @@ static yyconst flex_int16_t yy_accept[39] =
|
|||
0, 0, 0, 0, 0, 0, 5, 0
|
||||
} ;
|
||||
|
||||
static yyconst YY_CHAR yy_ec[256] =
|
||||
static const YY_CHAR yy_ec[256] =
|
||||
{ 0,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
|
@ -412,13 +403,13 @@ static yyconst YY_CHAR yy_ec[256] =
|
|||
1, 1, 1, 1, 1
|
||||
} ;
|
||||
|
||||
static yyconst YY_CHAR yy_meta[21] =
|
||||
static const YY_CHAR yy_meta[21] =
|
||||
{ 0,
|
||||
1, 2, 3, 4, 4, 4, 2, 1, 1, 2,
|
||||
2, 2, 2, 2, 2, 2, 2, 2, 2, 2
|
||||
} ;
|
||||
|
||||
static yyconst flex_uint16_t yy_base[43] =
|
||||
static const flex_int16_t yy_base[43] =
|
||||
{ 0,
|
||||
0, 7, 49, 50, 50, 50, 0, 1, 0, 36,
|
||||
28, 26, 28, 35, 29, 0, 26, 33, 27, 33,
|
||||
|
@ -427,7 +418,7 @@ static yyconst flex_uint16_t yy_base[43] =
|
|||
2, 26
|
||||
} ;
|
||||
|
||||
static yyconst flex_int16_t yy_def[43] =
|
||||
static const flex_int16_t yy_def[43] =
|
||||
{ 0,
|
||||
39, 39, 38, 38, 38, 38, 40, 38, 40, 38,
|
||||
38, 38, 38, 38, 38, 41, 38, 41, 38, 38,
|
||||
|
@ -436,7 +427,7 @@ static yyconst flex_int16_t yy_def[43] =
|
|||
38, 38
|
||||
} ;
|
||||
|
||||
static yyconst flex_uint16_t yy_nxt[71] =
|
||||
static const flex_int16_t yy_nxt[71] =
|
||||
{ 0,
|
||||
38, 5, 6, 18, 7, 38, 38, 8, 5, 6,
|
||||
37, 7, 36, 38, 8, 10, 35, 34, 11, 4,
|
||||
|
@ -447,7 +438,7 @@ static yyconst flex_uint16_t yy_nxt[71] =
|
|||
38, 38, 38, 38, 38, 38, 38, 38, 38, 38
|
||||
} ;
|
||||
|
||||
static yyconst flex_int16_t yy_chk[71] =
|
||||
static const flex_int16_t yy_chk[71] =
|
||||
{ 0,
|
||||
0, 1, 1, 41, 1, 0, 0, 1, 2, 2,
|
||||
36, 2, 35, 0, 2, 8, 34, 33, 8, 39,
|
||||
|
@ -476,7 +467,7 @@ char *yytext;
|
|||
/*
|
||||
* Reads lexical config files and updates database.
|
||||
*
|
||||
* MUSCLE SmartCard Development ( http://pcsclite.alioth.debian.org/pcsclite.html )
|
||||
* MUSCLE SmartCard Development ( https://pcsclite.apdu.fr/ )
|
||||
*
|
||||
* Copyright (C) 2001-2003
|
||||
* David Corcoran <corcoran@musclecard.com>
|
||||
|
@ -531,8 +522,9 @@ void tperrorCheck (char *pcToken_error);
|
|||
static list_t *ListKeys;
|
||||
static list_t *ListValues;
|
||||
|
||||
#line 526 "tokenparser.c"
|
||||
#define YY_NO_INPUT 1
|
||||
#line 536 "tokenparser.c"
|
||||
#line 528 "tokenparser.c"
|
||||
|
||||
#define INITIAL 0
|
||||
|
||||
|
@ -548,36 +540,36 @@ static list_t *ListValues;
|
|||
#define YY_EXTRA_TYPE void *
|
||||
#endif
|
||||
|
||||
static int yy_init_globals (void );
|
||||
static int yy_init_globals ( void );
|
||||
|
||||
/* Accessor methods to globals.
|
||||
These are made visible to non-reentrant scanners for convenience. */
|
||||
|
||||
int yylex_destroy (void );
|
||||
int yylex_destroy ( void );
|
||||
|
||||
int yyget_debug (void );
|
||||
int yyget_debug ( void );
|
||||
|
||||
void yyset_debug (int debug_flag );
|
||||
void yyset_debug ( int debug_flag );
|
||||
|
||||
YY_EXTRA_TYPE yyget_extra (void );
|
||||
YY_EXTRA_TYPE yyget_extra ( void );
|
||||
|
||||
void yyset_extra (YY_EXTRA_TYPE user_defined );
|
||||
void yyset_extra ( YY_EXTRA_TYPE user_defined );
|
||||
|
||||
FILE *yyget_in (void );
|
||||
FILE *yyget_in ( void );
|
||||
|
||||
void yyset_in (FILE * _in_str );
|
||||
void yyset_in ( FILE * _in_str );
|
||||
|
||||
FILE *yyget_out (void );
|
||||
FILE *yyget_out ( void );
|
||||
|
||||
void yyset_out (FILE * _out_str );
|
||||
void yyset_out ( FILE * _out_str );
|
||||
|
||||
int yyget_leng (void );
|
||||
int yyget_leng ( void );
|
||||
|
||||
char *yyget_text (void );
|
||||
char *yyget_text ( void );
|
||||
|
||||
int yyget_lineno (void );
|
||||
int yyget_lineno ( void );
|
||||
|
||||
void yyset_lineno (int _line_number );
|
||||
void yyset_lineno ( int _line_number );
|
||||
|
||||
/* Macros after this point can all be overridden by user definitions in
|
||||
* section 1.
|
||||
|
@ -585,9 +577,9 @@ void yyset_lineno (int _line_number );
|
|||
|
||||
#ifndef YY_SKIP_YYWRAP
|
||||
#ifdef __cplusplus
|
||||
extern "C" int yywrap (void );
|
||||
extern "C" int yywrap ( void );
|
||||
#else
|
||||
extern int yywrap (void );
|
||||
extern int yywrap ( void );
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
@ -596,19 +588,18 @@ extern int yywrap (void );
|
|||
#endif
|
||||
|
||||
#ifndef yytext_ptr
|
||||
static void yy_flex_strncpy (char *,yyconst char *,int );
|
||||
static void yy_flex_strncpy ( char *, const char *, int );
|
||||
#endif
|
||||
|
||||
#ifdef YY_NEED_STRLEN
|
||||
static int yy_flex_strlen (yyconst char * );
|
||||
static int yy_flex_strlen ( const char * );
|
||||
#endif
|
||||
|
||||
#ifndef YY_NO_INPUT
|
||||
|
||||
#ifdef __cplusplus
|
||||
static int yyinput (void );
|
||||
static int yyinput ( void );
|
||||
#else
|
||||
static int input (void );
|
||||
static int input ( void );
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -639,7 +630,7 @@ static int input (void );
|
|||
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
|
||||
{ \
|
||||
int c = '*'; \
|
||||
size_t n; \
|
||||
int n; \
|
||||
for ( n = 0; n < max_size && \
|
||||
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
|
||||
buf[n] = (char) c; \
|
||||
|
@ -652,7 +643,7 @@ static int input (void );
|
|||
else \
|
||||
{ \
|
||||
errno=0; \
|
||||
while ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
|
||||
while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
|
||||
{ \
|
||||
if( errno != EINTR) \
|
||||
{ \
|
||||
|
@ -741,17 +732,17 @@ YY_DECL
|
|||
if ( ! YY_CURRENT_BUFFER ) {
|
||||
yyensure_buffer_stack ();
|
||||
YY_CURRENT_BUFFER_LVALUE =
|
||||
yy_create_buffer(yyin,YY_BUF_SIZE );
|
||||
yy_create_buffer( yyin, YY_BUF_SIZE );
|
||||
}
|
||||
|
||||
yy_load_buffer_state( );
|
||||
yy_load_buffer_state( );
|
||||
}
|
||||
|
||||
{
|
||||
#line 67 "tokenparser.l"
|
||||
|
||||
|
||||
#line 755 "tokenparser.c"
|
||||
#line 746 "tokenparser.c"
|
||||
|
||||
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
|
||||
{
|
||||
|
@ -779,9 +770,9 @@ yy_match:
|
|||
{
|
||||
yy_current_state = (int) yy_def[yy_current_state];
|
||||
if ( yy_current_state >= 39 )
|
||||
yy_c = yy_meta[(unsigned int) yy_c];
|
||||
yy_c = yy_meta[yy_c];
|
||||
}
|
||||
yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
|
||||
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
|
||||
++yy_cp;
|
||||
}
|
||||
while ( yy_base[yy_current_state] != 50 );
|
||||
|
@ -844,7 +835,7 @@ YY_RULE_SETUP
|
|||
#line 75 "tokenparser.l"
|
||||
ECHO;
|
||||
YY_BREAK
|
||||
#line 848 "tokenparser.c"
|
||||
#line 839 "tokenparser.c"
|
||||
case YY_STATE_EOF(INITIAL):
|
||||
yyterminate();
|
||||
|
||||
|
@ -922,7 +913,7 @@ case YY_STATE_EOF(INITIAL):
|
|||
{
|
||||
(yy_did_buffer_switch_on_eof) = 0;
|
||||
|
||||
if ( yywrap( ) )
|
||||
if ( yywrap( ) )
|
||||
{
|
||||
/* Note: because we've taken care in
|
||||
* yy_get_next_buffer() to have set up
|
||||
|
@ -989,7 +980,7 @@ static int yy_get_next_buffer (void)
|
|||
{
|
||||
char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
|
||||
char *source = (yytext_ptr);
|
||||
yy_size_t number_to_move, i;
|
||||
int number_to_move, i;
|
||||
int ret_val;
|
||||
|
||||
if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
|
||||
|
@ -1018,7 +1009,7 @@ static int yy_get_next_buffer (void)
|
|||
/* Try to read more data. */
|
||||
|
||||
/* First move last chars to start of buffer. */
|
||||
number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
|
||||
number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
|
||||
|
||||
for ( i = 0; i < number_to_move; ++i )
|
||||
*(dest++) = *(source++);
|
||||
|
@ -1054,7 +1045,8 @@ static int yy_get_next_buffer (void)
|
|||
|
||||
b->yy_ch_buf = (char *)
|
||||
/* Include room in for 2 EOB chars. */
|
||||
yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
|
||||
yyrealloc( (void *) b->yy_ch_buf,
|
||||
(yy_size_t) (b->yy_buf_size + 2) );
|
||||
}
|
||||
else
|
||||
/* Can't grow it, we don't own it. */
|
||||
|
@ -1086,7 +1078,7 @@ static int yy_get_next_buffer (void)
|
|||
if ( number_to_move == YY_MORE_ADJ )
|
||||
{
|
||||
ret_val = EOB_ACT_END_OF_FILE;
|
||||
yyrestart(yyin );
|
||||
yyrestart( yyin );
|
||||
}
|
||||
|
||||
else
|
||||
|
@ -1100,12 +1092,15 @@ static int yy_get_next_buffer (void)
|
|||
else
|
||||
ret_val = EOB_ACT_CONTINUE_SCAN;
|
||||
|
||||
if ((int) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
|
||||
if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
|
||||
/* Extend the array by 50%, plus the number we really need. */
|
||||
int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
|
||||
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
|
||||
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
|
||||
(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size );
|
||||
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
|
||||
YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
|
||||
/* "- 2" to take care of EOB's */
|
||||
YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
|
||||
}
|
||||
|
||||
(yy_n_chars) += number_to_move;
|
||||
|
@ -1138,9 +1133,9 @@ static int yy_get_next_buffer (void)
|
|||
{
|
||||
yy_current_state = (int) yy_def[yy_current_state];
|
||||
if ( yy_current_state >= 39 )
|
||||
yy_c = yy_meta[(unsigned int) yy_c];
|
||||
yy_c = yy_meta[yy_c];
|
||||
}
|
||||
yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
|
||||
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
|
||||
}
|
||||
|
||||
return yy_current_state;
|
||||
|
@ -1166,9 +1161,9 @@ static int yy_get_next_buffer (void)
|
|||
{
|
||||
yy_current_state = (int) yy_def[yy_current_state];
|
||||
if ( yy_current_state >= 39 )
|
||||
yy_c = yy_meta[(unsigned int) yy_c];
|
||||
yy_c = yy_meta[yy_c];
|
||||
}
|
||||
yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
|
||||
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
|
||||
yy_is_jam = (yy_current_state == 38);
|
||||
|
||||
return yy_is_jam ? 0 : yy_current_state;
|
||||
|
@ -1202,7 +1197,7 @@ static int yy_get_next_buffer (void)
|
|||
|
||||
else
|
||||
{ /* need more input */
|
||||
int offset = (yy_c_buf_p) - (yytext_ptr);
|
||||
int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
|
||||
++(yy_c_buf_p);
|
||||
|
||||
switch ( yy_get_next_buffer( ) )
|
||||
|
@ -1219,13 +1214,13 @@ static int yy_get_next_buffer (void)
|
|||
*/
|
||||
|
||||
/* Reset buffer status. */
|
||||
yyrestart(yyin );
|
||||
yyrestart( yyin );
|
||||
|
||||
/*FALLTHROUGH*/
|
||||
|
||||
case EOB_ACT_END_OF_FILE:
|
||||
{
|
||||
if ( yywrap( ) )
|
||||
if ( yywrap( ) )
|
||||
return 0;
|
||||
|
||||
if ( ! (yy_did_buffer_switch_on_eof) )
|
||||
|
@ -1263,11 +1258,11 @@ static int yy_get_next_buffer (void)
|
|||
if ( ! YY_CURRENT_BUFFER ){
|
||||
yyensure_buffer_stack ();
|
||||
YY_CURRENT_BUFFER_LVALUE =
|
||||
yy_create_buffer(yyin,YY_BUF_SIZE );
|
||||
yy_create_buffer( yyin, YY_BUF_SIZE );
|
||||
}
|
||||
|
||||
yy_init_buffer(YY_CURRENT_BUFFER,input_file );
|
||||
yy_load_buffer_state( );
|
||||
yy_init_buffer( YY_CURRENT_BUFFER, input_file );
|
||||
yy_load_buffer_state( );
|
||||
}
|
||||
|
||||
/** Switch to a different input buffer.
|
||||
|
@ -1295,7 +1290,7 @@ static int yy_get_next_buffer (void)
|
|||
}
|
||||
|
||||
YY_CURRENT_BUFFER_LVALUE = new_buffer;
|
||||
yy_load_buffer_state( );
|
||||
yy_load_buffer_state( );
|
||||
|
||||
/* We don't actually know whether we did this switch during
|
||||
* EOF (yywrap()) processing, but the only time this flag
|
||||
|
@ -1323,22 +1318,22 @@ static void yy_load_buffer_state (void)
|
|||
{
|
||||
YY_BUFFER_STATE b;
|
||||
|
||||
b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
|
||||
b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) );
|
||||
if ( ! b )
|
||||
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
|
||||
|
||||
b->yy_buf_size = (yy_size_t)size;
|
||||
b->yy_buf_size = size;
|
||||
|
||||
/* yy_ch_buf has to be 2 characters longer than the size given because
|
||||
* we need to put in 2 end-of-buffer characters.
|
||||
*/
|
||||
b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 );
|
||||
b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) );
|
||||
if ( ! b->yy_ch_buf )
|
||||
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
|
||||
|
||||
b->yy_is_our_buffer = 1;
|
||||
|
||||
yy_init_buffer(b,file );
|
||||
yy_init_buffer( b, file );
|
||||
|
||||
return b;
|
||||
}
|
||||
|
@ -1357,9 +1352,9 @@ static void yy_load_buffer_state (void)
|
|||
YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
|
||||
|
||||
if ( b->yy_is_our_buffer )
|
||||
yyfree((void *) b->yy_ch_buf );
|
||||
yyfree( (void *) b->yy_ch_buf );
|
||||
|
||||
yyfree((void *) b );
|
||||
yyfree( (void *) b );
|
||||
}
|
||||
|
||||
/* Initializes or reinitializes a buffer.
|
||||
|
@ -1371,7 +1366,7 @@ static void yy_load_buffer_state (void)
|
|||
{
|
||||
int oerrno = errno;
|
||||
|
||||
yy_flush_buffer(b );
|
||||
yy_flush_buffer( b );
|
||||
|
||||
b->yy_input_file = file;
|
||||
b->yy_fill_buffer = 1;
|
||||
|
@ -1414,7 +1409,7 @@ static void yy_load_buffer_state (void)
|
|||
b->yy_buffer_status = YY_BUFFER_NEW;
|
||||
|
||||
if ( b == YY_CURRENT_BUFFER )
|
||||
yy_load_buffer_state( );
|
||||
yy_load_buffer_state( );
|
||||
}
|
||||
|
||||
/** Pushes the new state onto the stack. The new state becomes
|
||||
|
@ -1445,7 +1440,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
|
|||
YY_CURRENT_BUFFER_LVALUE = new_buffer;
|
||||
|
||||
/* copied from yy_switch_to_buffer. */
|
||||
yy_load_buffer_state( );
|
||||
yy_load_buffer_state( );
|
||||
(yy_did_buffer_switch_on_eof) = 1;
|
||||
}
|
||||
|
||||
|
@ -1464,7 +1459,7 @@ void yypop_buffer_state (void)
|
|||
--(yy_buffer_stack_top);
|
||||
|
||||
if (YY_CURRENT_BUFFER) {
|
||||
yy_load_buffer_state( );
|
||||
yy_load_buffer_state( );
|
||||
(yy_did_buffer_switch_on_eof) = 1;
|
||||
}
|
||||
}
|
||||
|
@ -1474,7 +1469,7 @@ void yypop_buffer_state (void)
|
|||
*/
|
||||
static void yyensure_buffer_stack (void)
|
||||
{
|
||||
int num_to_alloc;
|
||||
yy_size_t num_to_alloc;
|
||||
|
||||
if (!(yy_buffer_stack)) {
|
||||
|
||||
|
@ -1488,9 +1483,9 @@ static void yyensure_buffer_stack (void)
|
|||
);
|
||||
if ( ! (yy_buffer_stack) )
|
||||
YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
|
||||
|
||||
|
||||
memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
|
||||
|
||||
|
||||
(yy_buffer_stack_max) = num_to_alloc;
|
||||
(yy_buffer_stack_top) = 0;
|
||||
return;
|
||||
|
@ -1519,7 +1514,7 @@ static void yyensure_buffer_stack (void)
|
|||
* @param base the character buffer
|
||||
* @param size the size in bytes of the character buffer
|
||||
*
|
||||
* @return the newly allocated buffer state object.
|
||||
* @return the newly allocated buffer state object.
|
||||
*/
|
||||
YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
|
||||
{
|
||||
|
@ -1531,11 +1526,11 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
|
|||
/* They forgot to leave room for the EOB's. */
|
||||
return NULL;
|
||||
|
||||
b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
|
||||
b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) );
|
||||
if ( ! b )
|
||||
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
|
||||
|
||||
b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
|
||||
b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */
|
||||
b->yy_buf_pos = b->yy_ch_buf = base;
|
||||
b->yy_is_our_buffer = 0;
|
||||
b->yy_input_file = NULL;
|
||||
|
@ -1545,7 +1540,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
|
|||
b->yy_fill_buffer = 0;
|
||||
b->yy_buffer_status = YY_BUFFER_NEW;
|
||||
|
||||
yy_switch_to_buffer(b );
|
||||
yy_switch_to_buffer( b );
|
||||
|
||||
return b;
|
||||
}
|
||||
|
@ -1558,10 +1553,10 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
|
|||
* @note If you want to scan bytes that may contain NUL values, then use
|
||||
* yy_scan_bytes() instead.
|
||||
*/
|
||||
YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
|
||||
YY_BUFFER_STATE yy_scan_string (const char * yystr )
|
||||
{
|
||||
|
||||
return yy_scan_bytes(yystr,(int) strlen(yystr) );
|
||||
return yy_scan_bytes( yystr, (int) strlen(yystr) );
|
||||
}
|
||||
|
||||
/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
|
||||
|
@ -1571,16 +1566,16 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
|
|||
*
|
||||
* @return the newly allocated buffer state object.
|
||||
*/
|
||||
YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len )
|
||||
YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len )
|
||||
{
|
||||
YY_BUFFER_STATE b;
|
||||
char *buf;
|
||||
yy_size_t n;
|
||||
yy_size_t i;
|
||||
int i;
|
||||
|
||||
/* Get memory for full buffer, including space for trailing EOB's. */
|
||||
n = (yy_size_t) _yybytes_len + 2;
|
||||
buf = (char *) yyalloc(n );
|
||||
n = (yy_size_t) (_yybytes_len + 2);
|
||||
buf = (char *) yyalloc( n );
|
||||
if ( ! buf )
|
||||
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
|
||||
|
||||
|
@ -1589,7 +1584,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len )
|
|||
|
||||
buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
|
||||
|
||||
b = yy_scan_buffer(buf,n );
|
||||
b = yy_scan_buffer( buf, n );
|
||||
if ( ! b )
|
||||
YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
|
||||
|
||||
|
@ -1605,9 +1600,9 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len )
|
|||
#define YY_EXIT_FAILURE 2
|
||||
#endif
|
||||
|
||||
static void yynoreturn yy_fatal_error (yyconst char* msg )
|
||||
static void yynoreturn yy_fatal_error (const char* msg )
|
||||
{
|
||||
(void) fprintf( stderr, "%s\n", msg );
|
||||
fprintf( stderr, "%s\n", msg );
|
||||
exit( YY_EXIT_FAILURE );
|
||||
}
|
||||
|
||||
|
@ -1635,7 +1630,7 @@ static void yynoreturn yy_fatal_error (yyconst char* msg )
|
|||
*/
|
||||
int yyget_lineno (void)
|
||||
{
|
||||
|
||||
|
||||
return yylineno;
|
||||
}
|
||||
|
||||
|
@ -1742,7 +1737,7 @@ int yylex_destroy (void)
|
|||
|
||||
/* Pop the buffer stack, destroying each element. */
|
||||
while(YY_CURRENT_BUFFER){
|
||||
yy_delete_buffer(YY_CURRENT_BUFFER );
|
||||
yy_delete_buffer( YY_CURRENT_BUFFER );
|
||||
YY_CURRENT_BUFFER_LVALUE = NULL;
|
||||
yypop_buffer_state();
|
||||
}
|
||||
|
@ -1763,7 +1758,7 @@ int yylex_destroy (void)
|
|||
*/
|
||||
|
||||
#ifndef yytext_ptr
|
||||
static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
|
||||
static void yy_flex_strncpy (char* s1, const char * s2, int n )
|
||||
{
|
||||
|
||||
int i;
|
||||
|
@ -1773,7 +1768,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
|
|||
#endif
|
||||
|
||||
#ifdef YY_NEED_STRLEN
|
||||
static int yy_flex_strlen (yyconst char * s )
|
||||
static int yy_flex_strlen (const char * s )
|
||||
{
|
||||
int n;
|
||||
for ( n = 0; s[n]; ++n )
|
||||
|
@ -1812,7 +1807,6 @@ void yyfree (void * ptr )
|
|||
|
||||
|
||||
|
||||
|
||||
static void eval_key(char *pcToken, list_t *list_key)
|
||||
{
|
||||
struct bundleElt *elt;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Reads lexical config files and updates database.
|
||||
*
|
||||
* MUSCLE SmartCard Development ( http://pcsclite.alioth.debian.org/pcsclite.html )
|
||||
* MUSCLE SmartCard Development ( https://pcsclite.apdu.fr/ )
|
||||
*
|
||||
* Copyright (C) 2001-2003
|
||||
* David Corcoran <corcoran@musclecard.com>
|
||||
|
|
10
ylwrap
10
ylwrap
|
@ -1,9 +1,9 @@
|
|||
#! /bin/sh
|
||||
# ylwrap - wrapper for lex/yacc invocations.
|
||||
|
||||
scriptversion=2013-01-12.17; # UTC
|
||||
scriptversion=2018-03-07.03; # UTC
|
||||
|
||||
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
|
||||
#
|
||||
# Written by Tom Tromey <tromey@cygnus.com>.
|
||||
#
|
||||
|
@ -18,7 +18,7 @@ scriptversion=2013-01-12.17; # UTC
|
|||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
|
@ -239,9 +239,9 @@ exit $ret
|
|||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# sh-indentation: 2
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# eval: (add-hook 'before-save-hook 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC"
|
||||
# time-stamp-time-zone: "UTC0"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
|
|
Loading…
Reference in New Issue