From 0cd217e05ba027efd9ccd7e292a3b22b36bb6910 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 3 Oct 2005 21:16:25 +0000
Subject: [PATCH] correct get_panda_root() logic one more time

---
 dtool/src/dtoolutil/filename.cxx | 43 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/dtool/src/dtoolutil/filename.cxx b/dtool/src/dtoolutil/filename.cxx
index fbd17886a2..38e6e01f73 100644
--- a/dtool/src/dtoolutil/filename.cxx
+++ b/dtool/src/dtoolutil/filename.cxx
@@ -135,7 +135,11 @@ get_panda_root() {
       panda_root = front_to_back_slash(envvar);
     }
 
-    if (!panda_root.empty() && panda_root[panda_root.length() - 1] != '\\') {
+    // Ensure the string ends in a backslash.  If PANDA_ROOT is empty
+    // or undefined, this function must return a single backslash--not
+    // an empty string--since this prefix is used to replace a leading
+    // slash in Filename::to_os_specific().
+    if (panda_root.empty() || panda_root[panda_root.length() - 1] != '\\') {
       panda_root += '\\';
     }
 
@@ -317,8 +321,24 @@ from_os_specific(const string &os_specific, Filename::Type type) {
   string result = back_to_front_slash(os_specific);
   const string &panda_root = get_panda_root();
 
-  // If the initial prefix is the same as panda_root, remove it.
-  if (!panda_root.empty() && panda_root.length() < result.length()) {
+  // Does the filename begin with a drive letter?
+  if (result.size() >= 3 && isalpha(result[0]) &&
+      result[1] == ':' && result[2] == '/') {
+    result[1] = tolower(result[0]);
+    result[0] = '/';
+
+    // If there's *just* a slash following the drive letter, go ahead
+    // and trim it.
+    if (result.size() == 3) {
+      result = result.substr(0, 2);
+    }
+
+  } else if (result.substr(0, 2) == "//") {
+    // If the initial prefix is a double slash, convert it to /hosts/.
+    result = hosts_prefix + result.substr(2);
+
+  } else if (!panda_root.empty() && panda_root.length() < result.length()) { 
+    // If the initial prefix is the same as panda_root, remove it.
     bool matches = true;
     size_t p;
     for (p = 0; p < panda_root.length() && matches; ++p) {
@@ -343,23 +363,6 @@ from_os_specific(const string &os_specific, Filename::Type type) {
     }
   }
 
-  // All right, the initial prefix was not under panda_root.  But
-  // maybe it begins with a drive letter.
-  if (result.size() >= 3 && isalpha(result[0]) &&
-      result[1] == ':' && result[2] == '/') {
-    result[1] = tolower(result[0]);
-    result[0] = '/';
-
-    // If there's *just* a slash following the drive letter, go ahead
-    // and trim it.
-    if (result.size() == 3) {
-      result = result.substr(0, 2);
-    }
-
-  } else if (result.substr(0, 2) == "//") {
-    // If the initial prefix is a double slash, convert it to /hosts/.
-    result = hosts_prefix + result.substr(2);
-  }
 
   Filename filename(result);
   filename.set_type(type);