.

2 files changed, 22 insertions, 6 deletions

diff --git a/TODO b/TODO
index 950bf7ae..79e42771 100644
--- a/TODO
+++ b/TODO
@@ -163,9 +163,6 @@ See `tasks', the exported task list.
 *** Roland sez: ENOSPC detection flaky in ufs.  Try write of >page, 
     non-page-multiple, when free space allows write size but not 
     round_page (write size).
-*** After using cp-dRuv to update lots of files to a ufs filesystem, sometimes
-    settrans -a says `Device Busy' if you subsequently attempt to shut it down.
-    (is this still true?)
 
 ** ext2fs
 *** Support chflags/st_flags and convert to/from ext2 flags on disk.
@@ -201,10 +198,8 @@ See `tasks', the exported task list.
 
 ** ps:
 *** ps should timeout quickly (one second?) on non-responsive message ports.
-*** --help output is wrong (probably line_wrap_point is not synced 
-    with stream).
 *** help displays for: stat letters, format specs.
-*** Add head/tail options
+*** Add head/tail options; --match?
 
 ** gdb:
 *** Add various mach convenience features (vminfo, &c).
diff --git a/utils/ChangeLog b/utils/ChangeLog
index 0b51a82c..c2222747 100644
--- a/utils/ChangeLog
+++ b/utils/ChangeLog
@@ -1,3 +1,24 @@
+Wed Jul 31 14:23:31 1996  Miles Bader  <miles@gnu.ai.mit.edu>
+
+	* login.c (main/verify_passwd): Use #pragma weak instead of
+	__attribute__ ((weak)).
+	* su.c (check_password): Likewise.
+
+	* login.c (options): Change --inherit-environ to --preserve-environment.
+	Change --no-environ to --no-environment-args.
+	Change --environ to --envvar and --environ-default to --envvar-default.
+	* ps.c (options, main): Change --fmt to --format/-F.
+	Change --posix-fmt/-o to --posix-format/-o.
+	Change --sort to --sort/-s.
+	Change --pgrp to --pgrp/-G.
+	Change --login to --login/-L.
+	Change --threads/-s to --threads/-T.
+	Change --session to --session/-S.
+	(OPT_FMT, OPT_SORT, OPT_PGRP, OPT_LOGIN, OPT_SESS): Macros removed.
+	* w.c (options, main): Change --fmt to --format/-F.
+	Change --sort to --sort/-s.
+	(OPT_FMT, OPT_SORT): Macros removed.
+
 Wed Jul 31 14:24:05 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
 
 	* login.c (main/verify_passwd): Declare crypt weak in a portable