Fix bugs #6078 and #9364

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

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index bab96874e49de3c4b012b868713b91ebe533652d..db07d56e61c7e736b5628e4679a4ffb0cc340b1c 100644 (file)
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -1007,7 +1007,6 @@ cmd_ret const runCommand(string const & cmd)
        // variants ipstream, opstream
 
 #if defined (_WIN32)
-       int fno;
        STARTUPINFO startup;
        PROCESS_INFORMATION process;
        SECURITY_ATTRIBUTES security;
@@ -1049,7 +1048,7 @@ cmd_ret const runCommand(string const & cmd)
                                0, 0, &startup, &process)) {
 
                        CloseHandle(process.hThread);
-                       fno = _open_osfhandle((long)in, _O_RDONLY);
+                       int fno = _open_osfhandle((long)in, _O_RDONLY);
                        CloseHandle(out);
                        inf = _fdopen(fno, "r");
                }
@@ -1219,14 +1218,17 @@ int fileLock(const char * lock_file)
        int fd = -1;
 #if defined(HAVE_LOCKF)
        fd = open(lock_file, O_CREAT|O_APPEND|O_SYNC|O_RDWR, 0666);
+       if (fd == -1)
+               return -1;
        if (lockf(fd, F_LOCK, 0) != 0) {
                close(fd);
-               return(-1);
+               return -1;
        }
 #endif
-       return(fd);
+       return fd;
 }
 
+
 void fileUnlock(int fd, const char * /* lock_file*/)
 {
 #if defined(HAVE_LOCKF)