# HG changeset patch # User Matti Hamalainen # Date 1672389352 -7200 # Node ID 81f45b2fa118e000f784366f095d470934b22dd7 # Parent 70b589a2249551c0e924e170b9c6051bf14eeea1 Revert back to -m/-n. diff -r 70b589a22495 -r 81f45b2fa118 tools/fanalyze.c --- a/tools/fanalyze.c Fri Dec 30 10:24:20 2022 +0200 +++ b/tools/fanalyze.c Fri Dec 30 10:35:52 2022 +0200 @@ -143,7 +143,7 @@ FA_ANALYZE, FA_GREP, FA_OFFSET, - FA_DIFF, + FA_MATCH, }; @@ -172,8 +172,8 @@ { 10, 'g', "grep" , "Binary grep [,...][:[8|16|32]]", OPT_ARGREQ }, { 12, 'o', "offset" , "Show data in offset [,...][:[8|16|32][d|x]]", OPT_ARGREQ }, - { 14, 'd', "diff" , "Side-by-side sliding binary diff", OPT_NONE }, - { 16, 'm', "minmatch" , "Minimum match sequence length", OPT_ARGREQ }, + { 14, 'm', "match" , "Find matching sequences minimum of bytes long", OPT_NONE }, + { 16, 'n', "minmatch" , "Minimum match sequence length", OPT_ARGREQ }, { 18, 'O', "offset-mode" , "Output -o offset list when in grep mode (-g)", OPT_NONE }, }; @@ -514,7 +514,7 @@ return argParseGrepValue(optArg, FA_OFFSET) == DMERR_OK; case 14: - setMode = FA_DIFF; + setMode = FA_MATCH; break; case 16: @@ -980,7 +980,7 @@ } else - if (setMode == FA_DIFF) + if (setMode == FA_MATCH) { // // Attempt to find matching sequences of N+ @@ -1050,6 +1050,7 @@ if (slow) dmPrint(0, "\n\n"); + // Sort the matches by file offset for (int nmatch = 0; nmatch < ndmSequences; nmatch++) { DMMatchSeq *seq = &dmSequences[nmatch]; @@ -1058,9 +1059,7 @@ dmCompareMatchPlaces); } - // // Count number of files - // for (int nmatch = 0; nmatch < ndmSequences; nmatch++) { DMMatchSeq *seq = &dmSequences[nmatch];