From: Eric S. Raymond Date: Thu, 4 Sep 2003 02:30:59 +0000 (+0000) Subject: SHIF -> SCF. X-Git-Tag: 1.0~25 X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=c2673f99c01befafb0c402c881826ae082460616;p=comparator.git SHIF -> SCF. --- diff --git a/shredcompare.py b/shredcompare.py index c4ffcbe..69a259e 100755 --- a/shredcompare.py +++ b/shredcompare.py @@ -4,16 +4,16 @@ # import os, sys, time, stat, getopt, bsddb, struct -class SHIF: - "SHIF-A file metadata container." +class SCF: + "SCF-A file metadata container." def __init__(self, name): self.name = name self.fp = open(name) self.comments = [] self.hashcount = 0 id = self.fp.readline() - if not id.startswith("#SHIF-A "): - sys.stderr.write("shredcompare: %s is not a SHIF-A file."%self.fp.name) + if not id.startswith("#SCF-A "): + sys.stderr.write("shredcompare: %s is not a SCF-A file."%self.fp.name) sys.exit(1) while True: line = self.fp.readline() @@ -148,7 +148,7 @@ if __name__ == '__main__': shiflist = [] # Read input metadata for file in args: - shiflist.append(SHIF(file)) + shiflist.append(SCF(file)) # Metadata sanity check for i in range(len(args)-1): shiflist[i].compatible(shiflist[i+1]) @@ -239,7 +239,7 @@ if __name__ == '__main__': print "After sorting:", matches report_time("Reduction done") # OK, dump all matches. - print "#SHIF-B 1.0" + print "#SCF-B 1.0" print "Hash-Method: MD5" print "Normalization:", ",".join(shiflist[0].normalization) print "Merge-Program: shredcompare.py 1.0" diff --git a/shredtree.py b/shredtree.py index 2196c9e..232019a 100755 --- a/shredtree.py +++ b/shredtree.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# shredtree -- generate hash list in SHIF-A format for a given source tree +# shredtree -- generate hash list in SCF-A format for a given source tree import sys, os, os.path, re, md5, getopt, struct @@ -99,7 +99,7 @@ if __name__ == '__main__': elif opt == '-x': debug = True if args: - print "#SHIF-A 1.0" + print "#SCF-A 1.0" print "Generator-Program: shredtree.py 1.0" print "Hash-Method: MD5" print "Normalization: %s" % ",".join(normalization);