Re: [Toybox] [PATCH] Various help fixes.
hilariously, i now realize my grep fix was still incomplete... follow-on
patch sent.
(when you get round to the "we should generate rather than duplicate the
`usage: ${toy_name}` prefix" issue you sometimes talk about, i plan on
bugging you to see if you can do at least the switches :-) )
On Fri, Jan 26, 2024 at 2:54 AM Rob Landley wrote:
> 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
>
___
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net
Re: [Toybox] [PATCH] Various help fixes.
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 ___ Toybox mailing list Toybox@lists.landley.net http://lists.landley.net/listinfo.cgi/toybox-landley.net
Re: [Toybox] [PATCH] Various help fixes.
ping? (one of these [grep] came up again today...) On Fri, Dec 15, 2023 at 7:06 AM enh wrote: > yeah, i was sure that was going to happen ... i just didn't know *which* > ones would conflict with your local changes. (and thought that sending you > a separate change for each file was probably a worse DoS!) > > On Thu, Dec 14, 2023, 23:03 Rob Landley wrote: > >> On 12/14/23 22:21, enh via Toybox wrote: >> > Ensure that the usage lines include everything mentioned below in >> > the detailed help, and vice versa. >> >> Sigh: >> >> $ git am 0001-Various-help-fixes.patch >> Applying: Various help fixes. >> error: toys/net/httpd.c: does not match index >> error: toys/net/netcat.c: does not match index >> error: toys/other/fallocate.c: does not match index >> error: toys/other/watch.c: does not match index >> error: toys/posix/cp.c: does not match index >> error: toys/posix/fold.c: does not match index >> error: toys/posix/ln.c: does not match index >> error: toys/posix/sort.c: does not match index >> error: toys/posix/wc.c: does not match index >> error: toys/posix/xargs.c: does not match index >> >> I've been fiddling with help text at this end too. Give me a bit to >> coordinate >> this one... >> >> Rob >> > ___ Toybox mailing list Toybox@lists.landley.net http://lists.landley.net/listinfo.cgi/toybox-landley.net
Re: [Toybox] [PATCH] Various help fixes.
yeah, i was sure that was going to happen ... i just didn't know *which* ones would conflict with your local changes. (and thought that sending you a separate change for each file was probably a worse DoS!) On Thu, Dec 14, 2023, 23:03 Rob Landley wrote: > On 12/14/23 22:21, enh via Toybox wrote: > > Ensure that the usage lines include everything mentioned below in > > the detailed help, and vice versa. > > Sigh: > > $ git am 0001-Various-help-fixes.patch > Applying: Various help fixes. > error: toys/net/httpd.c: does not match index > error: toys/net/netcat.c: does not match index > error: toys/other/fallocate.c: does not match index > error: toys/other/watch.c: does not match index > error: toys/posix/cp.c: does not match index > error: toys/posix/fold.c: does not match index > error: toys/posix/ln.c: does not match index > error: toys/posix/sort.c: does not match index > error: toys/posix/wc.c: does not match index > error: toys/posix/xargs.c: does not match index > > I've been fiddling with help text at this end too. Give me a bit to > coordinate > this one... > > Rob > ___ Toybox mailing list Toybox@lists.landley.net http://lists.landley.net/listinfo.cgi/toybox-landley.net
Re: [Toybox] [PATCH] Various help fixes.
On 12/14/23 22:21, enh via Toybox wrote: > Ensure that the usage lines include everything mentioned below in > the detailed help, and vice versa. Sigh: $ git am 0001-Various-help-fixes.patch Applying: Various help fixes. error: toys/net/httpd.c: does not match index error: toys/net/netcat.c: does not match index error: toys/other/fallocate.c: does not match index error: toys/other/watch.c: does not match index error: toys/posix/cp.c: does not match index error: toys/posix/fold.c: does not match index error: toys/posix/ln.c: does not match index error: toys/posix/sort.c: does not match index error: toys/posix/wc.c: does not match index error: toys/posix/xargs.c: does not match index I've been fiddling with help text at this end too. Give me a bit to coordinate this one... Rob ___ Toybox mailing list Toybox@lists.landley.net http://lists.landley.net/listinfo.cgi/toybox-landley.net
