From d82e183d346375ac8a58a298a58728be615f947e Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Tue, 5 Feb 2008 17:38:24 +0000
Subject: [PATCH] 2008-02-06  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot
 com>

	Create directory before saving DHT routing table.
	Now ios::failure is now handled properly.
	* src/DHTAutoSaveCommand.cc
---
 ChangeLog                 |  6 ++++++
 src/DHTAutoSaveCommand.cc | 31 +++++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f731ef9b..ecc11af8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-06  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Create directory before saving DHT routing table.
+	Now ios::failure is now handled properly.
+	* src/DHTAutoSaveCommand.cc
+
 2008-02-05  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Removed unnecessary cerr.
diff --git a/src/DHTAutoSaveCommand.cc b/src/DHTAutoSaveCommand.cc
index b7809bf9..833d8017 100644
--- a/src/DHTAutoSaveCommand.cc
+++ b/src/DHTAutoSaveCommand.cc
@@ -44,6 +44,8 @@
 #include "RequestGroupMan.h"
 #include "prefs.h"
 #include "Option.h"
+#include "message.h"
+#include <cerrno>
 #include <fstream>
 
 DHTAutoSaveCommand::DHTAutoSaveCommand(int32_t cuid, DownloadEngine* e, int32_t interval):
@@ -68,6 +70,25 @@ void DHTAutoSaveCommand::process()
 
 void DHTAutoSaveCommand::save()
 {
+  string dhtFile = _e->option->get(PREF_DHT_FILE_PATH);
+  logger->info("Saving DHT routing table to %s.", dhtFile.c_str());
+
+  string tempFile = dhtFile+"__temp";
+  {
+    File f(tempFile);
+    if(!f.isFile()) {
+      File dir(f.getDirname());
+      if(!dir.exists()) {
+	if(!dir.mkdirs()) {
+	  logger->info(EX_MAKE_DIR, dir.getPath().c_str(), strerror(errno));
+	  return;
+	}
+      } else if(!dir.isDir()) {
+	logger->info(EX_NOT_DIRECTORY, dir.getPath().c_str());
+	return;
+      }
+    }
+  }
   DHTNodes nodes;
   DHTBuckets buckets = _routingTable->getBuckets();
   for(DHTBuckets::const_iterator i = buckets.begin(); i != buckets.end(); ++i) {
@@ -80,17 +101,19 @@ void DHTAutoSaveCommand::save()
   serializer.setLocalNode(_localNode);
   serializer.setNodes(nodes);
 
-  string dhtFile = _e->option->get(PREF_DHT_FILE_PATH);
-  string tempFile = dhtFile+"__temp";
-  ofstream o(tempFile.c_str(), ios::out|ios::binary);
-  o.exceptions(ios::failbit);
   try {
+    ofstream o(tempFile.c_str(), ios::out|ios::binary);
+    o.exceptions(ios::failbit);
+
     serializer.serialize(o);
 
     if(!File(tempFile).renameTo(dhtFile)) {
       logger->error("Cannot move file from %s to %s.",
 		    tempFile.c_str(), dhtFile.c_str());
     }
+  } catch(ios::failure const& e) {
+    logger->error("Failed to save DHT routing table to %s. cause:%s",
+		  tempFile.c_str(), strerror(errno));
   } catch(RecoverableException* e) {
     logger->error("Exception caught while saving DHT routing table to %s",
 		  e, tempFile.c_str());