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).
175 lines
4.8 KiB
C
175 lines
4.8 KiB
C
/* Output routines for ed-script format.
|
|
|
|
Copyright (C) 1988-1989, 1991-1993, 1995, 1998, 2001, 2004, 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_ed_hunk (struct change *);
|
|
static void print_rcs_hunk (struct change *);
|
|
static void pr_forward_ed_hunk (struct change *);
|
|
|
|
/* Print our script as ed commands. */
|
|
|
|
void
|
|
print_ed_script (struct change *script)
|
|
{
|
|
/* The script is reversed, so plain find_change suffices. */
|
|
print_script (script, find_change, print_ed_hunk);
|
|
}
|
|
|
|
/* Print a hunk of an ed diff */
|
|
|
|
static void
|
|
print_ed_hunk (struct change *hunk)
|
|
{
|
|
#ifdef DEBUG
|
|
debug_script (hunk);
|
|
#endif
|
|
|
|
/* Determine range of line numbers involved in each file. */
|
|
lin f0, l0, f1, l1;
|
|
enum changes changes = analyze_hunk (hunk, &f0, &l0, &f1, &l1);
|
|
if (!changes)
|
|
return;
|
|
|
|
begin_output ();
|
|
|
|
/* Print out the line number header for this hunk */
|
|
print_number_range (',', &curr.file[0], f0, l0);
|
|
fputc (change_letter[changes], outfile);
|
|
fputc ('\n', outfile);
|
|
|
|
/* Print new/changed lines from second file, if needed */
|
|
if (changes != OLD)
|
|
{
|
|
bool insert_mode = true;
|
|
|
|
for (lin i = f1; i <= l1; i++)
|
|
{
|
|
if (!insert_mode)
|
|
{
|
|
fputs ("a\n", outfile);
|
|
insert_mode = true;
|
|
}
|
|
if (curr.file[1].linbuf[i][0] == '.'
|
|
&& curr.file[1].linbuf[i][1] == '\n')
|
|
{
|
|
/* The file's line is just a dot, and it would exit
|
|
insert mode. Precede the dot with another dot, exit
|
|
insert mode and remove the extra dot. */
|
|
fputs ("..\n.\ns/.//\n", outfile);
|
|
insert_mode = false;
|
|
}
|
|
else
|
|
print_1_line ("", &curr.file[1].linbuf[i]);
|
|
}
|
|
|
|
if (insert_mode)
|
|
fputs (".\n", outfile);
|
|
}
|
|
}
|
|
|
|
/* Print change script in the style of ed commands,
|
|
but print the changes in the order they appear in the input files,
|
|
which means that the commands are not truly useful with ed.
|
|
Because of the issue with lines containing just a dot, the output
|
|
is not even parseable. */
|
|
|
|
void
|
|
pr_forward_ed_script (struct change *script)
|
|
{
|
|
print_script (script, find_change, pr_forward_ed_hunk);
|
|
}
|
|
|
|
static void
|
|
pr_forward_ed_hunk (struct change *hunk)
|
|
{
|
|
/* Determine range of line numbers involved in each file. */
|
|
lin f0, l0, f1, l1;
|
|
enum changes changes = analyze_hunk (hunk, &f0, &l0, &f1, &l1);
|
|
if (!changes)
|
|
return;
|
|
|
|
begin_output ();
|
|
|
|
fputc (change_letter[changes], outfile);
|
|
print_number_range (' ', &curr.file[0], f0, l0);
|
|
fputc ('\n', outfile);
|
|
|
|
/* If deletion only, print just the number range. */
|
|
|
|
if (changes == OLD)
|
|
return;
|
|
|
|
/* For insertion (with or without deletion), print the number range
|
|
and the lines from file 2. */
|
|
|
|
for (lin i = f1; i <= l1; i++)
|
|
print_1_line ("", &curr.file[1].linbuf[i]);
|
|
|
|
fputs (".\n", outfile);
|
|
}
|
|
|
|
/* Print in a format somewhat like ed commands
|
|
except that each insert command states the number of lines it inserts.
|
|
This format is used for RCS. */
|
|
|
|
void
|
|
print_rcs_script (struct change *script)
|
|
{
|
|
print_script (script, find_change, print_rcs_hunk);
|
|
}
|
|
|
|
/* Print a hunk of an RCS diff */
|
|
|
|
static void
|
|
print_rcs_hunk (struct change *hunk)
|
|
{
|
|
/* Determine range of line numbers involved in each file. */
|
|
lin f0, l0, f1, l1;
|
|
enum changes changes = analyze_hunk (hunk, &f0, &l0, &f1, &l1);
|
|
if (!changes)
|
|
return;
|
|
|
|
begin_output ();
|
|
|
|
lin tf0, tl0, tf1, tl1;
|
|
translate_range (&curr.file[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%"pI"d %"pI"d\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 (&curr.file[1], f1, l1, &tf1, &tl1);
|
|
fprintf (outfile, "a%"pI"d %"pI"d\n", tl0,
|
|
tf1 <= tl1 ? tl1 - tf1 + 1 : 1);
|
|
|
|
/* Print the inserted lines. */
|
|
for (lin i = f1; i <= l1; i++)
|
|
print_1_line ("", &curr.file[1].linbuf[i]);
|
|
}
|
|
}
|