summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2016-09-03 09:28:43 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2016-09-03 09:28:43 (GMT)
commit3df5c424078f63133b2130ef26ddd569e5fd8412 (patch)
tree6214151392909d161548ae2edad6bb7049eff1ed /src
parent9ae1af9b8679a0f14cb568d1db3afcc6e3ba40a6 (diff)
parent752523cd122d6ffdd72c89955005d77819740675 (diff)
downloadDoxygen-3df5c424078f63133b2130ef26ddd569e5fd8412.zip
Doxygen-3df5c424078f63133b2130ef26ddd569e5fd8412.tar.gz
Doxygen-3df5c424078f63133b2130ef26ddd569e5fd8412.tar.bz2
Merge branch 'feature/bug_766059' of https://github.com/albert-github/doxygen into albert-github-feature/bug_766059
Diffstat (limited to 'src')
-rw-r--r--src/doxygen.cpp3
-rw-r--r--src/portable.cpp24
-rw-r--r--src/portable.h1
3 files changed, 26 insertions, 2 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index d545265..07214cb 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -9987,6 +9987,8 @@ void initDoxygen()
setlocale(LC_CTYPE,"C"); // to get isspace(0xA0)==0, needed for UTF-8
setlocale(LC_NUMERIC,"C");
+ portable_correct_path();
+
Doxygen::runningTime.start();
initPreprocessor();
@@ -10067,7 +10069,6 @@ void initDoxygen()
g_compoundKeywordDict.insert("union",(void *)8);
g_compoundKeywordDict.insert("interface",(void *)8);
g_compoundKeywordDict.insert("exception",(void *)8);
-
}
void cleanUpDoxygen()
diff --git a/src/portable.cpp b/src/portable.cpp
index 5886793..46adccf 100644
--- a/src/portable.cpp
+++ b/src/portable.cpp
@@ -448,4 +448,26 @@ bool portable_isAbsolutePath(const char *fileName)
return false;
}
-
+/**
+ * Correct a possible wrong PATH variable
+ *
+ * This routine was inspired by the cause for bug 766059 was that in the Windows path there were forward slahes.
+ */
+void portable_correct_path(void)
+{
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ const char *p = portable_getenv("PATH");
+ char *q = (char *)malloc(strlen(p) + 1);
+ strcpy(q, p);
+ bool found = false;
+ for (int i = 0 ; i < strlen(q); i++)
+ {
+ if (q[i] == '/')
+ {
+ q[i] = '\\';
+ found = true;
+ }
+ }
+ if (found) portable_setenv("PATH",q);
+#endif
+}
diff --git a/src/portable.h b/src/portable.h
index 1471ce1..c5578a3 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -35,6 +35,7 @@ void portable_sysTimerStop();
double portable_getSysElapsedTime();
void portable_sleep(int ms);
bool portable_isAbsolutePath(const char *fileName);
+void portable_correct_path(void);
extern "C" {
void * portable_iconv_open(const char* tocode, const char* fromcode);