vasilito
068a1ca63e
Bootloader fork rebase:
- Base changed from 0.1.0 pre-patched archive to upstream 1.0.0 tag (c7eeb9f)
- Applied 0001-redbear-local-forks.patch (Cargo.toml crate path redirects)
- Applied fix-uefi-alloc-panic.patch equivalents (4 panic!() -> graceful
error handling in src/main.rs)
- Applied P5-live-preload-cap-1gib.patch (1 GiB cap on live image preload)
- Skipped: P0 GPT partition scan (requires new module + integration),
P1 timeout/default-resolution, P2 live preload guard (subsumed by
panic fixes + cap), P3 live image safe read, P4 large ISO boot,
redox.patch — to be applied in dedicated rebase session.
firmware-loader/Cargo.toml: version 0.1.0 -> 0.3.0 (sync with other
Red Bear custom crates which are at 0.3.0).
fork-upstream-map.toml: bootloader back from PENDING_REBASE to 1.0.0
since the partial rebase matches upstream 1.0.0 content.
fork-upstream-map.toml: base restored to 'main' tracked (was correctly
tracked by build-redbear.sh).
86 lines
2.6 KiB
C
86 lines
2.6 KiB
C
/* Normal-format output routines for GNU DIFF.
|
|
|
|
Copyright (C) 1988-1989, 1993, 1995, 1998, 2001, 2006, 2009-2013, 2015-2025
|
|
Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU DIFF.
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "diff.h"
|
|
|
|
static void print_normal_hunk (struct change *);
|
|
|
|
/* Print the edit-script SCRIPT as a normal diff.
|
|
INF points to an array of descriptions of the two files. */
|
|
|
|
void
|
|
print_normal_script (struct change *script)
|
|
{
|
|
print_script (script, find_change, print_normal_hunk);
|
|
}
|
|
|
|
/* Print a hunk of a normal diff.
|
|
This is a contiguous portion of a complete edit script,
|
|
describing changes in consecutive lines. */
|
|
|
|
static void
|
|
print_normal_hunk (struct change *hunk)
|
|
{
|
|
/* Determine range of line numbers involved in each file. */
|
|
lin first0, last0, first1, last1;
|
|
enum changes changes = analyze_hunk (hunk, &first0, &last0, &first1, &last1);
|
|
if (!changes)
|
|
return;
|
|
|
|
begin_output ();
|
|
|
|
/* Print out the line number header for this hunk */
|
|
set_color_context (LINE_NUMBER_CONTEXT);
|
|
print_number_range (',', &curr.file[0], first0, last0);
|
|
fputc (change_letter[changes], outfile);
|
|
print_number_range (',', &curr.file[1], first1, last1);
|
|
set_color_context (RESET_CONTEXT);
|
|
fputc ('\n', outfile);
|
|
|
|
/* Print the lines that the first file has. */
|
|
if (changes & OLD)
|
|
{
|
|
for (lin i = first0; i <= last0; i++)
|
|
{
|
|
set_color_context (DELETE_CONTEXT);
|
|
print_1_line_nl ("<", &curr.file[0].linbuf[i], true);
|
|
set_color_context (RESET_CONTEXT);
|
|
if (curr.file[0].linbuf[i + 1][-1] == '\n')
|
|
putc ('\n', outfile);
|
|
}
|
|
}
|
|
|
|
if (changes == CHANGED)
|
|
fputs ("---\n", outfile);
|
|
|
|
/* Print the lines that the second file has. */
|
|
if (changes & NEW)
|
|
{
|
|
for (lin i = first1; i <= last1; i++)
|
|
{
|
|
set_color_context (ADD_CONTEXT);
|
|
print_1_line_nl (">", &curr.file[1].linbuf[i], true);
|
|
set_color_context (RESET_CONTEXT);
|
|
if (curr.file[1].linbuf[i + 1][-1] == '\n')
|
|
putc ('\n', outfile);
|
|
}
|
|
}
|
|
}
|