oweals/busybox.git
17 years agoless: a few fixes for cases where we overflow status line
Denis Vlasenko [Thu, 21 Dec 2006 17:03:20 +0000 (17:03 -0000)]
less: a few fixes for cases where we overflow status line

17 years agoless: restore TAB display (was showing as inverse I after prev changes :)
Denis Vlasenko [Thu, 21 Dec 2006 15:23:45 +0000 (15:23 -0000)]
less: restore TAB display (was showing as inverse I after prev changes :)

17 years agoless: "(null)" is a bit strange. "standard input" is better :)
Denis Vlasenko [Thu, 21 Dec 2006 13:57:37 +0000 (13:57 -0000)]
less: "(null)" is a bit strange. "standard input" is better :)

17 years agoless: how many different kinds of status line we need, three?!
Denis Vlasenko [Thu, 21 Dec 2006 13:26:54 +0000 (13:26 -0000)]
less: how many different kinds of status line we need, three?!
small fixes. [prev commit also added control char filtering
on input (e.g. regexp input, filename input for 'E' etc)]

17 years agoless: stop dying on bad regexps, quietly pipe data w/o
Denis Vlasenko [Thu, 21 Dec 2006 13:24:58 +0000 (13:24 -0000)]
less: stop dying on bad regexps, quietly pipe data w/o
user interaction if stdout is not a tty.
size optimizations

17 years agointroduce LONE_CHAR (optimized strcmp with one-char string)
Denis Vlasenko [Thu, 21 Dec 2006 13:23:14 +0000 (13:23 -0000)]
introduce LONE_CHAR (optimized strcmp with one-char string)

17 years agotail: fix tail +N
Denis Vlasenko [Thu, 21 Dec 2006 00:43:06 +0000 (00:43 -0000)]
tail: fix tail +N

17 years agoless: total cleanup and bugfix.
Denis Vlasenko [Thu, 21 Dec 2006 00:22:03 +0000 (00:22 -0000)]
less: total cleanup and bugfix.
Doesn't die horribly on binary files anymore.
In fact, they _100%_ work now. Control chars
are in reverse video, including DEL and that idiocy of VT-10x,
Meta-ESC [inventor of which should be prohibited from reproducing].
Regex search is fixed also. When you specify search ('/' key),
control chars turn into dots (unhighlighted),
and found occurrences highlighted instead. This is reversible.
Memory management fixed (was leaky as hell) and optimized.
Linewrapping fixed and thoroughly tested.
Max buffer size made configurable.
~ 600 bytes saved.

17 years agoless: somewhat buggy applet, but nice. Muchly reduced
Denis Vlasenko [Wed, 20 Dec 2006 02:46:48 +0000 (02:46 -0000)]
less: somewhat buggy applet, but nice. Muchly reduced
xstrdup'ing and memory consumption. Made linewrap saner.
regex matching code was awful - still buggy, but not as
leaky as before. Made buffer size configurable. Killed
several static and on-stack buffers. Hopefully eliminated
staircase effect on Ctrl-C (unable to reproduce).

17 years agoremove casts from xmalloc()
Denis Vlasenko [Tue, 19 Dec 2006 23:36:04 +0000 (23:36 -0000)]
remove casts from xmalloc()

17 years agoifupdown: do not print and/or execute empty commands ("").
Denis Vlasenko [Tue, 19 Dec 2006 23:15:46 +0000 (23:15 -0000)]
ifupdown: do not print and/or execute empty commands ("").

17 years agoifupdown: parse() returning NULL and returning "" is not the same,
Denis Vlasenko [Tue, 19 Dec 2006 23:01:33 +0000 (23:01 -0000)]
ifupdown: parse() returning NULL and returning "" is not the same,
it turned out! wow... okay, fixing my buglet...

17 years agou_short, ulong exterminated
Denis Vlasenko [Tue, 19 Dec 2006 20:32:02 +0000 (20:32 -0000)]
u_short, ulong exterminated
fdiskXXX: add a bit of sanity (not enough by far)

17 years agocmdedit: fix my bug, improve code a bit
Denis Vlasenko [Tue, 19 Dec 2006 19:30:37 +0000 (19:30 -0000)]
cmdedit: fix my bug, improve code a bit

17 years ago- use xlisten/xsocket some more. Saves .25 kB
Bernhard Reutner-Fischer [Tue, 19 Dec 2006 16:31:09 +0000 (16:31 -0000)]
- use xlisten/xsocket some more. Saves .25 kB

17 years ago- rename SU_SYSLOG to FEATURE_SU_SYSLOG
Bernhard Reutner-Fischer [Tue, 19 Dec 2006 08:55:38 +0000 (08:55 -0000)]
- rename SU_SYSLOG to FEATURE_SU_SYSLOG

17 years agocmdedit: use qsort for sorting command completion results; style fixes
Denis Vlasenko [Tue, 19 Dec 2006 01:10:25 +0000 (01:10 -0000)]
cmdedit: use qsort for sorting command completion results; style fixes

17 years agopasswd: add option to check passwords for weakness
Denis Vlasenko [Tue, 19 Dec 2006 00:33:53 +0000 (00:33 -0000)]
passwd: add option to check passwords for weakness

17 years agoAdd option to disable command execution from vi & awk
Denis Vlasenko [Tue, 19 Dec 2006 00:29:22 +0000 (00:29 -0000)]
Add option to disable command execution from vi & awk

17 years agosu: make /etc/shells check configurable
Denis Vlasenko [Tue, 19 Dec 2006 00:20:20 +0000 (00:20 -0000)]
su: make /etc/shells check configurable
ash: missing ';'

17 years agomount: add getmntent_r stub for dietlibc
Denis Vlasenko [Mon, 18 Dec 2006 23:07:42 +0000 (23:07 -0000)]
mount: add getmntent_r stub for dietlibc

17 years agoxfuncs.c: dietlibc actually HAS fdprintf!
Denis Vlasenko [Mon, 18 Dec 2006 22:32:45 +0000 (22:32 -0000)]
xfuncs.c: dietlibc actually HAS fdprintf!
platform.h: define strchrnul for dietlibc
ash: stop using few non-standard functions

17 years agonc: add missing cast
Denis Vlasenko [Mon, 18 Dec 2006 22:10:24 +0000 (22:10 -0000)]
nc: add missing cast
xfuncs: add dprintf for dietlibc

17 years agoA bunch of defined(__GLIBC__) added. static-linking warning expanded
Denis Vlasenko [Mon, 18 Dec 2006 21:49:06 +0000 (21:49 -0000)]
A bunch of defined(__GLIBC__) added. static-linking warning expanded

17 years agodu: dietlibc compat fix, style fixes. Thanks to sampo@symlabs.com.
Denis Vlasenko [Mon, 18 Dec 2006 21:22:16 +0000 (21:22 -0000)]
du: dietlibc compat fix, style fixes. Thanks to sampo@symlabs.com.

17 years agoifupdown: strlen(NULL) is a no-no, fixed. Also few micro-optimizations
Denis Vlasenko [Mon, 18 Dec 2006 21:02:00 +0000 (21:02 -0000)]
ifupdown: strlen(NULL) is a no-no, fixed. Also few micro-optimizations

17 years agops: fix buglet, add microoptimization
Denis Vlasenko [Mon, 18 Dec 2006 14:20:01 +0000 (14:20 -0000)]
ps: fix buglet, add microoptimization

17 years agohttpd: we don't have FEATURE_HTTPD_WITHOUT_INETD anymore,
Denis Vlasenko [Sun, 17 Dec 2006 20:18:05 +0000 (20:18 -0000)]
httpd: we don't have FEATURE_HTTPD_WITHOUT_INETD anymore,
remove it from Config.in

17 years agostart_stop_daemon: make code a bit more readable
Denis Vlasenko [Sun, 17 Dec 2006 19:43:10 +0000 (19:43 -0000)]
start_stop_daemon: make code a bit more readable

17 years agood: remove bug-for-bug compat (because the bug was fixed in coreuitls)
Denis Vlasenko [Sun, 17 Dec 2006 19:21:13 +0000 (19:21 -0000)]
od: remove bug-for-bug compat (because the bug was fixed in coreuitls)

17 years agotar: report error if child dies while writing out the end of tarball
Denis Vlasenko [Sun, 17 Dec 2006 19:08:20 +0000 (19:08 -0000)]
tar: report error if child dies while writing out the end of tarball
(e.g. out of disk space).

17 years agostart_stop_daemon: fix bug where any program name was "matching"
Denis Vlasenko [Sun, 17 Dec 2006 17:30:01 +0000 (17:30 -0000)]
start_stop_daemon: fix bug where any program name was "matching"
processes for which readlink(/proc/N/exe) fails

17 years agofix/shorten some usage strings
Denis Vlasenko [Sun, 17 Dec 2006 17:27:56 +0000 (17:27 -0000)]
fix/shorten some usage strings

17 years agotftp: corrupted input packets were killing retransmits - fixed
Denis Vlasenko [Sun, 17 Dec 2006 01:14:08 +0000 (01:14 -0000)]
tftp: corrupted input packets were killing retransmits - fixed

17 years agodiff: comment - explain what happens when hunk fails to apply
Denis Vlasenko [Sun, 17 Dec 2006 00:49:56 +0000 (00:49 -0000)]
diff: comment - explain what happens when hunk fails to apply

17 years agopatch: fix double-free (bug 1120)
Denis Vlasenko [Sun, 17 Dec 2006 00:33:29 +0000 (00:33 -0000)]
patch: fix double-free (bug 1120)

17 years agoinline strcmp(s, "-") [actually macro-ize it for now - gcc is too stupid]
Denis Vlasenko [Sat, 16 Dec 2006 23:49:13 +0000 (23:49 -0000)]
inline strcmp(s, "-") [actually macro-ize it for now - gcc is too stupid]

17 years agos/extern inline/static ATTRIBUTE_ALWAYS_INLINE/g
Denis Vlasenko [Sat, 16 Dec 2006 23:48:13 +0000 (23:48 -0000)]
s/extern inline/static ATTRIBUTE_ALWAYS_INLINE/g
xstrtou: disallow leading '+'

17 years agowget: smallish optimization
Denis Vlasenko [Sat, 16 Dec 2006 22:19:47 +0000 (22:19 -0000)]
wget: smallish optimization

17 years agodiff: fix -q exit code
Denis Vlasenko [Sat, 16 Dec 2006 22:18:44 +0000 (22:18 -0000)]
diff: fix -q exit code
last_char_is: sacrifice 9 bytes but avoid double-scan

17 years agosite: add link to directory with patches
Denis Vlasenko [Fri, 15 Dec 2006 22:10:07 +0000 (22:10 -0000)]
site: add link to directory with patches

17 years agore-applying first post-1.3.x change
Denis Vlasenko [Fri, 15 Dec 2006 00:59:35 +0000 (00:59 -0000)]
re-applying first post-1.3.x change
version change to 1.4.0.svn

17 years agoback out last change - need to make busybox-1_3-stable branch first
Denis Vlasenko [Fri, 15 Dec 2006 00:02:30 +0000 (00:02 -0000)]
back out last change - need to make busybox-1_3-stable branch first

17 years ago- table support for ip route
Bernhard Reutner-Fischer [Thu, 14 Dec 2006 15:41:29 +0000 (15:41 -0000)]
- table support for ip route

17 years ago- minor shrinkage
Bernhard Reutner-Fischer [Thu, 14 Dec 2006 11:27:58 +0000 (11:27 -0000)]
- minor shrinkage

17 years agoUpdate busybox.net webpage with 1.3.0 announcement
Denis Vlasenko [Thu, 14 Dec 2006 00:22:51 +0000 (00:22 -0000)]
Update busybox.net webpage with 1.3.0 announcement

17 years agoexterminate last bzero's
Denis Vlasenko [Wed, 13 Dec 2006 23:52:32 +0000 (23:52 -0000)]
exterminate last bzero's
version bump to 1.3.0

17 years ago- honor CONFIG_DEBUG
Bernhard Reutner-Fischer [Wed, 13 Dec 2006 17:44:24 +0000 (17:44 -0000)]
- honor CONFIG_DEBUG

17 years ago- remove warning about unused depth parameter in add_to_dirlist()
Bernhard Reutner-Fischer [Wed, 13 Dec 2006 16:50:15 +0000 (16:50 -0000)]
- remove warning about unused depth parameter in add_to_dirlist()
- make one variable static and add comment about why the other variables there are not static.

17 years agodate: -R shouldn't use locale
Denis Vlasenko [Wed, 13 Dec 2006 00:35:21 +0000 (00:35 -0000)]
date: -R shouldn't use locale

17 years agobuild system: small fix for "release" target to work
Denis Vlasenko [Tue, 12 Dec 2006 23:46:31 +0000 (23:46 -0000)]
build system: small fix for "release" target to work

17 years agobuild system: add "release" target
Denis Vlasenko [Tue, 12 Dec 2006 22:31:15 +0000 (22:31 -0000)]
build system: add "release" target
find: support -size N (needed for above)

17 years agopasswd: fix indentation
Denis Vlasenko [Tue, 12 Dec 2006 18:11:58 +0000 (18:11 -0000)]
passwd: fix indentation

17 years agopasswd: added comment
Denis Vlasenko [Tue, 12 Dec 2006 17:14:56 +0000 (17:14 -0000)]
passwd: added comment

17 years agopasswd: shrink by ~10 bytes, use PRNG instead of usleep.
Denis Vlasenko [Tue, 12 Dec 2006 14:38:03 +0000 (14:38 -0000)]
passwd: shrink by ~10 bytes, use PRNG instead of usleep.

17 years ago- remove functions marked as LEGACY in SUSv3 and use their modern counterparts.
Bernhard Reutner-Fischer [Tue, 12 Dec 2006 11:50:44 +0000 (11:50 -0000)]
- remove functions marked as LEGACY in SUSv3 and use their modern counterparts.

17 years ago- add an anchor to let me point people to FAQ.html#standalone_shell
Bernhard Reutner-Fischer [Sun, 10 Dec 2006 13:40:16 +0000 (13:40 -0000)]
- add an anchor to let me point people to FAQ.html#standalone_shell
  easily.

17 years agobb_makedev: fix for glibc 2.3.2
Denis Vlasenko [Sun, 10 Dec 2006 02:52:19 +0000 (02:52 -0000)]
bb_makedev: fix for glibc 2.3.2
sed: fix C++ style declaration

17 years agosed: style fixes
Denis Vlasenko [Sun, 10 Dec 2006 02:09:12 +0000 (02:09 -0000)]
sed: style fixes

17 years agomore: fix for case when _FILE_OFFSET_BITS is not #defined.
Denis Vlasenko [Sun, 10 Dec 2006 01:57:29 +0000 (01:57 -0000)]
more: fix for case when _FILE_OFFSET_BITS is not #defined.
samll size improvement.

17 years ago- Proposed fix to make aliases work (with uClibc-current).
Bernhard Reutner-Fischer [Thu, 7 Dec 2006 12:25:17 +0000 (12:25 -0000)]
- Proposed fix to make aliases work (with uClibc-current).
  See comment in the patch about the change introduced in r16342.

17 years ago- Improve wording in error message.
Bernhard Reutner-Fischer [Thu, 7 Dec 2006 12:18:36 +0000 (12:18 -0000)]
- Improve wording in error message.

17 years ago- s/:\t\t/\t/ for two helptexts.
Bernhard Reutner-Fischer [Thu, 7 Dec 2006 12:16:17 +0000 (12:16 -0000)]
- s/:\t\t/\t/ for two helptexts.

17 years ago- remove a warning that was not ment to be checked in.
Bernhard Reutner-Fischer [Wed, 6 Dec 2006 23:14:31 +0000 (23:14 -0000)]
- remove a warning that was not ment to be checked in.

17 years ago- better distinction between CFLAGS and CPPFLAGS.
Bernhard Reutner-Fischer [Wed, 6 Dec 2006 21:51:59 +0000 (21:51 -0000)]
- better distinction between CFLAGS and CPPFLAGS.

17 years ago- adjust to kernel's build infrastructure.
Bernhard Reutner-Fischer [Wed, 6 Dec 2006 15:29:00 +0000 (15:29 -0000)]
- adjust to kernel's build infrastructure.

17 years ago- shrink less.
Bernhard Reutner-Fischer [Mon, 4 Dec 2006 16:04:50 +0000 (16:04 -0000)]
- shrink less.
01a: svn version
01b: merge past_eof and inp_stdin into flags.
01c: merge match_backwards into flags.
01d: add handling of <HOME> and <END> keys, remove set_tty_raw, use fflush_stdout_and_exit
01e: rewrite special-key handling to be smaller.
01f: changing the format saves 4 bytes (alot of places would benefit from this)
   text    data     bss     dec     hex filename
   9034       8     648    9690    25da less.o.01a
   9023       8     640    9671    25c7 less.o.01b
   9027       8     636    9671    25c7 less.o.01c
   9068       8     636    9712    25f0 less.o.01d
   8990       8     636    9634    25a2 less.o.01e
   8986       8     636    9630    259e less.o.01f

17 years ago- cosmetic change to avoid warnings about eventual padding/packing.
Bernhard Reutner-Fischer [Mon, 4 Dec 2006 15:58:27 +0000 (15:58 -0000)]
- cosmetic change to avoid warnings about eventual padding/packing.

17 years ago- make sure we pickup the correct defines. Guards against 2.6.19 kernel-headers.
Bernhard Reutner-Fischer [Mon, 4 Dec 2006 15:57:17 +0000 (15:57 -0000)]
- make sure we pickup the correct defines. Guards against 2.6.19 kernel-headers.

17 years ago- commentary typo
Bernhard Reutner-Fischer [Sat, 2 Dec 2006 20:47:36 +0000 (20:47 -0000)]
- commentary typo

17 years agosed: fix handling of files not ending in '\n'
Denis Vlasenko [Sat, 2 Dec 2006 20:12:12 +0000 (20:12 -0000)]
sed: fix handling of files not ending in '\n'

17 years agosed: improve handling of NULs
Denis Vlasenko [Sat, 2 Dec 2006 17:58:10 +0000 (17:58 -0000)]
sed: improve handling of NULs

17 years agopasswd: made smaller by ~130 bytes. size can go negative
Denis Vlasenko [Fri, 1 Dec 2006 21:34:20 +0000 (21:34 -0000)]
passwd: made smaller by ~130 bytes. size can go negative
if current trend will continue ;)

17 years ago- provide central knob to turn off RPC related options.
Bernhard Reutner-Fischer [Fri, 1 Dec 2006 16:56:12 +0000 (16:56 -0000)]
- provide central knob to turn off RPC related options.

17 years agopasswd: micro-optimization
Denis Vlasenko [Thu, 30 Nov 2006 23:13:59 +0000 (23:13 -0000)]
passwd: micro-optimization

17 years ago"kernel config" -> "busybox config"
Denis Vlasenko [Thu, 30 Nov 2006 22:40:32 +0000 (22:40 -0000)]
"kernel config" -> "busybox config"
suggested by Roberto A. Foglietta <roberto.foglietta@gmail.com>

17 years ago"make bigdata" biggest offender dealt with:
Denis Vlasenko [Thu, 30 Nov 2006 21:11:01 +0000 (21:11 -0000)]
"make bigdata" biggest offender dealt with:
xmalloc 16Kb buffer instead of keeping it in bss

17 years agoed: convert style to bbox's. No code changes.
Denis Vlasenko [Thu, 30 Nov 2006 20:57:50 +0000 (20:57 -0000)]
ed: convert style to bbox's. No code changes.

17 years agopasswd: small size optimization. salt generation improved
Denis Vlasenko [Thu, 30 Nov 2006 20:41:28 +0000 (20:41 -0000)]
passwd: small size optimization. salt generation improved
(really generated different salts even if called back-to-back).

17 years agopasswd: rework:
Denis Vlasenko [Thu, 30 Nov 2006 16:41:15 +0000 (16:41 -0000)]
passwd: rework:
* do not make backup copy by copying (just retain old file)
* correctly fall back to /etc/passwd if user is not in shadow
* fix bug with overlong passwd entries
* be permissive on some kinds of failures
* reduce stack usage
* code size: -500 bytes

17 years ago- save 4 bytes
Bernhard Reutner-Fischer [Thu, 30 Nov 2006 14:53:51 +0000 (14:53 -0000)]
- save 4 bytes
   text    data     bss     dec     hex filename
    764       0      80     844     34c vlock.o.oorig
    760       0      80     840     348 vlock.o

17 years agoWell, I am not 100.00% usre that uint16 will suffice there.
Denis Vlasenko [Wed, 29 Nov 2006 23:15:04 +0000 (23:15 -0000)]
Well, I am not 100.00% usre that uint16 will suffice there.
We don't lose anything by using 'unsigned' instead.

17 years agoanother -90 bytes. That #define is **evil**
Denis Vlasenko [Wed, 29 Nov 2006 22:47:42 +0000 (22:47 -0000)]
another -90 bytes. That #define is **evil**

17 years agomkfs.minix: more cleanups, -~300 bytes of code.
Denis Vlasenko [Wed, 29 Nov 2006 22:33:47 +0000 (22:33 -0000)]
mkfs.minix: more cleanups, -~300 bytes of code.
Added debugging support.

17 years agocut 0.5k off mkfs.minix
Denis Vlasenko [Wed, 29 Nov 2006 18:15:52 +0000 (18:15 -0000)]
cut 0.5k off mkfs.minix
assorted strtoul fixes (that's what brought me into minix)...

17 years agohttpd: fix decode of '/' when called via -d
Denis Vlasenko [Wed, 29 Nov 2006 15:58:50 +0000 (15:58 -0000)]
httpd: fix decode of '/' when called via -d

17 years agood: fix buglet in --traditional, microoptimization,
Denis Vlasenko [Wed, 29 Nov 2006 14:32:01 +0000 (14:32 -0000)]
od: fix buglet in --traditional, microoptimization,
    document coreutils bug
bloat-o-meter: account for objects in rodata too

17 years agogetopt32-ification of fdisk
Denis Vlasenko [Wed, 29 Nov 2006 12:00:28 +0000 (12:00 -0000)]
getopt32-ification of fdisk

17 years agofix support for globally disabling --long-options.
Denis Vlasenko [Wed, 29 Nov 2006 11:09:43 +0000 (11:09 -0000)]
fix support for globally disabling --long-options.
(disabling them saves ~4K on fully configured bbox)

17 years agood: sometime ago I landed BIG od implementation
Denis Vlasenko [Tue, 28 Nov 2006 23:37:46 +0000 (23:37 -0000)]
od: sometime ago I landed BIG od implementation
from coreutils. My fault. This commit contains
cleanups and size reductions.

17 years agofix bug in new str -> num convertors
Denis Vlasenko [Tue, 28 Nov 2006 10:54:16 +0000 (10:54 -0000)]
fix bug in new str -> num convertors

18 years agousage: fix few help texts, fix breakage: '\<tab>'
Denis Vlasenko [Tue, 28 Nov 2006 00:46:49 +0000 (00:46 -0000)]
usage: fix few help texts, fix breakage: '\<tab>'
sequence utterly confused cpp :)

18 years agoudhcpc: fix my breakage
Denis Vlasenko [Tue, 28 Nov 2006 00:21:46 +0000 (00:21 -0000)]
udhcpc: fix my breakage

18 years agofix udhcpc help message, take steps to make usage.h less messy
Denis Vlasenko [Tue, 28 Nov 2006 00:06:39 +0000 (00:06 -0000)]
fix udhcpc help message, take steps to make usage.h less messy

18 years agodo not overflow ifr_name. maybe it was safe in some places,
Denis Vlasenko [Mon, 27 Nov 2006 23:44:57 +0000 (23:44 -0000)]
do not overflow ifr_name. maybe it was safe in some places,
but not everywhere. err to the safe side.

18 years agoudhcpc: convert to getopt32
Denis Vlasenko [Mon, 27 Nov 2006 23:43:28 +0000 (23:43 -0000)]
udhcpc: convert to getopt32

18 years agotar: fix misplaced --exclude long option definition
Denis Vlasenko [Mon, 27 Nov 2006 20:24:40 +0000 (20:24 -0000)]
tar: fix misplaced --exclude long option definition

18 years agoClosing bug 1040:
Denis Vlasenko [Mon, 27 Nov 2006 19:50:16 +0000 (19:50 -0000)]
Closing bug 1040:
The "quiet" option is quietly (hah) ignored. It should be passed through
to the mount() syscall in the comma separated list of options.
I found the problem with the vfat/msdos filesystems, which uses
a quiet option to override some complaints and errors.

18 years agoerase_mtab: do not limit ourself to 40 mtab entries
Denis Vlasenko [Mon, 27 Nov 2006 17:29:09 +0000 (17:29 -0000)]
erase_mtab: do not limit ourself to 40 mtab entries

18 years agofix remaining survivors of the return(a) cleanup
Denis Vlasenko [Mon, 27 Nov 2006 16:59:15 +0000 (16:59 -0000)]
fix remaining survivors of the return(a) cleanup