Include filename in FileDataSource errors

rstudio · Nov 27, 2018 · 5fa585d · 5fa585d
1 parent 332672a
commit 5fa585d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/filedatasource-unix.cpp b/src/filedatasource-unix.cpp
@@ -11,19 +11,19 @@ int FileDataSource::initialize(const std::string& path, bool owned) {
 
   _fd = open(path.c_str(), O_RDONLY);
   if (_fd == -1) {
-    _lastErrorMessage = "Error opening file: " + toString(errno) + "\n";
+    _lastErrorMessage = "Error opening file " + path + ": " + toString(errno) + "\n";
     return 1;
   }
   else {
     struct stat info = {0};
     if (fstat(_fd, &info)) {
-      _lastErrorMessage = "Error opening path: " + toString(errno) + "\n";
+      _lastErrorMessage = "Error opening path " + path + ": " + toString(errno) + "\n";
       ::close(_fd);
       return 1;
     }
 
     if (S_ISDIR(info.st_mode)) {
-      _lastErrorMessage = "File data source is a directory.\n";
+      _lastErrorMessage = "File data source is a directory: " + path + "\n";
       ::close(_fd);
       return 1;
     }
@@ -33,7 +33,7 @@ int FileDataSource::initialize(const std::string& path, bool owned) {
     if (owned && unlink(path.c_str())) {
       // Print this (on either main or background thread), since we're not
       // returning 1 to indicate an error.
-      err_printf("Couldn't delete temp file: %d\n", errno);
+      err_printf("Couldn't delete temp file %s: %d\n", path.c_str(), errno);
       // It's OK to continue
     }
 

diff --git a/src/filedatasource-win.cpp b/src/filedatasource-win.cpp
@@ -24,13 +24,15 @@ int FileDataSource::initialize(const std::string& path, bool owned) {
                       NULL);
 
   if (_hFile == INVALID_HANDLE_VALUE) {
-    _lastErrorMessage = "Error opening file: " + toString(GetLastError()) + "\n";
+    _lastErrorMessage = "Error opening file " + path + ": " + toString(GetLastError()) + "\n";
     return 1;
   }
 
+  // TODO: Error if it's a directory
+
   if (!GetFileSizeEx(_hFile, &_length)) {
     CloseHandle(_hFile);
-    _lastErrorMessage = "Error retrieving file size: " + toString(GetLastError()) + "\n";
+    _lastErrorMessage = "Error retrieving file size for " + path + ": " + toString(GetLastError()) + "\n";
     return 1;
   }