Minor cleanup

COPYING

@@ -1,12 +1,12 @@
-  GNU GENERAL PUBLIC LICENSE
-  Version 2, June 1991
+  GNU GENERAL PUBLIC LICENSE
+  Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-  Preamble
+  Preamble
 
  The licenses for most software are designed to take away your
 freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
 your programs, too.
 
  When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
  The precise terms and conditions for copying, distribution and
 modification follow.
- 
-  GNU GENERAL PUBLIC LICENSE
+
+  GNU GENERAL PUBLIC LICENSE
  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
  0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
  License. (Exception: if the Program itself is interactive but
  does not normally print such an announcement, your work based on
  the Program is not required to print an announcement.)
- 
+
 These requirements apply to the modified work as a whole. If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
- 
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License. Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
- 
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-  NO WARRANTY
+  NO WARRANTY
 
  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-  END OF TERMS AND CONDITIONS
- 
-  How to Apply These Terms to Your New Programs
+  END OF TERMS AND CONDITIONS
+
+  How to Apply These Terms to Your New Programs
 
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  GNU General Public License for more details.
 
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
- Gnomovision version 69, Copyright (C) year  name of author
+ Gnomovision version 69, Copyright (C) year name of author
  Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
  This is free software, and you are welcome to redistribute it
  under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs. If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

README

@@ -5,7 +5,7 @@ necessary. The man page "doc/rtorrent.1" must be generated with
 "docbook2man rtorrent.1.xml" if it is missing.
 
  Note that rtorrent follows the development of libtorrent closely, and
-thus the versions must be in sync. This should not be nessesary in the
+thus the versions must be in sync. This should not be necessary in the
 future, when the library API stabilizes.
 
 USAGE

doc/faq.xml

@@ -93,7 +93,7 @@
  When I try downloading a torrent the client aborts (SIGABRT), what should I do?
  </para></question>
  <answer><para>
- Make sure you arn't using "-fomit-frame-pointer" when
+ Make sure you aren't using "-fomit-frame-pointer" when
  compiling libtorrent and rtorrent, this is known to produce
  bad code for C++ exception handling. If this doesn't help, run
  the client in gdb and use "bt -20" to get a backtrace. Send

doc/log_stats.plot

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 gnuplot << EOF
 # 1) system.time_seconds=
 #

doc/manual/logging.md

@@ -31,7 +31,7 @@ Each log handle can be added to multiple different logging events.
  "debug"
 
 The above events receive logging events from all the sub-groups
-displayed below, and each event also reciving events from the event
+displayed below, and each event also receiving events from the event
 above in importance.
 
 Thus some high-volume sub-group events such as “tracker\_debug” are not

doc/manual/logging.tex

@@ -39,7 +39,7 @@ \subsection{Logging events}
 \end{verbatim}
 
 The above events receive logging events from all the sub-groups
-displayed below, and each event also reciving events from the event
+displayed below, and each event also receiving events from the event
 above in importance.
 
 Thus some high-volume sub-group events such as ``tracker\_debug'' are

doc/plot/instrumentation_mincore.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 gnuplot << EOF
 
 set terminal png size 1024 * 1, 768 enhanced

doc/plot/instrumentation_transfers.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 gnuplot << EOF
 
 set terminal png size 1024,768 enhanced

doc/rtorrent_fast_resume.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # Perl script to add rTorrent fast resume data to torrent files.
 #

doc/scripts/init/rtorrentInitScreen.bash

@@ -4,10 +4,10 @@
 #############
 # This script depends on screen.
 # For the stop function to work, you must set an
-# explicit session directory using absolute paths (no, ~ is not absolute) in your rtorrent.rc.
+# explicit session directory using ABSOLUTE paths (no, ~ is not absolute) in your rtorrent.rc.
 # If you typically just start rtorrent with just "rtorrent" on the
 # command line, all you need to change is the "user" option.
-# Attach to the screen session as your user with 
+# Attach to the screen session as your user with
 # "screen -dr rtorrent". Change "rtorrent" with srnname option.
 # Licensed under the GPLv2 by lostnihilist: lostnihilist _at_ gmail _dot_ com
 ##############
@@ -17,19 +17,18 @@
 #######################
 ##Start Configuration##
 #######################
-# You can specify your configuration in a different file 
+# You can specify your configuration in a different file
 # (so that it is saved with upgrades, saved in your home directory,
 # or whatever reason you want to)
 # by commenting out/deleting the configuration lines and placing them
 # in a text file (say /home/user/.rtorrent.init.conf) exactly as you would
 # have written them here (you can leave the comments if you desire
-# and then uncommenting the following line correcting the path/filename 
+# and then uncommenting the following line correcting the path/filename
 # for the one you used. note the space after the ".".
 # . /etc/rtorrent.init.conf
 
-
 #Do not put a space on either side of the equal signs e.g.
-# user = user 
+# user = user
 # will not work
 # system user to run as (can only use one)
 user="user"
@@ -89,15 +88,15 @@ checkcnfg() {
  echo "cannot find $NAME binary in PATH: $PATH" | tee -a "$logfile" >&2
  exit 3
  fi
- for (( i=0 ; i < ${#config[@]} ;  i++ )) ; do
+ for (( i=0 ; i < ${#config[@]} ; i++ )) ; do
  if ! [ -r "${config[i]}" ] ; then
-  echo "cannot find readable config ${config[i]}. check that it is there and permissions are appropriate"  | tee -a "$logfile" >&2
-  exit 3
+ echo "cannot find readable config ${config[i]}. check that it is there and permissions are appropriate" | tee -a "$logfile" >&2
+ exit 3
  fi
  session=$(getsession "${config[i]}")
  if ! [ -d "${session}" ] ; then
-  echo "cannot find readable session directory ${session} from config ${config[i]}. check permissions" | tee -a "$logfile" >&2
-  exit 3
+ echo "cannot find readable session directory ${session} from config ${config[i]}. check permissions" | tee -a "$logfile" >&2
+ exit 3
  fi
  done
 }
@@ -109,7 +108,7 @@ d_start() {
  # this works for the screen command, but starting rtorrent below adopts screen session gid
  # even if it is not the screen session we started (e.g. running under an undesirable gid
  #su -c "screen -ls | grep -sq "\.${srnname}[[:space:]]" " ${user} || su -c "sg \"$group\" -c \"screen -fn -dm -S ${srnname} 2>&1 1>/dev/null\"" ${user} | tee -a "$logfile" >&2
- for (( i=0 ; i < ${#options[@]} ; i++ )) ;  do
+ for (( i=0 ; i < ${#options[@]} ; i++ )) ; do
  sleep 3
  su -c "screen -S "${srnname}" -X screen rtorrent ${options[i]} 2>&1 1>/dev/null" ${user} | tee -a "$logfile" >&2
  done
@@ -119,20 +118,20 @@ d_stop() {
  for (( i=0 ; i < ${#config[@]} ; i++ )) ; do
  session=$(getsession "${config[i]}")
  if ! [ -s ${session}/rtorrent.lock ] ; then
-  return
+ return
  fi
  pid=$(cat ${session}/rtorrent.lock | awk -F: '{print($2)}' | sed "s/[^0-9]//g")
  # make sure the pid doesn't belong to another process
  if ps -A | grep -sq ${pid}.*rtorrent ; then
-  kill -s INT ${pid}
+ kill -s INT ${pid}
  fi
  done
 }
 
-getsession() { 
-  session=$(cat "$1" | grep "^[[:space:]]*session.path.set[[:space:]]*=" | sed "s/^[[:space:]]*session.path.set[[:space:]]*=[[:space:]]*//" )
-  #session=${session/#~/`getent passwd ${user}|cut -d: -f6`}
-  echo $session
+getsession() {
+ session=$(cat "$1" | grep "^[[:space:]]*session.path.set[[:space:]]*=" | sed "s/^[[:space:]]*session.path.set[[:space:]]*=[[:space:]]*//" )
+ #session=${session/#~/`getent passwd ${user}|cut -d: -f6`}
+ echo $session
 }
 
 checkcnfg

doc/scripts/init/rtorrentInitScreen.sh

@@ -7,7 +7,7 @@
 # explicit session directory using ABSOLUTE paths (no, ~ is not absolute) in your rtorrent.rc.
 # If you typically just start rtorrent with just "rtorrent" on the
 # command line, all you need to change is the "user" option.
-# Attach to the screen session as your user with 
+# Attach to the screen session as your user with
 # "screen -dr rtorrent". Change "rtorrent" with srnname option.
 # Licensed under the GPLv2 by lostnihilist: lostnihilist _at_ gmail _dot_ com
 ##############
@@ -17,18 +17,18 @@
 #######################
 ##Start Configuration##
 #######################
-# You can specify your configuration in a different file 
+# You can specify your configuration in a different file
 # (so that it is saved with upgrades, saved in your home directory,
-# or whateve reason you want to)
+# or whatever reason you want to)
 # by commenting out/deleting the configuration lines and placing them
 # in a text file (say /home/user/.rtorrent.init.conf) exactly as you would
 # have written them here (you can leave the comments if you desire
-# and then uncommenting the following line correcting the path/filename 
+# and then uncommenting the following line correcting the path/filename
 # for the one you used. note the space after the ".".
 # . /etc/rtorrent.init.conf
 
 #Do not put a space on either side of the equal signs e.g.
-# user = user 
+# user = user
 # will not work
 # system user to run as
 user="user"
@@ -53,33 +53,34 @@ logfile="/var/log/rtorrentInit.log"
 #######################
 ###END CONFIGURATION###
 #######################
+
 PATH=/usr/bin:/usr/local/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin
 DESC="rtorrent"
 NAME=rtorrent
 DAEMON=$NAME
 SCRIPTNAME=/etc/init.d/$NAME
 
 checkcnfg() {
- exists=0
- for i in `echo "$PATH" | tr ':' '\n'` ; do
- if [ -f $i/$NAME ] ; then
- exists=1
- break
- fi
- done
- if [ $exists -eq 0 ] ; then
- echo "cannot find rtorrent binary in PATH $PATH" | tee -a "$logfile" >&2
- exit 3
- fi
- if ! [ -r "${config}" ] ; then 
- echo "cannot find readable config ${config}. check that it is there and permissions are appropriate" | tee -a "$logfile" >&2
- exit 3 
- fi 
- session=`getsession "$config"` 
- if ! [ -d "${session}" ] ; then
- echo "cannot find readable session directory ${session} from config ${config}. check permissions" | tee -a "$logfile" >&2
- exit 3
+ exists=0
+ for i in `echo "$PATH" | tr ':' '\n'` ; do
+ if [ -f $i/$NAME ] ; then
+ exists=1
+ break
  fi
+ done
+ if [ $exists -eq 0 ] ; then
+ echo "cannot find rtorrent binary in PATH: $PATH" | tee -a "$logfile" >&2
+ exit 3
+ fi
+ if ! [ -r "${config}" ] ; then
+ echo "cannot find readable config ${config}. check that it is there and permissions are appropriate" | tee -a "$logfile" >&2
+ exit 3
+ fi
+ session=`getsession "$config"`
+ if ! [ -d "${session}" ] ; then
+ echo "cannot find readable session directory ${session} from config ${config}. check permissions" | tee -a "$logfile" >&2
+ exit 3
+ fi
 }
 
 d_start() {
@@ -93,19 +94,19 @@ d_start() {
 }
 
 d_stop() {
-  session=`getsession "$config"`
-  if ! [ -s ${session}/rtorrent.lock ] ; then
-  return
-  fi
-  pid=`cat ${session}/rtorrent.lock | awk -F: '{print($2)}' | sed "s/[^0-9]//g"`
-  if ps -A | grep -sq ${pid}.*rtorrent ; then # make sure the pid doesn't belong to another process
-  kill -s INT ${pid}
-  fi
+ session=`getsession "$config"`
+ if ! [ -s ${session}/rtorrent.lock ] ; then
+ return
+ fi
+ pid=`cat ${session}/rtorrent.lock | awk -F: '{print($2)}' | sed "s/[^0-9]//g"`
+ if ps -A | grep -sq ${pid}.*rtorrent ; then # make sure the pid doesn't belong to another process
+ kill -s INT ${pid}
+ fi
 }
 
-getsession() { 
-  session=`cat "$1" | grep "^[[:space:]]*session.path.set[[:space:]]*=" | sed "s/^[[:space:]]*session.path.set[[:space:]]*=[[:space:]]*//" `
-  echo $session
+getsession() {
+ session=`cat "$1" | grep "^[[:space:]]*session.path.set[[:space:]]*=" | sed "s/^[[:space:]]*session.path.set[[:space:]]*=[[:space:]]*//" `
+ echo $session
 }
 
 checkcnfg