Changeset 1540

Timestamp:

07/20/05 05:50:38 (3 years ago)

Author:

madcat

Message:

Closes tickets #28 and #31 (endless loops when shared files are deleted)

Files:

• hydranode/hncore/src/sharedfile.cpp (modified) (2 diffs)

hydranode/hncore/src/sharedfile.cpp

@@ -483 +483 @@
-        }
-
+        // first try to open, 'cos if the file doesn't exist, there's no point
+        // in the below modification date checks either
+        int fd = open(
+                getPath().native_file_string().c_str(),
+                O_RDONLY|O_LARGEFILE|O_BINARY
+        );
+
+        if (fd == -1) { 
+                if (m_locations.size()) {
+                        setLocation(m_locations.back().second);
+                        m_locations.pop_back();
+                        return read(begin, end);
+                }
+                boost::format fmt("Unable to open shared file %s%s (reason: %s)");
+                fmt % getName();
+                if (isPartial()) {
+                        fmt % (" (loc=" + getPath().native_file_string() + ")");
+                } else {
+                        fmt % "";
+                }
+#ifdef WIN32
+                fmt % "unable to open file";
+#else
+                fmt % strerror(errno);
+#endif
+                destroy(); // sorry, but if our file died, so shall we
+                throw std::runtime_error(fmt.str());
+        }
+
-        // check if modification date matches what we have on record
-        // if not, and we'r partial file, just rehash completed parts;
-        // otherwise, drop current metadata and rehash the file
-
+try 
-                uint32_t actual = Utils::getModDate(m_location);
-                uint32_t stored = m_metaData->getModDate();
@@ -504 +533 @@
-                        throw std::runtime_error(fmt.str());
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        }
-