Remove Fade{Up,Down}Time tags when writing text FOR_CCAP.

[libdcp.git] / src / file.cc

diff --git a/src/file.cc b/src/file.cc
index bb276d48b619fdce98636fa1dccee0162e54358b..36102f72081d979b7a61bac5ca4609805beb87d8 100644 (file)
--- a/src/file.cc
+++ b/src/file.cc
@@ -34,6 +34,11 @@
 
 #include "dcp_assert.h"
 #include "file.h"
+#include "filesystem.h"
+#ifdef LIBDCP_WINDOWS
+#include <errhandlingapi.h>
+#endif
+#include <stdio.h>
 
 
 using namespace dcp;
@@ -49,11 +54,18 @@ File::File(boost::filesystem::path path, std::string mode)
        : _path(path)
 {
 #ifdef LIBDCP_WINDOWS
+       SetLastError(0);
        std::wstring mode_wide(mode.begin(), mode.end());
        /* c_str() here should give a UTF-16 string */
-        _file = _wfopen(fix_long_path(path).c_str(), mode_wide.c_str());
+       _file = _wfopen(dcp::filesystem::fix_long_path(path).c_str(), mode_wide.c_str());
+       if (!_file) {
+               _open_error = GetLastError();
+       }
 #else
         _file = fopen(path.c_str(), mode.c_str());
+       if (!_file) {
+               _open_error = errno;
+       }
 #endif
 }
 
@@ -61,6 +73,7 @@ File::File(boost::filesystem::path path, std::string mode)
 File::File(File&& other)
        : _path(other._path)
        , _file(other._file)
+       , _open_error(other._open_error)
 {
        other._file = nullptr;
 }
@@ -72,6 +85,7 @@ File::operator=(File&& other)
        if (*this != other) {
                close();
                _file = other._file;
+               _open_error = other._open_error;
                other._file = nullptr;
        }
        return *this;
@@ -113,7 +127,7 @@ File::eof()
 
 
 char *
-File::gets(char *s, int size)
+File::gets(char* s, int size)
 {
        DCP_ASSERT(_file);
        return fgets(s, size, _file);
@@ -176,7 +190,7 @@ File::seek(int64_t offset, int whence)
 {
        DCP_ASSERT(_file);
 #ifdef LIBDCP_WINDOWS
-       return fseeki64(_file, offset, whence);
+       return _fseeki64(_file, offset, whence);
 #else
        return fseek(_file, offset, whence);
 #endif
@@ -202,45 +216,3 @@ File::error ()
        DCP_ASSERT(_file);
        return ferror(_file);
 }
-
-
-/** Windows can't "by default" cope with paths longer than 260 characters, so if you pass such a path to
- *  any boost::filesystem method it will fail.  There is a "fix" for this, which is to prepend
- *  the string \\?\ to the path.  This will make it work, so long as:
- *  - the path is absolute.
- *  - the path only uses backslashes.
- *  - individual path components are "short enough" (probably less than 255 characters)
- *
- *  See https://www.boost.org/doc/libs/1_57_0/libs/filesystem/doc/reference.html under
- *  "Warning: Long paths on Windows" for some details.
- *
- *  Our fopen_boost uses this method to get this fix, but any other calls to boost::filesystem
- *  will not unless this method is explicitly called to pre-process the pathname.
- */
-boost::filesystem::path
-dcp::fix_long_path (boost::filesystem::path long_path)
-{
-#ifdef LIBDCP_WINDOWS
-       using namespace boost::filesystem;
-
-       if (boost::algorithm::starts_with(long_path.string(), "\\\\")) {
-               /* This could mean it starts with \\ (i.e. a SMB path) or \\?\ (a long path)
-                * or a variety of other things... anyway, we'll leave it alone.
-                */
-               return long_path;
-       }
-
-       /* We have to make the path canonical but we can't call canonical() on the long path
-        * as it will fail.  So we'll sort of do it ourselves (possibly badly).
-        */
-       path fixed = "\\\\?\\";
-       if (long_path.is_absolute()) {
-               fixed += long_path.make_preferred();
-       } else {
-               fixed += boost::filesystem::current_path() / long_path.make_preferred();
-       }
-       return fixed;
-#else
-       return long_path;
-#endif
-}