aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-11-10 01:20:17 +0000
committerNick Mathewson <nickm@torproject.org>2004-11-10 01:20:17 +0000
commit21c92dace0052ed78815092d4f3db91367d7a381 (patch)
tree57fc6ccfea13ebf036eb6f77041cd37b1beb8ecd /contrib
parent0f89ec7f4c9adfe2e01dde51a009aa6fe0acf46d (diff)
downloadtor-21c92dace0052ed78815092d4f3db91367d7a381.tar
tor-21c92dace0052ed78815092d4f3db91367d7a381.tar.gz
More whitespace normalization
svn:r2768
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/checkSpace.pl32
-rwxr-xr-xcontrib/mdd.py2
-rw-r--r--contrib/tor.sh.in7
3 files changed, 19 insertions, 22 deletions
diff --git a/contrib/checkSpace.pl b/contrib/checkSpace.pl
index 435df1060..1589d723c 100755
--- a/contrib/checkSpace.pl
+++ b/contrib/checkSpace.pl
@@ -4,22 +4,22 @@ for $fn (@ARGV) {
open(F, "$fn");
$lastnil = 0;
while (<F>) {
- if (/\r/) {
- print " CR:$fn:$.\n";
- }
- if (/\t/) {
- print " TAB:$fn:$.\n";
- }
- if (/ +$/) {
- print "Space\@EOL:$fn:$.\n";
- }
- if ($lastnil && /^$/) {
- print " DoubleNL:$fn:$.\n";
- } elsif (/^$/) {
- $lastnil = 1;
- } else {
- $lastnil = 0;
- }
+ if (/\r/) {
+ print " CR:$fn:$.\n";
+ }
+ if (/\t/) {
+ print " TAB:$fn:$.\n";
+ }
+ if (/ +$/) {
+ print "Space\@EOL:$fn:$.\n";
+ }
+ if ($lastnil && /^$/) {
+ print " DoubleNL:$fn:$.\n";
+ } elsif (/^$/) {
+ $lastnil = 1;
+ } else {
+ $lastnil = 0;
+ }
}
close(F);
}
diff --git a/contrib/mdd.py b/contrib/mdd.py
index d3ce5c37d..e0b496b8f 100755
--- a/contrib/mdd.py
+++ b/contrib/mdd.py
@@ -94,7 +94,6 @@ for fname in files:
print "=============================="
-
funcnames = functionCalls.keys()
funcnames.sort()
@@ -146,7 +145,6 @@ for func in funcnames:
for c in calls:
d[c]=1
-
cycNames = cycCalls.keys()
while 1:
any = 0
diff --git a/contrib/tor.sh.in b/contrib/tor.sh.in
index c5d79b88c..642cd41fa 100644
--- a/contrib/tor.sh.in
+++ b/contrib/tor.sh.in
@@ -31,11 +31,11 @@ case "$1" in
echo "tor appears to be already running (pid file exists)"
echo "Maybe you should run: $0 restart ?"
RETVAL=1
- else
+ else
echo -n "Starting tor..."
if [ "x$TORUSER" = "x" ]; then
$TORBIN -f $TORCONF $TORARGS
- else
+ else
/bin/su -c "$TORBIN -f $TORCONF $TORARGS" $TORUSER
fi
RETVAL=$?
@@ -87,7 +87,6 @@ case "$1" in
$0 start
;;
-
status)
PID=`cat $TORPID 2>/dev/null`
if [ "$PID" != "" ]; then
@@ -105,7 +104,7 @@ case "$1" in
log)
cat $TORLOG
;;
-
+
*)
echo "Usage: $0 (start|stop|restart|status|log)"
exit 1