summaryrefslogtreecommitdiffstats
path: root/libqpdf
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2013-12-16 22:20:28 +0100
committerJay Berkenbilt <ejb@ql.org>2013-12-16 22:21:28 +0100
commit6067608d930fa7fc8eda40b72e1df328dbcb146e (patch)
tree890fb65c1040c849db4e30a7ea3384cec7f51f4c /libqpdf
parent235d8f28f8b7de0f1fea3f8fecc5af6c3917c650 (diff)
downloadqpdf-6067608d930fa7fc8eda40b72e1df328dbcb146e.tar.zst
Remove needless #ifdef _WIN32 from getWhoami
Diffstat (limited to 'libqpdf')
-rw-r--r--libqpdf/QUtil.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc
index 39ce4088..11a3411c 100644
--- a/libqpdf/QUtil.cc
+++ b/libqpdf/QUtil.cc
@@ -237,13 +237,9 @@ QUtil::setLineBuf(FILE* f)
char*
QUtil::getWhoami(char* argv0)
{
-#ifdef _WIN32
- char pathsep = '\\';
-#else
- char pathsep = '/';
-#endif
char* whoami = 0;
- if ((whoami = strrchr(argv0, pathsep)) == NULL)
+ if (((whoami = strrchr(argv0, '/')) == NULL) &&
+ ((whoami = strrchr(argv0, '\\')) == NULL))
{
whoami = argv0;
}
@@ -251,13 +247,13 @@ QUtil::getWhoami(char* argv0)
{
++whoami;
}
-#ifdef _WIN32
+
if ((strlen(whoami) > 4) &&
(strcmp(whoami + strlen(whoami) - 4, ".exe") == 0))
{
whoami[strlen(whoami) - 4] = '\0';
}
-#endif
+
return whoami;
}