clean up windows portability code, make remaining test suite pass

git-svn-id: svn+q:///qpdf/trunk@686 71b93d88-0707-0410-a8cf-f5a4172ac649

1 files changed, 3 insertions, 8 deletions

diff --git a/examples/pdf-npages.cc b/examples/pdf-npages.cc
index b5ef6479..c62d33de 100644
--- a/examples/pdf-npages.cc
+++ b/examples/pdf-npages.cc
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 
 #include <qpdf/QPDF.hh>
+#include <qpdf/QUtil.hh>
 
 static char const* whoami = 0;
 
@@ -15,14 +16,8 @@ void usage()
 
 int main(int argc, char* argv[])
 {
-    if ((whoami = strrchr(argv[0], '/')) == NULL)
-    {
-	whoami = argv[0];
-    }
-    else
-    {
-	++whoami;
-    }
+    whoami = QUtil::getWhoami(argv[0]);
+
     // For libtool's sake....
     if (strncmp(whoami, "lt-", 3) == 0)
     {