From: Scott Cantor <cantor.2@osu.edu>
Date: Sat, 9 Jun 2012 20:05:38 +0000 (+0000)
Subject: APPDATA should have been PROGRAMDATA
X-Git-Tag: 1.5.0~13
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=commitdiff_plain;h=f8366674d907dc484b6499e42fe2dab915417755

APPDATA should have been PROGRAMDATA
---

diff --git a/xmltooling/util/PathResolver.cpp b/xmltooling/util/PathResolver.cpp
index f6e3ec7..6ed251e 100644
--- a/xmltooling/util/PathResolver.cpp
+++ b/xmltooling/util/PathResolver.cpp
@@ -104,9 +104,9 @@ const string& PathResolver::resolve(string& s, file_type_t filetype, const char*
 #ifdef WIN32
     // Check for possible environment variable(s).
     if (s.find('%') != string::npos) {
-        // This is an ugly workaround for Windows XP, which doesn't support the APPDATA variable.
-        if (!getenv("APPDATA") && s.find("%APPDATA%") != string::npos) {
-            s.replace(s.find("%APPDATA%"), 9, "%ALLUSERSPROFILE%\\Application Data");
+        // This is an ugly workaround for Windows XP/2003, which don't support the PROGRAMDATA variable.
+        if (!getenv("PROGRAMDATA") && s.find("%PROGRAMDATA%") != string::npos) {
+            s.replace(s.find("%PROGRAMDATA%"), 9, "%ALLUSERSPROFILE%/Application Data");
         }
         char expbuf[MAX_PATH + 2];
         DWORD cnt = ExpandEnvironmentStrings(s.c_str(), expbuf, sizeof(expbuf));