an example for the sweave module, prepared by Gregor Gorjanc

[lyx.git] / src / support / os_win32.cpp

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index ad5fb4259223b642d0e2d75b2a3ea237751d9e97..a204adfde094fe5b7b70fd0cbddcb181a863cedc 100644 (file)
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -252,8 +252,7 @@ string latex_path(string const & p)
        // on windows_style_tex_paths_), but we use always forward slashes,
        // since it gets written into a .tex file.
 
-       FileName path(p);
-       if (!windows_style_tex_paths_ && path.isAbsolute()) {
+       if (!windows_style_tex_paths_ && FileName::isAbsolute(p)) {
                string const drive = p.substr(0, 2);
                string const cygprefix = cygdrive + "/" + drive.substr(0, 1);
                string const cygpath = subst(subst(p, '\\', '/'), drive, cygprefix);
@@ -297,6 +296,26 @@ string const & nulldev()
 }
 
 
+bool is_terminal(io_channel channel)
+{
+       switch (channel) {
+       case STDIN:
+               if (GetStdHandle(STD_INPUT_HANDLE) == NULL)
+                       return false;
+               break;
+       case STDOUT:
+               if (GetStdHandle(STD_OUTPUT_HANDLE) == NULL)
+                       return false;
+               break;
+       case STDERR:
+               if (GetStdHandle(STD_ERROR_HANDLE) == NULL)
+                       return false;
+               break;
+       }
+       return true;
+}
+
+
 shell_type shell()
 {
        return CMD_EXE;
@@ -390,43 +409,6 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode)
 }
 
 
-bool isSameFile(string const & fileone, string const & filetwo)
-{
-       HANDLE h1 = CreateFile(fileone.c_str(), 0,
-               FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
-       HANDLE h2 = CreateFile(filetwo.c_str(), 0,
-               FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
-
-       if (h1 == INVALID_HANDLE_VALUE || h2 == INVALID_HANDLE_VALUE) {
-               // One or both files cannot be accessed.
-               if (h1 != INVALID_HANDLE_VALUE)
-                       CloseHandle(h1);
-               if (h2 != INVALID_HANDLE_VALUE)
-                       CloseHandle(h2);
-               return false;
-       }
-
-       BY_HANDLE_FILE_INFORMATION info1;
-       BY_HANDLE_FILE_INFORMATION info2;
-       bool samefile = false;
-       if (GetFileInformationByHandle(h1, &info1) != 0
-           && GetFileInformationByHandle(h2, &info2) != 0) {
-               // Serial number of the volumes containing the files.
-               ULONG st1_dev = info1.dwVolumeSerialNumber;
-               ULONG st2_dev = info2.dwVolumeSerialNumber;
-               // Unique identifiers associated to the files on the volumes.
-               ULONGLONG highbits = info1.nFileIndexHigh & 0x0000FFFF;
-               ULONGLONG st1_ino = (highbits << sizeof(ULONG)) | info1.nFileIndexLow;
-               highbits = info2.nFileIndexHigh & 0x0000FFFF;
-               ULONGLONG st2_ino = (highbits << sizeof(ULONG)) | info2.nFileIndexLow;
-               samefile = st1_ino == st2_ino && st1_dev == st2_dev;
-       }
-       CloseHandle(h1);
-       CloseHandle(h2);
-       return samefile;
-}
-
-
 string real_path(string const & path)
 {
        // See http://msdn.microsoft.com/en-us/library/aa366789(VS.85).aspx
@@ -479,7 +461,7 @@ string real_path(string const & path)
        UINT namelen = _tcslen(tmpbuf);
        if (_tcsnicmp(realpath, tmpbuf, namelen) == 0) {
                // UNC path
-               snprintf(tmpbuf, MAX_PATH, "\\\\%s", realpath + namelen);
+               _snprintf(tmpbuf, MAX_PATH, "\\\\%s", realpath + namelen);
                strncpy(realpath, tmpbuf, MAX_PATH);
                realpath[MAX_PATH] = '\0';
        } else if (GetLogicalDriveStrings(MAX_PATH - 1, tmpbuf)) {
@@ -499,7 +481,7 @@ string real_path(string const & path)
                                        if (found) {
                                                // Repl. device spec with drive
                                                TCHAR tempfile[MAX_PATH];
-                                               snprintf(tempfile,
+                                               _snprintf(tempfile,
                                                        MAX_PATH,
                                                        "%s%s",
                                                        drive,