From aab31e5ea556cd03730b5beedaa50bc09f510869 Mon Sep 17 00:00:00 2001
From: rakshasa <sundell.software@gmail.com>
Date: Thu, 21 Dec 2006 16:27:48 +0000
Subject: [PATCH] * Added path match depth to torrent::File which can be used
 to quickly determine the common root directory of two adjecent files.

* Cleaned up RC4 class.

* Fixed --with-openssl so it accepts user-supplied paths.

* Call abort instead of exit when receiving a SIGSEGV or SIGBUS.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@829 e378c898-3ddf-0310-93e7-cc216c733640
---
 configure.ac                       | 4 ++--
 src/core/download.h                | 6 ++++--
 src/display/text_element_helpers.h | 1 +
 src/display/utils.cc               | 1 +
 src/display/window_file_list.cc    | 5 +++--
 src/main.cc                        | 3 ++-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4534b5fc..846a01ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(rtorrent, 0.7.0, jaris@ifi.uio.no)
+AC_INIT(rtorrent, 0.7.1, jaris@ifi.uio.no)
 
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
@@ -23,7 +23,7 @@ TORRENT_WITHOUT_NCURSESW()
 TORRENT_WITHOUT_STATVFS()
 TORRENT_WITHOUT_STATFS()
 
-PKG_CHECK_MODULES(STUFF, sigc++-2.0 libtorrent >= 0.11.0,
+PKG_CHECK_MODULES(STUFF, sigc++-2.0 libtorrent >= 0.11.1,
 	          CXXFLAGS="$CXXFLAGS $STUFF_CFLAGS $CURL_CFLAGS";
 		  LIBS="$LIBS $STUFF_LIBS $CURL_LIBS")
 
diff --git a/src/core/download.h b/src/core/download.h
index 17417823..9a15b4bb 100644
--- a/src/core/download.h
+++ b/src/core/download.h
@@ -37,16 +37,18 @@
 #ifndef RTORRENT_CORE_DOWNLOAD_H
 #define RTORRENT_CORE_DOWNLOAD_H
 
-#include <rak/string_manip.h>
 #include <sigc++/connection.h>
 #include <torrent/download.h>
 #include <torrent/hash_string.h>
 #include <torrent/tracker_list.h>
-#include <torrent/torrent.h>
 #include <torrent/data/file_list.h>
 
 #include "utils/variable_map.h"
 
+namespace torrent {
+  class TrackerList;
+}
+
 namespace core {
 
 class Download {
diff --git a/src/display/text_element_helpers.h b/src/display/text_element_helpers.h
index 115e593c..71605b05 100644
--- a/src/display/text_element_helpers.h
+++ b/src/display/text_element_helpers.h
@@ -40,6 +40,7 @@
 #include <rak/functional.h>
 #include <rak/socket_address.h>
 #include <torrent/bitfield.h>
+#include <torrent/torrent.h>
 
 #include "core/download.h"
 
diff --git a/src/display/utils.cc b/src/display/utils.cc
index 634f4759..badd8da3 100644
--- a/src/display/utils.cc
+++ b/src/display/utils.cc
@@ -44,6 +44,7 @@
 #include <torrent/exceptions.h>
 #include <torrent/connection_manager.h>
 #include <torrent/rate.h>
+#include <torrent/torrent.h>
 #include <torrent/tracker.h>
 #include <torrent/tracker_list.h>
 #include <torrent/data/file_list.h>
diff --git a/src/display/window_file_list.cc b/src/display/window_file_list.cc
index d1e0f627..dd02d8ba 100644
--- a/src/display/window_file_list.cc
+++ b/src/display/window_file_list.cc
@@ -135,11 +135,12 @@ WindowFileList::redraw() {
                     done_percentage(e),
                     e->path()->encoding().c_str());
 
-    m_canvas->print(84, pos, "%i - %i %c%c",
+    m_canvas->print(84, pos, "%i - %i %c%c %u",
                     e->range().first,
                     e->range().first != e->range().second ? (e->range().second - 1) : e->range().second,
                     e->is_created() ? 'E' : 'M',
-                    e->is_correct_size() ? 'C' : 'W');
+                    e->is_correct_size() ? 'C' : 'W',
+                    e->path_match_depth());
 
     ++range.first;
     ++pos;
diff --git a/src/main.cc b/src/main.cc
index 64a12b19..7c7197e1 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -36,6 +36,7 @@
 
 #include "config.h"
 
+#include <cstdlib>
 #include <iostream>
 #include <string>
 #include <sigc++/bind.h>
@@ -298,7 +299,7 @@ do_panic(int signum) {
   if (signum == SIGBUS)
     std::cout << "A bus error propably means you ran out of diskspace." << std::endl;
 
-  exit(-1);
+  std::abort();
 }
 
 void