busybox-w32/coreutils, branch waitfor

Merge branch 'busybox' into merge

2026-07-08T13:32:00+00:00

Signed-off-by: Ron Yorston

join: code shrink by making some variables "global"

2026-07-08T12:38:07+00:00

function old new delta readfields 442 437 -5 printfields 462 457 -5 join_main 843 760 -83 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-93) Total: -93 bytes Signed-off-by: Denys Vlasenko

join: new applet

2026-07-08T05:01:03+00:00

function old new delta join_main - 843 +843 printfields - 462 +462 readfields - 442 +442 .rodata 107120 107332 +212 packed_usage 36078 36237 +159 applet_names 2870 2875 +5 applet_main 1652 1656 +4 ------------------------------------------------------------------------------ (add/remove: 4/0 grow/shrink: 4/0 up/down: 2127/0) Total: 2127 bytes text data bss dec hex filename 1080964 555 4992 1086511 10942f busybox_old 1083091 555 4992 1088638 109c7e busybox_unstripped v2: Add a missing return statement which broke the '-t' option. Thanks to Roberto A. Foglietta for pointing this out. Signed-off-by: Morgan Bartlett Signed-off-by: Ron Yorston Signed-off-by: Denys Vlasenko

join: re-add accidentally removed return

2026-07-06T06:52:19+00:00

It broke single-character splitting

join: code shrink (5)

2026-07-05T13:56:57+00:00

Add a freelines() function to free the line data associated with an FDAT struct. This has no effect in the default build but saves 48-64 bytes if FEATURE_CLEAN_UP is enabled. Change the type of the 'first' flag in readfields() to be consistent with that in printfields(). The 'lines' array should be freed for each FDAT struct during clean up, as it was before I broke it. Signed-off-by: Ron Yorston

join: changes

2026-07-05T09:51:07+00:00

Fix combinatorial field_split() now takes in LINE as a parameter, rather than just the fields parameter. Saves 16 bytes. Signed-off-by: Ron Yorston

join: code shrink (4)

2026-07-03T13:54:13+00:00

The user supplies field numbers with the -o, -1 and -2 options. It feels more natural to convert these to 0-based field indices in the code. Saves 32-48 bytes. Signed-off-by: Ron Yorston

join: code shrink (3)

2026-07-03T13:40:27+00:00

When splitting the fields of a line, keep the string allocated for the line and make the 'fields' array point into it rather than allocating a new string for each field. Saves 48 bytes. Signed-off-by: Ron Yorston

join: code shrink (2)

2026-07-03T11:39:20+00:00

Reduce the amount of duplicated code in readfields() by handling a pushed back line inside the main loop, with a flag to indicate the first pass through the loop. Replace some memcpy() calls with structure assignments. Fix a bug in the code to increase the size of the 'lines' array. It set the capacity to either 8 or 0. Saves 112-128 bytes. Signed-off-by: Ron Yorston

join: code shrink

2026-06-30T08:07:06+00:00

Adopt some BusyBox idioms in join_main(). In particular: - The '-a' and '-v' options are mutually exclusive. Enforce this in getopt32() instead of by hand. Also, since they're mutually exclusive we don't need a distinct list for each. - Control some clean-up code with ENABLE_FEATURE_CLEAN_UP. There are also a few cosmetic changes. Saves 204-256 bytes. Signed-off-by: Ron Yorston