[Xsb-commits] CVS: XSB/syslib file_io.H, 1.39, 1.40 file_io.P, 1.59, 1.60 file_io.xwam, 1.64, 1.65

[David S. W. <dw...@us...>]

Update of /cvsroot/xsb/XSB/syslib
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23973

Modified Files:
	file_io.H file_io.P file_io.xwam 
Log Message:
Modified new case in path_sysop that looks for an ancestor directory.
If it doesn't find it, it tries an environment variable before giving up.


Index: file_io.H
===================================================================
RCS file: /cvsroot/xsb/XSB/syslib/file_io.H,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- file_io.H	22 Mar 2008 19:23:16 -0000	1.39
+++ file_io.H	15 Oct 2009 14:08:36 -0000	1.40
@@ -26,7 +26,7 @@
 
 :- import stat_flag/2, file_function/7, file_function/3,
 	parse_filename/4, is_absolute_filename/1,
-	expand_filename/2,
+	expand_filename/2, getenv/2,
 	sys_system/7, formatted_io/5 
       from machine.
 %%%:- import conpsc/2, psc_set_type/2, psc_set_prop/2 from machine.

Index: file_io.P
===================================================================
RCS file: /cvsroot/xsb/XSB/syslib/file_io.P,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- file_io.P	12 Oct 2009 20:36:35 -0000	1.59
+++ file_io.P	15 Oct 2009 14:08:36 -0000	1.60
@@ -332,7 +332,10 @@
 	cwd(CurrDir),
 	(get_ancestor(CurrDir,BaseName,ExpandedName)
 	 ->	true
-	 ;	abort(('[PATH_SYSOP]: No such ancestor directory: ', BaseName))
+	 ;	(getenv([BaseName,'_HOME'],ExpandedName)
+		 ->	true
+		 ;	abort(('[PATH_SYSOP]: No such ancestor directory and no environment variable for: ', BaseName))
+		)
 	).
 path_sysop(X,_,_) :- abort(('[PATH_SYSOP]: Invalid request for path_sysop/3, ', X)).
 path_sysop(X,_) :- abort(('[PATH_SYSOP]: Invalid request for path_sysop/2, ', X)).

Index: file_io.xwam
===================================================================
RCS file: /cvsroot/xsb/XSB/syslib/file_io.xwam,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
Binary files /tmp/cvsfO5Ezt and /tmp/cvsTuaq1J differ