From 4c3f7d4a4a1ce0e6120b45d11833950192807df6 Mon Sep 17 00:00:00 2001
From: Per Hedbor <ph@opera.com>
Date: Thu, 13 Apr 2000 20:54:16 +0200
Subject: [PATCH] Added normalize_path (it is needed on NT to avoid things like
c:\foo\bar _and_ c:/foo\bar to be in the module path at the same time, thus
creating spurious joinnode-modules)
Rev: lib/master.pike.in:1.116
---
lib/master.pike.in | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/lib/master.pike.in b/lib/master.pike.in
index 5eb45b181c..7cd0de1d39 100644
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -1,6 +1,6 @@
/* -*- Pike -*-
*
- * $Id: master.pike.in,v 1.115 2000/04/12 18:39:38 hubbe Exp $
+ * $Id: master.pike.in,v 1.116 2000/04/13 18:54:16 per Exp $
*
* Master-file for Pike.
*
@@ -204,23 +204,31 @@ void putenv(string var, string val)
environment[var]=val;
}
+string normalize_path( string X )
+{
+#ifndef __NT__
+ return X;
+#else
+ return replace(X,"\\","/");
+#endif
+}
void add_include_path(string tmp)
{
- tmp=combine_path_with_cwd(tmp);
+ tmp=normalize_path(combine_path_with_cwd(tmp));
pike_include_path-=({tmp});
pike_include_path=({tmp})+pike_include_path;
}
void remove_include_path(string tmp)
{
- tmp=combine_path_with_cwd(tmp);
+ tmp=normalize_path(combine_path_with_cwd(tmp));
pike_include_path-=({tmp});
}
void add_module_path(string tmp)
{
- tmp=combine_path_with_cwd(tmp);
+ tmp=normalize_path(combine_path_with_cwd(tmp));
pike_module_path-=({tmp});
pike_module_path=({tmp})+pike_module_path;
}
@@ -228,14 +236,14 @@ void add_module_path(string tmp)
void remove_module_path(string tmp)
{
- tmp=combine_path_with_cwd(tmp);
+ tmp=normalize_path(combine_path_with_cwd(tmp));
pike_module_path-=({tmp});
}
void add_program_path(string tmp)
{
- tmp=combine_path_with_cwd(tmp);
+ tmp=normalize_path(combine_path_with_cwd(tmp));
pike_program_path-=({tmp});
pike_program_path=({tmp})+pike_program_path;
}
@@ -243,7 +251,7 @@ void add_program_path(string tmp)
void remove_program_path(string tmp)
{
- tmp=combine_path_with_cwd(tmp);
+ tmp=normalize_path(combine_path_with_cwd(tmp));
pike_program_path-=({tmp});
}
@@ -495,7 +503,7 @@ constant master_efuns = ({
"describe_error",
"new",
"clone",
-
+ "normalize_path",
"getenv",
"putenv",
--
GitLab