X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_unix.cpp;h=b85bdb20cd4788ec8dfbeeb762983db100404c52;hb=19024f725533b3dcdeddc318119e1379eb2c6837;hp=e2893db52f92e3fecd79137e506b636281b14aab;hpb=3fce202517109a26e90a08759b82f8e6c2ae8903;p=lyx.git

diff --git a/src/support/os_unix.cpp b/src/support/os_unix.cpp
index e2893db52f..b85bdb20cd 100644
--- a/src/support/os_unix.cpp
+++ b/src/support/os_unix.cpp
@@ -12,9 +12,13 @@
 
 #include <config.h>
 
+#include "LyXRC.h"
+
 #include "support/os.h"
 #include "support/docstring.h"
+#include "support/environment.h"
 #include "support/FileName.h"
+#include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/lassert.h"
 
@@ -22,7 +26,7 @@
 #include <stdlib.h>
 
 #ifdef __APPLE__
-#include <Carbon/Carbon.h>
+#include <CoreServices/CoreServices.h>
 #endif
 
 using namespace std;
@@ -47,11 +51,15 @@ void init(int argc, char * argv[])
 
 string utf8_argv(int i)
 {
-	LASSERT(i < argc_, /**/);
+	LASSERT(i < argc_, return "");
 	return to_utf8(from_local8bit(argv_[i]));
 }
 
 
+void remove_internal_args(int, int)
+{}
+
+
 string current_root()
 {
 	return "/";
@@ -172,6 +180,12 @@ string latex_path(string const & p)
 }
 
 
+string latex_path_list(string const & p)
+{
+	return p;
+}
+
+
 bool is_valid_strftime(string const & p)
 {
 	string::size_type pos = p.find_first_of('%');
@@ -202,19 +216,13 @@ string const & nulldev()
 }
 
 
-bool is_terminal(io_channel channel)
-{
-	return isatty(channel);
-}
-
-
 shell_type shell()
 {
 	return UNIX;
 }
 
 
-char path_separator()
+char path_separator(path_type)
 {
 	return ':';
 }
@@ -254,7 +262,8 @@ bool canAutoOpenFile(string const & ext, auto_open_mode const mode)
 }
 
 
-bool autoOpenFile(string const & filename, auto_open_mode const mode)
+bool autoOpenFile(string const & filename, auto_open_mode const mode,
+		  string const & path)
 {
 #ifdef __APPLE__
 // Reference: http://developer.apple.com/documentation/Carbon/Reference/LaunchServicesReference/
@@ -275,6 +284,13 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode)
 	if (status == kLSApplicationNotFoundErr)
 		return false;
 
+	string const texinputs = os::latex_path_list(
+			replaceCurdirPath(path, lyxrc.texinputs_prefix));
+	string const oldval = getEnv("TEXINPUTS");
+	string const newval = ".:" + texinputs + ":" + oldval;
+	if (!path.empty() && !lyxrc.texinputs_prefix.empty())
+		setEnv("TEXINPUTS", newval);
+
 	LSLaunchFSRefSpec inLaunchSpec;
 	inLaunchSpec.appRef = &outAppRef;
 	inLaunchSpec.numDocs = 1;
@@ -284,11 +300,15 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode)
 	inLaunchSpec.asyncRefCon = NULL;
 	status = LSOpenFromRefSpec(&inLaunchSpec, NULL);
 
+	if (!path.empty() && !lyxrc.texinputs_prefix.empty())
+		setEnv("TEXINPUTS", oldval);
+
 	return status != kLSApplicationNotFoundErr;
 #else
 	// silence compiler warnings
 	(void)filename;
 	(void)mode;
+	(void)path;
 
 	// currently, no default viewer is tried for non-windows system
 	// support for KDE/Gnome/Macintosh may be added later
@@ -299,9 +319,16 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode)
 
 string real_path(string const & path)
 {
+#ifdef HAVE_DEF_PATH_MAX
 	char rpath[PATH_MAX + 1];
 	char * result = realpath(path.c_str(), rpath);
-	return FileName::fromFilesystemEncoding(result ? rpath : path).absFilename();
+	return FileName::fromFilesystemEncoding(result ? rpath : path).absFileName();
+#else
+	char * result = realpath(path.c_str(), NULL);
+	string ret = FileName::fromFilesystemEncoding(result ? result : path).absFileName();
+	free(result);
+	return ret;
+#endif
 }
 
 } // namespace os