From 4beb984915ec7b7b7db7b77f7123cb2d66121070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 9 Jul 2009 12:28:10 +0000
Subject: [PATCH] compilable and usable

---
 COPYING         |  1 +
 INSTALL         |  1 +
 doc/makefile.am | 10 ++++++----
 src/makefile.am |  2 ++
 src/pcsc.hxx    |  7 ++++---
 5 files changed, 14 insertions(+), 7 deletions(-)
 create mode 120000 COPYING
 create mode 120000 INSTALL

diff --git a/COPYING b/COPYING
new file mode 120000
index 0000000..0b6cbf8
--- /dev/null
+++ b/COPYING
@@ -0,0 +1 @@
+/usr/share/automake-1.10/COPYING
\ No newline at end of file
diff --git a/INSTALL b/INSTALL
new file mode 120000
index 0000000..5bb6e7b
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1 @@
+/usr/share/automake-1.10/INSTALL
\ No newline at end of file
diff --git a/doc/makefile.am b/doc/makefile.am
index 3d70413..084e0bb 100644
--- a/doc/makefile.am
+++ b/doc/makefile.am
@@ -8,9 +8,11 @@
 develdir = ${pkgdatadir}/doc
 devel_DATA = html/index.html
 
-ALL_SRC = ${top_srcdir}/src/*.[ch]xx ${top_srcdir}/test/*.[ch]xx
+ALL_SRC = ${top_srcdir}/src/*.[ch]xx
+#${top_srcdir}/test/*.[ch]xx
 
-DIRS = html latex
+DIRS = html
+# latex
 
 all: ${DIRS}
 
@@ -25,8 +27,8 @@ ${devel_DATA}: ${ALL_SRC} doxyfile ${deps}
 if PEDANTIC
 	test \! -s doxygen.errors
 endif
-	cd latex && make
-	mv latex/refman.pdf @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
+#	cd latex && make
+#	mv latex/refman.pdf @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
 
 CLEANFILES = doxygen.errors @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
 DISTCLEANFILES = @PACKAGENAME@.doxytag
diff --git a/src/makefile.am b/src/makefile.am
index c32a822..555fd01 100644
--- a/src/makefile.am
+++ b/src/makefile.am
@@ -5,6 +5,8 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
+include_HEADERS=pcsc.hxx
+
 if BUILD_WIN
 else
 endif
diff --git a/src/pcsc.hxx b/src/pcsc.hxx
index 74d72cb..3d92007 100644
--- a/src/pcsc.hxx
+++ b/src/pcsc.hxx
@@ -43,7 +43,8 @@ namespace pcsc {
   std::string hex(const std::string& data) {
     std::stringstream res;
     for (std::string::const_iterator it(data.begin()); it!=data.end(); ++it)
-      res<<std::hex<<std::setfill('0')<<std::setw(2)<<(int)*it;
+      res<<"(0x"<<std::hex<<std::setfill('0')<<std::setw(2)
+         <<(unsigned int)(unsigned char)*it<<')';
     return res.str();
   }
 
@@ -59,14 +60,14 @@ namespace pcsc {
       std::string _what;
   };
   //----------------------------------------------------------------------------
-  class not_implemented: exception {
+  class not_implemented: public exception {
     public:
       not_implemented(const std::string& reason) throw():
           exception("feature is not implemented:\n"+reason) {
       }
   };
   //----------------------------------------------------------------------------
-  class access_error: exception {
+  class access_error: public exception {
     public:
       access_error(const std::string& reason) throw():
           exception("smardcard access error:\n"+reason) {