more fixes

stamparm · stamparm · commit 8a8dc73980f8 · 2010-01-27T14:27:11.000Z
diff --git a/extra/cloak/__init__.py b/extra/cloak/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """
-$Id: $
+$Id$
 
 This file is part of the sqlmap project, http://sqlmap.sourceforge.net.
 
diff --git a/extra/cloak/cloak.py b/extra/cloak/cloak.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """
-cloak.py - Simple file encryption and/or compression utility
+cloak.py - Simple file encryption/compression utility
 Copyright (C) 2010  Miroslav Stampar, Bernardo Damele A. G.
 email(s): miroslav.stampar@gmail.com, bernardo.damele@gmail.com
 
@@ -20,9 +20,9 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 """
 
+import bz2
 import os
 import sys
-import bz2
 
 from optparse import OptionError
 from optparse import OptionParser
@@ -38,25 +38,17 @@ def hideAscii(data):
     return retVal
 
 def cloak(inputFile):
-    retVal = ""
-    
     f = open(inputFile, 'rb')
-    original = f.read()
+    data = bz2.compress(f.read())
     f.close()
     
-    data = bz2.compress(original)
-    
     return hideAscii(data)
         
 def decloak(inputFile):
-    retVal = ""
-    
     f = open(inputFile, 'rb')
-    original = f.read()
+    data = bz2.decompress(hideAscii(f.read()))
     f.close()
     
-    data = bz2.decompress(hideAscii(original))
-    
     return data
 
 def main():
@@ -76,9 +68,7 @@ def main():
     except (OptionError, TypeError), e:
         parser.error(e)
     
-    if args.inputFile == '*':
-        pass
-    elif not os.path.isfile(args.inputFile):
+    if not os.path.isfile(args.inputFile):
         print 'ERROR: the provided input file \'%s\' is not a regular file' % args.inputFile
         sys.exit(1)
     

-Original file line number
+Diff line change
@@ @@ -1,7 +1,7 @@ @@
 #!/usr/bin/env python
 """
 -$Id: $
 +$Id$
 This file is part of the sqlmap project, http://sqlmap.sourceforge.net.