@@ -9,48 +9,53 @@
 import sys, os, time
 from stat import *
 
-# Use lstat() to stat files if it exists, else stat()
-try:
-    statfunc = os.lstat
-except AttributeError:
-    statfunc = os.stat
-
-# Parse options
-if sys.argv[1] == '-m':
-    itime = ST_MTIME
-    del sys.argv[1]
-elif sys.argv[1] == '-c':
-    itime = ST_CTIME
-    del sys.argv[1]
-elif sys.argv[1] == '-a':
-    itime = ST_CTIME
-    del sys.argv[1]
-else:
-    itime = ST_MTIME
-
-secs_per_year = 365.0 * 24.0 * 3600.0   # Scale factor
-now = time.time()                       # Current time, for age computations
-status = 0                              # Exit status, set to 1 on errors
-
-# Compute max file name length
-maxlen = 1
-for filename in sys.argv[1:]:
-    maxlen = max(maxlen, len(filename))
-
-# Process each argument in turn
-for filename in sys.argv[1:]:
+def main():
+
+    # Use lstat() to stat files if it exists, else stat()
     try:
-        st = statfunc(filename)
-    except os.error, msg:
-        sys.stderr.write("can't stat %r: %r\n" % (filename, msg))
-        status = 1
-        st = ()
-    if st:
-        anytime = st[itime]
-        size = st[ST_SIZE]
-        age = now - anytime
-        byteyears = float(size) * float(age) / secs_per_year
-        print filename.ljust(maxlen),
-        print repr(int(byteyears)).rjust(8)
-
-sys.exit(status)
+        statfunc = os.lstat
+    except AttributeError:
+        statfunc = os.stat
+
+    # Parse options
+    if sys.argv[1] == '-m':
+        itime = ST_MTIME
+        del sys.argv[1]
+    elif sys.argv[1] == '-c':
+        itime = ST_CTIME
+        del sys.argv[1]
+    elif sys.argv[1] == '-a':
+        itime = ST_CTIME
+        del sys.argv[1]
+    else:
+        itime = ST_MTIME
+
+    secs_per_year = 365.0 * 24.0 * 3600.0   # Scale factor
+    now = time.time()                       # Current time, for age computations
+    status = 0                              # Exit status, set to 1 on errors
+
+    # Compute max file name length
+    maxlen = 1
+    for filename in sys.argv[1:]:
+        maxlen = max(maxlen, len(filename))
+
+    # Process each argument in turn
+    for filename in sys.argv[1:]:
+        try:
+            st = statfunc(filename)
+        except os.error, msg:
+            sys.stderr.write("can't stat %r: %r\n" % (filename, msg))
+            status = 1
+            st = ()
+        if st:
+            anytime = st[itime]
+            size = st[ST_SIZE]
+            age = now - anytime
+            byteyears = float(size) * float(age) / secs_per_year
+            print filename.ljust(maxlen),
+            print repr(int(byteyears)).rjust(8)
+
+    sys.exit(status)
+
+if __name__ == '__main__':
+    main()
@@ -62,4 +62,5 @@ def get_long(s):
         return -1
     return ord(s[0]) + (ord(s[1])<<8) + (ord(s[2])<<16) + (ord(s[3])<<24)
 
-main()
+if __name__ == '__main__':
+    main()
@@ -186,4 +186,5 @@ def fixline(line):
 
     return head + '(' + basepart + '):' + tail
 
-main()
+if __name__ == '__main__':
+    main()
@@ -22,4 +22,5 @@ def main():
         sys.stderr.write(file2 + ': cannot change time\n')
         sys.exit(2)
 
-main()
+if __name__ == '__main__':
+    main()
@@ -1,19 +1,24 @@
 #! /usr/bin/env python
-
 "Replace CRLF with LF in argument files.  Print names of changed files."
 
 import sys, os
-for filename in sys.argv[1:]:
-    if os.path.isdir(filename):
-        print filename, "Directory!"
-        continue
-    data = open(filename, "rb").read()
-    if '\0' in data:
-        print filename, "Binary!"
-        continue
-    newdata = data.replace("\r\n", "\n")
-    if newdata != data:
-        print filename
-        f = open(filename, "wb")
-        f.write(newdata)
-        f.close()
+
+def main():
+    for filename in sys.argv[1:]:
+        if os.path.isdir(filename):
+            print filename, "Directory!"
+            continue
+        data = open(filename, "rb").read()
+        if '\0' in data:
+            print filename, "Binary!"
+            continue
+        newdata = data.replace("\r\n", "\n")
+        if newdata != data:
+            print filename
+            f = open(filename, "wb")
+            f.write(newdata)
+            f.close()
+
+if __name__ == '__main__':
+    main()
+
@@ -68,4 +68,5 @@ def getmtime(filename):
         return 0
     return st[stat.ST_MTIME]
 
-sys.exit(main())
+if __name__ == '__main__':
+    main()
@@ -8,33 +8,38 @@
 
 import sys, os, time, difflib, optparse
 
-usage = "usage: %prog [options] fromfile tofile"
-parser = optparse.OptionParser(usage)
-parser.add_option("-c", action="store_true", default=False, help='Produce a context format diff (default)')
-parser.add_option("-u", action="store_true", default=False, help='Produce a unified format diff')
-parser.add_option("-n", action="store_true", default=False, help='Produce a ndiff format diff')
-parser.add_option("-l", "--lines", type="int", default=3, help='Set number of context lines (default 3)')
-(options, args) = parser.parse_args()
-
-if len(args) == 0:
-    parser.print_help()
-    sys.exit(1)
-if len(args) != 2:
-    parser.error("need to specify both a fromfile and tofile")
-
-n = options.lines
-fromfile, tofile = args
-
-fromdate = time.ctime(os.stat(fromfile).st_mtime)
-todate = time.ctime(os.stat(tofile).st_mtime)
-fromlines = open(fromfile).readlines()
-tolines = open(tofile).readlines()
-
-if options.u:
-    diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
-elif options.n:
-    diff = difflib.ndiff(fromlines, tolines)
-else:
-    diff = difflib.context_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
-
-sys.stdout.writelines(diff)
+def main():
+
+    usage = "usage: %prog [options] fromfile tofile"
+    parser = optparse.OptionParser(usage)
+    parser.add_option("-c", action="store_true", default=False, help='Produce a context format diff (default)')
+    parser.add_option("-u", action="store_true", default=False, help='Produce a unified format diff')
+    parser.add_option("-n", action="store_true", default=False, help='Produce a ndiff format diff')
+    parser.add_option("-l", "--lines", type="int", default=3, help='Set number of context lines (default 3)')
+    (options, args) = parser.parse_args()
+
+    if len(args) == 0:
+        parser.print_help()
+        sys.exit(1)
+    if len(args) != 2:
+        parser.error("need to specify both a fromfile and tofile")
+
+    n = options.lines
+    fromfile, tofile = args
+
+    fromdate = time.ctime(os.stat(fromfile).st_mtime)
+    todate = time.ctime(os.stat(tofile).st_mtime)
+    fromlines = open(fromfile).readlines()
+    tolines = open(tofile).readlines()
+
+    if options.u:
+        diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
+    elif options.n:
+        diff = difflib.ndiff(fromlines, tolines)
+    else:
+        diff = difflib.context_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
+
+    sys.stdout.writelines(diff)
+
+if __name__ == '__main__':
+    main()
@@ -56,4 +56,5 @@ def show(total, d, prefix):
         if d.has_key(key):
             show(tsub, d[key][1], psub)
 
-main()
+if __name__ == '__main__':
+    main()
@@ -39,4 +39,5 @@ def visit(prog, dirname, names):
         except os.error:
             pass
 
-main()
+if __name__ == '__main__':
+    main()
@@ -310,4 +310,5 @@ def addsubst(substfile):
         Dict[key] = value
     fp.close()
 
-main()
+if __name__ == '__main__':
+    main()
-Original file line number
+Diff line change
@@ @@ -186,4 +186,5 @@ def fixline(line): @@
     return head + '(' + basepart + '):' + tail
 -main()
 +if __name__ == '__main__':
 +    main()