static void
print_rcs_hunk (struct change *hunk)
{
lin i, f0, l0, f1, l1;
long int tf0, tl0, tf1, tl1;
/* Determine range of line numbers involved in each file. */
enum changes changes = analyze_hunk (hunk, &f0, &l0, &f1, &l1);
if (!changes)
return;
begin_output ();
translate_range (&files[0], f0, l0, &tf0, &tl0);
if (changes & OLD)
{
/* For deletion, print just the starting line number from file 0
and the number of lines deleted. */
fprintf (outfile, "d%ld %ld\n", tf0, tf0 <= tl0 ? tl0 - tf0 + 1 : 1);
}
if (changes & NEW)
{
/* Take last-line-number from file 0 and # lines from file 1. */
translate_range (&files[1], f1, l1, &tf1, &tl1);
fprintf (outfile, "a%ld %ld\n", tl0, tf1 <= tl1 ? tl1 - tf1 + 1 : 1);
/* Print the inserted lines. */
for (i = f1; i <= l1; i++)
print_1_line ("", &files[1].linbuf[i]);
}
}
static void
print_unidiff_number_range (struct file_data const *file, lin a, lin b)
{
long trans_a, trans_b;
translate_range (file, a, b, &trans_a, &trans_b);
/* We can have B < A in the case of a range of no lines.
In this case, we should print the line number before the range,
which is B. */
if (trans_b <= trans_a)
fprintf (outfile, trans_b < trans_a ? "%ld,0" : "%ld", trans_b);
else
fprintf (outfile, "%ld,%ld", trans_a, trans_b - trans_a + 1);
}
static void
print_unidiff_number_range (struct file_data const *file, lin a, lin b)
{
long int trans_a, trans_b;
translate_range (file, a, b, &trans_a, &trans_b);
/* We can have B < A in the case of a range of no lines.
In this case, we print the line number before the range,
which is B. It would be more logical to print A, but
'patch' expects B in order to detect diffs against empty files. */
if (trans_b <= trans_a)
fprintf (outfile, trans_b < trans_a ? "%ld,0" : "%ld", trans_b);
else
fprintf (outfile, "%ld,%ld", trans_a, trans_b - trans_a + 1);
}
static void
cb_update_to_new_range (SortFlowState *state)
{
GnmValue *range;
range = gnm_expr_entry_parse_as_value
(GNM_EXPR_ENTRY (state->range_entry), state->sheet);
if (range == NULL) {
if (state->sel != NULL) {
value_release (state->sel);
state->sel = NULL;
gtk_list_store_clear (state->model);
state->sort_items = 0;
}
} else
translate_range (range, state);
set_button_sensitivity (state);
}
static void
print_context_number_range (struct file_data const *file, lin a, lin b)
{
long int trans_a, trans_b;
translate_range (file, a, b, &trans_a, &trans_b);
/* We can have B <= A in the case of a range of no lines.
In this case, we should print the line number before the range,
which is B.
POSIX 1003.1-2001 requires two line numbers separated by a comma
even if the line numbers are the same. However, this does not
match existing practice and is surely an error in the
specification. */
if (trans_b <= trans_a)
fprintf (outfile, "%ld", trans_b);
else
fprintf (outfile, "%ld,%ld", trans_a, trans_b);
}
static void
pr_unidiff_hunk (struct change *hunk)
{
int first0, last0, first1, last1, show_from, show_to, i, j, k0, k1;
int trans_a, trans_b;
struct change *next;
FILE *out;
/* Determine range of line numbers involved in each file. */
analyze_hunk (hunk, &first0, &last0, &first1, &last1, &show_from, &show_to, files);
if (!show_from && !show_to)
return;
/* Include a context's width before and after. */
i = - files[0].prefix_lines;
first0 = (std::max) (first0 - context, i);
first1 = (std::max) (first1 - context, i);
last0 = (std::min) (last0 + context, files[0].valid_lines - 1);
last1 = (std::min) (last1 + context, files[1].valid_lines - 1);
out = outfile;
fprintf (out, " <tr class=\"vc_diff_chunk_header\">\n");
fprintf (out, " <td style=\"width:50%%;\">\n");
translate_range (&files[0], first0, last0, &trans_a, &trans_b);
fprintf (out, " <strong>Line %d</strong> \n", trans_a);
fprintf (out, " <span class=\"vc_diff_chunk_extra\"></span>\n");
fprintf (out, " </td>\n");
fprintf (out, " <td style=\"width:50%%;\">\n");
translate_range (&files[1], first1, last1, &trans_a, &trans_b);
fprintf (out, " <strong>Line %d</strong> \n", trans_a);
fprintf (out, " <span class=\"vc_diff_chunk_extra\"></span>\n");
fprintf (out, " </td>\n");
fprintf (out, " </tr>\n");
next = hunk;
i = first0;
j = first1;
while (i <= last0 || j <= last1)
{
/* If the line isn't a difference, output the context from file 0. */
if (!next || i < next->line0)
{
fprintf (out, " <tr>\n");
fprintf (out, " <td class=\"vc_diff_nochange\"> ");
print_1_escapedhtml(&files[0].linbuf[i++]);
fprintf (out, "</td>\n");
fprintf (out, " <td class=\"vc_diff_nochange\"> ");
print_1_escapedhtml(&files[1].linbuf[j++]);
fprintf (out, "</td>\n");
fprintf (out, " </tr>\n");
}
else
{
k0 = next->deleted;
k1 = next->inserted;
if (next->inserted > 0 && next->deleted > 0)
{
while (k0 > 0 || k1 > 0)
{
fprintf (out, " <tr>\n");
if (k0 > 0)
{
fprintf (out, " <td class=\"vc_diff_change\"> ");
print_1_escapedhtml(&files[0].linbuf[i++]);
fprintf (out, "</td>\n");
}
else
{
fprintf (out, " <td class=\"vc_diff_empty\"> </td>");
}
if (k1 > 0)
{
fprintf (out, " <td class=\"vc_diff_change\"> ");
print_1_escapedhtml(&files[1].linbuf[j++]);
fprintf (out, "</td>\n");
}
else
{
fprintf (out, " <td class=\"vc_diff_empty\"> </td>");
}
fprintf (out, " </tr>\n");
if (k0 > 0) k0--;
if (k1 > 0) k1--;
}
}
else if (next->deleted > 0 )
{
while (k0--)
{
fprintf (out, " <tr>\n");
fprintf (out, " <td class=\"vc_diff_remove\"> ");
print_1_escapedhtml(&files[0].linbuf[i++]);
fprintf (out, "</td>\n");
fprintf (out, " <td class=\"vc_diff_empty\"> </td>");
fprintf (out, " </tr>\n");
}
}
else
{
while (k1--)
{
fprintf (out, " <tr>\n");
fprintf (out, " <td class=\"vc_diff_empty\"> </td>");
fprintf (out, " <td class=\"vc_diff_add\"> ");
print_1_escapedhtml(&files[1].linbuf[j++]);
fprintf (out, "</td>\n");
fprintf (out, " </tr>\n");
}
}
/* We're done with this hunk, so on to the next! */
next = next->link;
}
}
}
/**
* @brief Compare two files (as earlier specified).
* @return DIFFCODE as a result of compare.
*/
int DiffUtils::diffutils_compare_files()
{
int bin_flag = 0;
int bin_file = 0; // bitmap for binary files
// Do the actual comparison (generating a change script)
struct change *script = NULL;
bool success = Diff2Files(&script, 0, &bin_flag, false, &bin_file);
if (!success)
{
return DIFFCODE::FILE | DIFFCODE::TEXT | DIFFCODE::CMPERR;
}
UINT code = DIFFCODE::FILE | DIFFCODE::TEXT | DIFFCODE::SAME;
// make sure to start counting diffs at 0
// (usually it is -1 at this point, for unknown)
m_ndiffs = 0;
m_ntrivialdiffs = 0;
if (script)
{
struct change *next = script;
struct change *thisob = 0, *end = 0;
String asLwrCaseExt;
String LowerCaseExt = CA2T(m_inf[0].name);
int PosOfDot = LowerCaseExt.rfind('.');
if (PosOfDot != -1)
{
LowerCaseExt.erase(0, PosOfDot + 1);
CharLower(&*LowerCaseExt.begin());
asLwrCaseExt = LowerCaseExt;
}
while (next)
{
/* Find a set of changes that belong together. */
thisob = next;
end = find_change(next);
/* Disconnect them from the rest of the changes,
making them a hunk, and remember the rest for next iteration. */
next = end->link;
end->link = 0;
#ifdef _DEBUG
debug_script(thisob);
#endif
{
/* Determine range of line numbers involved in each file. */
int first0 = 0, last0 = 0, first1 = 0, last1 = 0, deletes = 0, inserts = 0;
analyze_hunk(thisob, &first0, &last0, &first1, &last1, &deletes, &inserts);
if (deletes || inserts || thisob->trivial)
{
/* Print the lines that the first file has. */
int trans_a0 = 0, trans_b0 = 0, trans_a1 = 0, trans_b1 = 0;
translate_range(&m_inf[0], first0, last0, &trans_a0, &trans_b0);
translate_range(&m_inf[1], first1, last1, &trans_a1, &trans_b1);
//Determine quantity of lines in this block for both sides
int QtyLinesLeft = (trans_b0 - trans_a0);
int QtyLinesRight = (trans_b1 - trans_a1);
if(m_pOptions->m_filterCommentsLines || m_pOptions->m_bIgnoreBlankLines || m_pOptions->m_bIgnoreCase)
{
OP_TYPE op = OP_NONE;
if (!deletes && !inserts)
op = OP_TRIVIAL;
else
op = OP_DIFF;
DIFFOPTIONS options = {0};
options.nIgnoreWhitespace = m_pOptions->m_ignoreWhitespace;
options.bIgnoreBlankLines = m_pOptions->m_bIgnoreBlankLines;
options.bFilterCommentsLines = m_pOptions->m_filterCommentsLines;
options.bIgnoreCase = m_pOptions->m_bIgnoreCase;
options.bIgnoreEol = m_pOptions->m_bIgnoreEOLDifference;
m_pDiffWrapper->SetOptions(&options);
m_pDiffWrapper->PostFilter(thisob->line0, QtyLinesLeft+1, thisob->line1, QtyLinesRight+1, op, *m_FilterCommentsManager, asLwrCaseExt.c_str());
if(op == OP_TRIVIAL)
{
thisob->trivial = 1;
}
}
// Match lines against regular expression filters
// Our strategy is that every line in both sides must
// match regexp before we mark difference as ignored.
if(m_pFilterList && m_pFilterList->HasRegExps())
{
bool match2 = false;
bool match1 = RegExpFilter(thisob->line0, thisob->line0 + QtyLinesLeft, 0);
if (match1)
match2 = RegExpFilter(thisob->line1, thisob->line1 + QtyLinesRight, 1);
if (match1 && match2)
thisob->trivial = 1;
}
}
/* Reconnect the script so it will all be freed properly. */
end->link = next;
}
}
}
// Free change script (which we don't want)
if (script != NULL)
{
struct change *p, *e;
for (e = script; e; e = p)
{
if (!e->trivial)
++m_ndiffs;
else
++m_ntrivialdiffs;
p = e->link;
free(e);
}
if (m_ndiffs > 0)
code = code & ~DIFFCODE::SAME | DIFFCODE::DIFF;
}
// diff_2_files set bin_flag to -1 if different binary
// diff_2_files set bin_flag to +1 if same binary
if (bin_flag != 0)
{
// Clear text-flag, set binary flag
// We don't know diff counts for binary files
code = code & ~DIFFCODE::TEXT;
switch (bin_file)
{
case BINFILE_SIDE1:
code |= DIFFCODE::BINSIDE1;
break;
case BINFILE_SIDE2:
code |= DIFFCODE::BINSIDE2;
break;
case BINFILE_SIDE1 | BINFILE_SIDE2:
code |= DIFFCODE::BIN;
break;
default:
_RPTF1(_CRT_ERROR, "Invalid bin_file value: %d", bin_file);
break;
}
m_ndiffs = CDiffContext::DIFFS_UNKNOWN;
}
if (bin_flag < 0)
{
// Clear same-flag, set diff-flag
code = code & ~DIFFCODE::SAME | DIFFCODE::DIFF;
}
return code;
}