sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-22 17:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor code refactoring

Browse Source
This commit is contained in:
Bernardo Damele 2010-06-30 11:22:25 +00:00
parent abc3c24d62
commit 8625763c07
1 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/core/common.py
View File

@ -1267,7 +1267,7 @@ def goGoodSamaritan(prevValue, originalCharset):
# outputs defined # outputs defined
if kb.partRun in kb.commonOutputs: if kb.partRun in kb.commonOutputs:
commonPartOutputs = kb.commonOutputs[kb.partRun] commonPartOutputs = kb.commonOutputs[kb.partRun]
commonPattern = common_finder_only(prevValue, commonPartOutputs) commonPattern = commonFinderOnly(prevValue, commonPartOutputs)
# If the longest common prefix is the same as previous value then # If the longest common prefix is the same as previous value then
# do not consider it # do not consider it
@ -1351,33 +1351,6 @@ def getPartRun():
# Return the INI tag to consider for common outputs (e.g. 'Databases') # Return the INI tag to consider for common outputs (e.g. 'Databases')
return commonPartsDict[retVal][1] if retVal in commonPartsDict else retVal return commonPartsDict[retVal][1] if retVal in commonPartsDict else retVal
def getCommonStart(strings=[]):
"""
Returns common start of given strings
"""
if not strings or not isinstance(strings, list):
return None
if len(strings) == 1:
return strings[0]
retVal = unicode()
maxCount = min(len(string) for string in strings)
count = 0
while count < maxCount:
char = strings[0][count]
for i in xrange(1, len(strings)):
if char != strings[i][count]:
char = None
break
if char is None:
break
retVal += char
count += 1
return retVal
def getUnicode(value): def getUnicode(value):
if isinstance(value, basestring): if isinstance(value, basestring):
return value if isinstance(value, unicode) else unicode(value, conf.dataEncoding if 'dataEncoding' in conf else "utf-8") return value if isinstance(value, unicode) else unicode(value, conf.dataEncoding if 'dataEncoding' in conf else "utf-8")
@ -1417,7 +1390,7 @@ class UnicodeRawConfigParser(RawConfigParser):
fp.write("\n") fp.write("\n")
# http://boredzo.org/blog/archives/2007-01-06/longest-common-prefix-in-python-2 # http://boredzo.org/blog/archives/2007-01-06/longest-common-prefix-in-python-2
def longest_common_prefix(*sequences): def longestCommonPrefix(*sequences):
if len(sequences) == 1: if len(sequences) == 1:
return sequences[0] return sequences[0]
@ -1435,5 +1408,5 @@ def longest_common_prefix(*sequences):
return sequences[0] return sequences[0]
def common_finder_only(initial, sequence): def commonFinderOnly(initial, sequence):
return longest_common_prefix(*filter(lambda x: x.startswith(initial), sequence)) return longestCommonPrefix(*filter(lambda x: x.startswith(initial), sequence))