[or-cvs] More whitespace normalization
Nick Mathewson
nickm at seul.org
Wed Nov 10 01:20:19 UTC 2004
Update of /home/or/cvsroot/contrib
In directory moria.mit.edu:/tmp/cvs-serv26659/contrib
Modified Files:
checkSpace.pl mdd.py tor.sh.in
Log Message:
More whitespace normalization
Index: checkSpace.pl
===================================================================
RCS file: /home/or/cvsroot/contrib/checkSpace.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- checkSpace.pl 9 Nov 2004 20:04:00 -0000 1.1
+++ checkSpace.pl 10 Nov 2004 01:20:17 -0000 1.2
@@ -4,22 +4,22 @@
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);
}
Index: mdd.py
===================================================================
RCS file: /home/or/cvsroot/contrib/mdd.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mdd.py 13 May 2004 00:09:50 -0000 1.2
+++ mdd.py 10 Nov 2004 01:20:17 -0000 1.3
@@ -94,7 +94,6 @@
print "=============================="
-
funcnames = functionCalls.keys()
funcnames.sort()
@@ -146,7 +145,6 @@
for c in calls:
d[c]=1
-
cycNames = cycCalls.keys()
while 1:
any = 0
Index: tor.sh.in
===================================================================
RCS file: /home/or/cvsroot/contrib/tor.sh.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tor.sh.in 4 Nov 2004 15:17:22 -0000 1.5
+++ tor.sh.in 10 Nov 2004 01:20:17 -0000 1.6
@@ -31,11 +31,11 @@
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 @@
$0 start
;;
-
status)
PID=`cat $TORPID 2>/dev/null`
if [ "$PID" != "" ]; then
@@ -105,7 +104,7 @@
log)
cat $TORLOG
;;
-
+
*)
echo "Usage: $0 (start|stop|restart|status|log)"
exit 1
More information about the tor-commits
mailing list