Wed May 16 17:42:37 2012 UTC ()
Update "libtorrent" package to version 0.13.2 and "rtorrent" package
to version 0.9.2.

A list of changes is not available unfortunately. But it seems that most
of the Solaris related build fixes have been integrated.


(tron)
diff -r1.43 -r1.44 pkgsrc/net/libtorrent/Makefile
diff -r1.10 -r1.11 pkgsrc/net/libtorrent/PLIST
diff -r1.18 -r1.19 pkgsrc/net/libtorrent/buildlink3.mk
diff -r1.28 -r1.29 pkgsrc/net/libtorrent/distinfo
diff -r1.8 -r0 pkgsrc/net/libtorrent/patches/patch-aa
diff -r1.1 -r0 pkgsrc/net/rtorrent/MESSAGE.BSD
diff -r1.49 -r1.50 pkgsrc/net/rtorrent/Makefile
diff -r1.28 -r1.29 pkgsrc/net/rtorrent/distinfo
diff -r1.7 -r0 pkgsrc/net/rtorrent/patches/patch-aa
diff -r1.1 -r0 pkgsrc/net/rtorrent/patches/patch-ac
diff -r1.2 -r1.3 pkgsrc/net/rtorrent/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/net/rtorrent/patches/patch-ae
diff -r1.1 -r1.2 pkgsrc/net/rtorrent/patches/patch-ag
cvs diff -r1.43 -r1.44 pkgsrc/net/libtorrent/Makefile (expand / switch to unified diff)

--- pkgsrc/net/libtorrent/Makefile 2012/01/11 22:41:46 1.43
+++ pkgsrc/net/libtorrent/Makefile 2012/05/16 17:42:37 1.44
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.43 2012/01/11 22:41:46 tron Exp $ 1# $NetBSD: Makefile,v 1.44 2012/05/16 17:42:37 tron Exp $
2 2
3DISTNAME= libtorrent-0.12.9 3DISTNAME= libtorrent-0.13.2
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ${HOMEPAGE:=downloads/} 5MASTER_SITES= ${HOMEPAGE:=downloads/}
6 6
7OWNER= tron@NetBSD.org 7OWNER= tron@NetBSD.org
8HOMEPAGE= http://libtorrent.rakshasa.no/ 8HOMEPAGE= http://libtorrent.rakshasa.no/
9COMMENT= BitTorrent library written in C++ for *nix 9COMMENT= BitTorrent library written in C++ for *nix
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
cvs diff -r1.10 -r1.11 pkgsrc/net/libtorrent/PLIST (expand / switch to unified diff)

--- pkgsrc/net/libtorrent/PLIST 2011/07/30 17:06:33 1.10
+++ pkgsrc/net/libtorrent/PLIST 2012/05/16 17:42:37 1.11
@@ -1,56 +1,63 @@ @@ -1,56 +1,63 @@
1@comment $NetBSD: PLIST,v 1.10 2011/07/30 17:06:33 tron Exp $ 1@comment $NetBSD: PLIST,v 1.11 2012/05/16 17:42:37 tron Exp $
2include/torrent/bitfield.h 2include/torrent/bitfield.h
3include/torrent/chunk_manager.h 3include/torrent/chunk_manager.h
4include/torrent/common.h 4include/torrent/common.h
5include/torrent/connection_manager.h 5include/torrent/connection_manager.h
6include/torrent/data/block.h 6include/torrent/data/block.h
7include/torrent/data/block_list.h 7include/torrent/data/block_list.h
8include/torrent/data/block_transfer.h 8include/torrent/data/block_transfer.h
9include/torrent/data/chunk_utils.h 9include/torrent/data/chunk_utils.h
 10include/torrent/data/download_data.h
10include/torrent/data/file.h 11include/torrent/data/file.h
11include/torrent/data/file_list.h 12include/torrent/data/file_list.h
12include/torrent/data/file_list_iterator.h 13include/torrent/data/file_list_iterator.h
13include/torrent/data/file_manager.h 14include/torrent/data/file_manager.h
14include/torrent/data/file_utils.h 15include/torrent/data/file_utils.h
15include/torrent/data/piece.h 16include/torrent/data/piece.h
16include/torrent/data/transfer_list.h 17include/torrent/data/transfer_list.h
17include/torrent/dht_manager.h 18include/torrent/dht_manager.h
18include/torrent/download.h 19include/torrent/download.h
19include/torrent/download/choke_group.h 20include/torrent/download/choke_group.h
20include/torrent/download/choke_queue.h 21include/torrent/download/choke_queue.h
21include/torrent/download/download_manager.h 22include/torrent/download/download_manager.h
 23include/torrent/download/group_entry.h
22include/torrent/download/resource_manager.h 24include/torrent/download/resource_manager.h
23include/torrent/download_info.h 25include/torrent/download_info.h
24include/torrent/error.h 26include/torrent/error.h
25include/torrent/event.h 27include/torrent/event.h
26include/torrent/exceptions.h 28include/torrent/exceptions.h
27include/torrent/hash_string.h 29include/torrent/hash_string.h
28include/torrent/http.h 30include/torrent/http.h
29include/torrent/object.h 31include/torrent/object.h
30include/torrent/object_raw_bencode.h 32include/torrent/object_raw_bencode.h
31include/torrent/object_static_map.h 33include/torrent/object_static_map.h
32include/torrent/object_stream.h 34include/torrent/object_stream.h
33include/torrent/path.h 35include/torrent/path.h
34include/torrent/peer/choke_status.h 36include/torrent/peer/choke_status.h
35include/torrent/peer/client_info.h 37include/torrent/peer/client_info.h
36include/torrent/peer/client_list.h 38include/torrent/peer/client_list.h
37include/torrent/peer/connection_list.h 39include/torrent/peer/connection_list.h
38include/torrent/peer/peer.h 40include/torrent/peer/peer.h
39include/torrent/peer/peer_info.h 41include/torrent/peer/peer_info.h
40include/torrent/peer/peer_list.h 42include/torrent/peer/peer_list.h
41include/torrent/poll.h 43include/torrent/poll.h
42include/torrent/poll_epoll.h 44include/torrent/poll_epoll.h
43include/torrent/poll_kqueue.h 45include/torrent/poll_kqueue.h
44include/torrent/poll_select.h 46include/torrent/poll_select.h
45include/torrent/rate.h 47include/torrent/rate.h
46include/torrent/thread_base.h 
47include/torrent/throttle.h 48include/torrent/throttle.h
48include/torrent/torrent.h 49include/torrent/torrent.h
49include/torrent/tracker.h 50include/torrent/tracker.h
 51include/torrent/tracker_controller.h
50include/torrent/tracker_list.h 52include/torrent/tracker_list.h
51include/torrent/utils/extents.h 53include/torrent/utils/extents.h
 54include/torrent/utils/log.h
 55include/torrent/utils/log_buffer.h
52include/torrent/utils/log_files.h 56include/torrent/utils/log_files.h
53include/torrent/utils/option_strings.h 57include/torrent/utils/option_strings.h
 58include/torrent/utils/ranges.h
54include/torrent/utils/resume.h 59include/torrent/utils/resume.h
 60include/torrent/utils/signal_bitfield.h
 61include/torrent/utils/thread_base.h
55lib/libtorrent.la 62lib/libtorrent.la
56lib/pkgconfig/libtorrent.pc 63lib/pkgconfig/libtorrent.pc
cvs diff -r1.18 -r1.19 pkgsrc/net/libtorrent/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/libtorrent/buildlink3.mk 2011/08/01 21:42:45 1.18
+++ pkgsrc/net/libtorrent/buildlink3.mk 2012/05/16 17:42:37 1.19
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.18 2011/08/01 21:42:45 tron Exp $ 1# $NetBSD: buildlink3.mk,v 1.19 2012/05/16 17:42:37 tron Exp $
2 2
3BUILDLINK_TREE+= libtorrent 3BUILDLINK_TREE+= libtorrent
4 4
5.if !defined(LIBTORRENT_BUILDLINK3_MK) 5.if !defined(LIBTORRENT_BUILDLINK3_MK)
6LIBTORRENT_BUILDLINK3_MK:= 6LIBTORRENT_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libtorrent+= libtorrent>=0.12.9 8BUILDLINK_API_DEPENDS.libtorrent+= libtorrent>=0.13.2
9BUILDLINK_ABI_DEPENDS.libtorrent+= libtorrent>=0.12.9 9BUILDLINK_ABI_DEPENDS.libtorrent+= libtorrent>=0.13.2
10BUILDLINK_PKGSRCDIR.libtorrent?= ../../net/libtorrent 10BUILDLINK_PKGSRCDIR.libtorrent?= ../../net/libtorrent
11 11
12.include "../../devel/libsigc++/buildlink3.mk" 12.include "../../devel/libsigc++/buildlink3.mk"
13.include "../../security/openssl/buildlink3.mk" 13.include "../../security/openssl/buildlink3.mk"
14.endif # LIBTORRENT_BUILDLINK3_MK 14.endif # LIBTORRENT_BUILDLINK3_MK
15 15
16BUILDLINK_TREE+= -libtorrent 16BUILDLINK_TREE+= -libtorrent
cvs diff -r1.28 -r1.29 pkgsrc/net/libtorrent/distinfo (expand / switch to unified diff)

--- pkgsrc/net/libtorrent/distinfo 2011/07/30 17:06:33 1.28
+++ pkgsrc/net/libtorrent/distinfo 2012/05/16 17:42:37 1.29
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
1$NetBSD: distinfo,v 1.28 2011/07/30 17:06:33 tron Exp $ 1$NetBSD: distinfo,v 1.29 2012/05/16 17:42:37 tron Exp $
2 2
3SHA1 (libtorrent-0.12.9.tar.gz) = 176a836c6e685e4dad71ac08c0e09caaa5b7757c 3SHA1 (libtorrent-0.13.2.tar.gz) = 4f34a744fbe10c54aaf53d34681fabc1a49d7257
4RMD160 (libtorrent-0.12.9.tar.gz) = a898e882da94977973d62f34a5dd82577fd83cf5 4RMD160 (libtorrent-0.13.2.tar.gz) = 090e6af9b4318a6176064159f6a8f70ab708c7fe
5Size (libtorrent-0.12.9.tar.gz) = 667864 bytes 5Size (libtorrent-0.13.2.tar.gz) = 725088 bytes
6SHA1 (patch-aa) = d864808b9e9524b3a7f72bcc1b465d4e6b2d4f4a 
File Deleted: pkgsrc/net/libtorrent/patches/Attic/patch-aa
File Deleted: pkgsrc/net/rtorrent/Attic/MESSAGE.BSD
cvs diff -r1.49 -r1.50 pkgsrc/net/rtorrent/Makefile (expand / switch to unified diff)

--- pkgsrc/net/rtorrent/Makefile 2012/03/07 00:19:08 1.49
+++ pkgsrc/net/rtorrent/Makefile 2012/05/16 17:42:37 1.50
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.49 2012/03/07 00:19:08 elric Exp $ 1# $NetBSD: Makefile,v 1.50 2012/05/16 17:42:37 tron Exp $
2 2
3DISTNAME= rtorrent-0.8.9 3DISTNAME= rtorrent-0.9.2
4PKGREVISION= 2 
5CATEGORIES= net 4CATEGORIES= net
6MASTER_SITES= ${HOMEPAGE:=downloads/} 5MASTER_SITES= ${HOMEPAGE:=downloads/}
7 6
8OWNER= tron@NetBSD.org 7OWNER= tron@NetBSD.org
9HOMEPAGE= http://libtorrent.rakshasa.no/ 8HOMEPAGE= http://libtorrent.rakshasa.no/
10COMMENT= Ncurses based torrent client with support for sessions 9COMMENT= Ncurses based torrent client with support for sessions
11LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 15USE_LIBTOOL= yes
17USE_NCURSES= yes # chgat 16USE_NCURSES= yes # chgat
@@ -23,30 +22,26 @@ GNU_CONFIGURE= yes @@ -23,30 +22,26 @@ GNU_CONFIGURE= yes
23 ${MACHINE_ARCH} == "i386" || \ 22 ${MACHINE_ARCH} == "i386" || \
24 ${MACHINE_ARCH} == "powerpc" || \ 23 ${MACHINE_ARCH} == "powerpc" || \
25 ${MACHINE_ARCH} == "x86_64" 24 ${MACHINE_ARCH} == "x86_64"
26GCC_REQD+= 4.1.3 25GCC_REQD+= 4.1.3
27.else 26.else
28GCC_REQD+= 4.2.1 27GCC_REQD+= 4.2.1
29.endif 28.endif
30 29
31.include "../../mk/pthread.buildlink3.mk" 30.include "../../mk/pthread.buildlink3.mk"
32LDFLAGS+= ${PTHREAD_LDFLAGS} 31LDFLAGS+= ${PTHREAD_LDFLAGS}
33 32
34.include "options.mk" 33.include "options.mk"
35 34
36.if !empty(OPSYS:M*BSD) || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" 
37MESSAGE_SRC= ${PKGDIR}/MESSAGE.BSD 
38.endif 
39 
40# See http://libtorrent.rakshasa.no/ticket/77 35# See http://libtorrent.rakshasa.no/ticket/77
41.include "../../mk/compiler.mk" 36.include "../../mk/compiler.mk"
42.if !empty(CC_VERSION:Mgcc-4.0.*) 37.if !empty(CC_VERSION:Mgcc-4.0.*)
43CXXFLAGS+= -fpermissive -fno-strength-reduce -fno-thread-jumps \ 38CXXFLAGS+= -fpermissive -fno-strength-reduce -fno-thread-jumps \
44 -fno-inline -fforce-addr 39 -fno-inline -fforce-addr
45.endif 40.endif
46 41
47.if !empty(CC_VERSION:Mgcc-*) && !empty(MACHINE_ARCH:Mi?86) 42.if !empty(CC_VERSION:Mgcc-*) && !empty(MACHINE_ARCH:Mi?86)
48CXXFLAGS+= -march=i486 43CXXFLAGS+= -march=i486
49.endif 44.endif
50 45
51INSTALLATION_DIRS= share/examples/rtorrent 46INSTALLATION_DIRS= share/examples/rtorrent
52 47
cvs diff -r1.28 -r1.29 pkgsrc/net/rtorrent/distinfo (expand / switch to unified diff)

--- pkgsrc/net/rtorrent/distinfo 2011/08/01 13:12:38 1.28
+++ pkgsrc/net/rtorrent/distinfo 2012/05/16 17:42:37 1.29
@@ -1,12 +1,10 @@ @@ -1,12 +1,10 @@
1$NetBSD: distinfo,v 1.28 2011/08/01 13:12:38 wiz Exp $ 1$NetBSD: distinfo,v 1.29 2012/05/16 17:42:37 tron Exp $
2 2
3SHA1 (rtorrent-0.8.9.tar.gz) = 0ac51c185e98b5a386e5f1a07bca9a9963e2d6ce 3SHA1 (rtorrent-0.9.2.tar.gz) = 2a642d722745091265037ed8929a23c237a3b99f
4RMD160 (rtorrent-0.8.9.tar.gz) = d79eacf6d63d13514c07c1c35a662fea5f35aef1 4RMD160 (rtorrent-0.9.2.tar.gz) = 130a4c7f3bd018f7247d4561170d6878ab7a120f
5Size (rtorrent-0.8.9.tar.gz) = 570904 bytes 5Size (rtorrent-0.9.2.tar.gz) = 591837 bytes
6SHA1 (patch-aa) = ef8edceb33f28e022e3d48706c30733ac3a730a3 
7SHA1 (patch-ab) = 87873bb32166d00398ab0ef6421a6fe85a55c914 6SHA1 (patch-ab) = 87873bb32166d00398ab0ef6421a6fe85a55c914
8SHA1 (patch-ac) = b62de9ce834aa0422ec173e694d07e88aa1e2f47 7SHA1 (patch-ad) = ffc72a4020614f5879a050c0399c10d6f85cbdf0
9SHA1 (patch-ad) = 04fafec083c7cb27eb2f5ef7fbc5f6ab2e4e4a55 8SHA1 (patch-ae) = a370881bfdd8534eb25fcbcff8d258b19797941f
10SHA1 (patch-ae) = 49cb5e84f3759febfc93df874a10c90cafc249d8 
11SHA1 (patch-af) = 842a01cbc75e61092b4d33fe9155a728e7c502e6 9SHA1 (patch-af) = 842a01cbc75e61092b4d33fe9155a728e7c502e6
12SHA1 (patch-ag) = 381b100d2ae711114b24c4de2a4bf612efe31766 10SHA1 (patch-ag) = b7e5fe242b19f994f013acc9ec54a65fed729c29
File Deleted: pkgsrc/net/rtorrent/patches/Attic/patch-aa
File Deleted: pkgsrc/net/rtorrent/patches/Attic/patch-ac
cvs diff -r1.2 -r1.3 pkgsrc/net/rtorrent/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/rtorrent/patches/Attic/patch-ad 2008/12/16 16:49:52 1.2
+++ pkgsrc/net/rtorrent/patches/Attic/patch-ad 2012/05/16 17:42:37 1.3
@@ -1,45 +1,25 @@ @@ -1,45 +1,25 @@
1$NetBSD: patch-ad,v 1.2 2008/12/16 16:49:52 tron Exp $ 1$NetBSD: patch-ad,v 1.3 2012/05/16 17:42:37 tron Exp $
2 2
3--- src/utils/directory.cc.orig 2008-05-07 13:19:11.000000000 +0100 3Fix build under Solaris and DragonFly.
4+++ src/utils/directory.cc 2008-12-16 16:45:58.000000000 +0000 4
 5--- src/utils/directory.cc.orig 2012-03-29 14:06:11.000000000 +0100
 6+++ src/utils/directory.cc 2012-05-14 23:44:08.000000000 +0100
5@@ -38,6 +38,7 @@ 7@@ -38,6 +38,7 @@
6  8
7 #include <algorithm> 9 #include <algorithm>
8 #include <functional> 10 #include <functional>
9+#include <sys/stat.h> 11+#include <sys/stat.h>
10 #include <dirent.h> 12 #include <dirent.h>
11 #include <rak/path.h> 13 #include <rak/path.h>
12 #include <torrent/exceptions.h> 14 #include <torrent/exceptions.h>
13@@ -63,7 +64,9 @@ 15@@ -67,7 +68,9 @@
14 if (m_path.empty()) 16 if (m_path.empty())
15 throw torrent::input_error("Directory::update() tried to open an empty path."); 17 throw torrent::input_error("Directory::update() tried to open an empty path.");
16  18
17- DIR* d = opendir(rak::path_expand(m_path).c_str()); 19- DIR* d = opendir(rak::path_expand(m_path).c_str());
18+ std::string path=rak::path_expand(m_path); 20+ std::string path=rak::path_expand(m_path);
19+ 21+
20+ DIR* d = opendir(path.c_str()); 22+ DIR* d = opendir(path.c_str());
21  23
22 if (d == NULL) 24 if (d == NULL)
23 return false; 25 return false;
24@@ -73,12 +76,18 @@ 
25 while ((entry = readdir(d)) != NULL) { 
26 if ((flags & update_hide_dot) && entry->d_name[0] == '.') 
27 continue; 
28+  
29+ std::string full_path = path + '/'; 
30+ full_path += entry->d_name; 
31+  
32+ struct stat sb; 
33+ if (stat(full_path.c_str(), &sb)) 
34+ continue; 
35  
36 iterator itr = base_type::insert(end(), value_type()); 
37  
38- itr->d_fileno = entry->d_fileno; 
39- itr->d_reclen = entry->d_reclen; 
40- itr->d_type = entry->d_type; 
41+ itr->d_fileno = sb.st_ino; 
42+ itr->d_type = sb.st_mode; 
43  
44 #ifdef DIRENT_NAMLEN_EXISTS_FOOBAR 
45 itr->d_name = std::string(entry->d_name, entry->d_name + entry->d_namlen); 
cvs diff -r1.2 -r1.3 pkgsrc/net/rtorrent/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/net/rtorrent/patches/Attic/patch-ae 2008/12/16 16:49:52 1.2
+++ pkgsrc/net/rtorrent/patches/Attic/patch-ae 2012/05/16 17:42:37 1.3
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-ae,v 1.2 2008/12/16 16:49:52 tron Exp $ 1$NetBSD: patch-ae,v 1.3 2012/05/16 17:42:37 tron Exp $
2 2
3--- src/utils/directory.h.orig 2008-05-07 13:19:11.000000000 +0100 3Fix build under Solaris and DragonFly.
4+++ src/utils/directory.h 2008-12-16 16:45:58.000000000 +0000 4
5@@ -49,8 +49,7 @@ 5--- src/utils/directory.h.orig 2012-03-29 14:06:11.000000000 +0100
6  6+++ src/utils/directory.h 2012-05-14 23:40:30.000000000 +0100
 7@@ -50,7 +50,7 @@
7 // The name and types should match POSIX. 8 // The name and types should match POSIX.
8 uint32_t d_fileno; 9 uint32_t d_fileno;
9- uint32_t d_reclen; 10 uint32_t d_reclen; //Not used. Messes with Solaris.
10- uint8_t d_type; 11- uint8_t d_type;
11+ uint32_t d_type; 12+ uint32_t d_type;
12  13
13 std::string d_name; 14 std::string d_name;
14 }; 15 };
cvs diff -r1.1 -r1.2 pkgsrc/net/rtorrent/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/net/rtorrent/patches/Attic/patch-ag 2011/07/30 17:06:33 1.1
+++ pkgsrc/net/rtorrent/patches/Attic/patch-ag 2012/05/16 17:42:37 1.2
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1$NetBSD: patch-ag,v 1.1 2011/07/30 17:06:33 tron Exp $ 1$NetBSD: patch-ag,v 1.2 2012/05/16 17:42:37 tron Exp $
2 2
3Fix handling of command line options. Please look here for details: 3Fix handling of command line options. Please look here for details:
4 4
5http://libtorrent.rakshasa.no/ticket/2657 5http://libtorrent.rakshasa.no/ticket/2657
6 6
7--- src/main.cc.orig 2011-06-12 07:43:04.000000000 +0100 7--- src/main.cc.orig 2012-03-20 15:09:58.000000000 +0000
8+++ src/main.cc 2011-07-30 17:21:50.000000000 +0100 8+++ src/main.cc 2012-05-14 23:44:41.000000000 +0100
9@@ -822,13 +822,13 @@ 9@@ -843,14 +843,14 @@
10 } 10 }
11 #endif 11 #endif
12  12
13- int firstArg = parse_options(control, argc, argv); 13- int firstArg = parse_options(control, argc, argv);
14- 14-
15 if (OptionParser::has_flag('n', argc, argv)) 15 if (OptionParser::has_flag('n', argc, argv)) {
16 control->core()->push_log("Ignoring ~/.rtorrent.rc."); 16 lt_log_print(torrent::LOG_WARN, "Ignoring ~/.rtorrent.rc.");
17 else 17 } else {
18 rpc::parse_command_single(rpc::make_target(), "try_import = ~/.rtorrent.rc"); 18 rpc::parse_command_single(rpc::make_target(), "try_import = ~/.rtorrent.rc");
 19 }
19  20
20+ int firstArg = parse_options(control, argc, argv); 21+ int firstArg = parse_options(control, argc, argv);
21+ 22+
22 control->initialize(); 23 control->initialize();
23  24
24 // Load session torrents and perform scheduled tasks to ensure 25 // Load session torrents and perform scheduled tasks to ensure