[Toybox] [PATCH] Various help fixes.

Rob Landley rob at landley.net
Fri Jan 26 03:01:42 PST 2024


On 1/25/24 13:51, enh wrote:
> ping? (one of these [grep] came up again today...)

I moved my local changes out of the way to apply it, and they MOSTLY made it
back. I only have to manually fix up:

patching file toys/net/netcat.c
Hunk #2 succeeded at 27 with fuzz 1.
patching file toys/other/fallocate.c
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 25 (offset 3 lines).
1 out of 2 hunks FAILED -- saving rejects to file toys/other/fallocate.c.rej
patching file toys/other/watch.c
Hunk #3 succeeded at 15 with fuzz 2.
patching file toys/posix/patch.c
Hunk #1 FAILED at 20.
1 out of 1 hunk FAILED -- saving rejects to file toys/posix/patch.c.rej
patching file toys/posix/wc.c
Hunk #1 FAILED at 4.
1 out of 2 hunks FAILED -- saving rejects to file toys/posix/wc.c.rej

(Honestly, for the ones that don't fail --dry-run git should be able to do that
itself. I can see barfing on "needed fuzz", but just _offset_ it should just DO
already...)

Rob


More information about the Toybox mailing list