1 2006-03-12 Jim Meyering <jim@meyering.net>
5 * src/copy.c (set_author): Rename function, from preserve_author.
7 * src/remove.c (AD_pop_and_chdir): Use new macro,
8 CYCLE_CHECK_REFLECT_CHDIR_UP, rather than open-coding it.
10 * src/system.h (SAME_INODE): Remove definition.
11 Include "same-inode.h", instead.
13 2006-03-11 Eric Blake <ebb9@byu.net>
15 * src/pwd.c (robust_getcwd): Prepend only one slash, not two.
17 2006-03-10 Jim Meyering <jim@meyering.net>
19 Fix a bug whereby a user with write access to a directory being removed
20 could cause the removal of that directory to fail with an erroneous
21 diagnostic about a directory cycle. Reported by Vineet Chadha.
24 * src/remove.c (AD_pop_and_chdir): If the directory we're about to
25 leave (and try to rmdir) is the one whose dev_ino is being used to
26 detect a cycle, reset cycle_check_state.dev_ino to that of the parent.
28 2006-03-08 Paul Eggert <eggert@cs.ucla.edu>
30 * NEWS: Document dd's new 'directory' and 'nolinks' flags.
31 * src/dd.c (set_fd_flags): Handle file-creation flags on file
32 descriptors, rather than ignoring them.
33 * tests/dd/misc: Add test cases for append, nofollow, directory,
34 and nolinks flags. Simplify redirection to /dev/null in some cases.
36 * tests/dd/misc: iflags->iflag. This fixes a typo that meant the
37 noatime test never tested anything.
39 2006-03-05 Paul Eggert <eggert@cs.ucla.edu>
41 * src/dd.c (flags, usage): New flags directory, nolinks.
42 * src/system.h (O_NOLINKS): Define to 0 if not already defined.
44 * src/ls.c (usage): Mention that -f disables --color.
45 Problem reported by Niels Möller.
47 2006-03-03 Justin Pryzby <pryzbyj@justinpryzby.com>
49 * man/*.x: Add references to syscalls from utilities of the same name.
51 2006-03-05 Jim Meyering <jim@meyering.net>
53 * tests/help-version: Set SHELL, if not already set, in order to
54 avoid failure when `make check' is run through debuild; dircolors
55 would fail due to lack of $SHELL. Reported by Sven Joachim.
57 Make `base64 --wrap=N' work for N=0, and for N larger than SIZE_MAX.
58 * src/base64.c (wrap_write, do_encode, main): Change type of
59 parameters and locals, wrap_column, form size_t to uintmax_t.
60 (main): Adjust to use xstrtoumax, accordingly.
62 2006-03-03 Jim Meyering <jim@meyering.net>
64 Don't fail when run from an environment with SHELL not a Bourne
65 shell, e.g. `env SHELL=/bin/csh make check' would fail this test.
66 * tests/dircolors/simple: Invoke each non-failing test with -b.
67 Reported by Michael Stone.
69 2006-02-27 Jim Meyering <jim@meyering.net>
71 * tests/misc/base64: Derive --decode-using tests from the
74 * tests/misc/base64: Factor out a long constant string.
75 Split lines to stay within 80 columns.
77 * tests/misc/Makefile.am (TESTS): Add base64.
78 * tests/misc/base64: Test base64. From Simon Josefsson.
80 * src/base64.c (do_decode): Use correct type for parameter,
81 ignore_garbage: s/size_t/bool/.
83 * src/base64.c: Don't include .h files already included by system.h:
84 <string.h>, <stdlib.h>, <stdbool.h>, <limits.h>, <errno.h>.
85 Include "system.h" before the other lib/*.h header files.
86 Include <sys/types.h> before "system.h".
87 (wrap_write): Remove declaration of unused local, initial_column.
88 (wrap_write): Correct declaration syntax: s/size_t * V/size_t *V/.
90 * README: Add base64 to the list.
92 2006-02-17 Simon Josefsson <jas@extundo.com>
95 * AUTHORS: Mention base64.
97 * man/Makefile.am: Build base64.1.
98 * man/base64.x: New file.
99 * src/Makefile.am (bin_PROGRAMS): Add base64.
100 * src/base64.c: New file.
102 2006-02-25 Eric Blake <ebb9@byu.net>
104 In ls, avoid calling stat for --inode (-i), when possible.
105 * src/pwd.c (NOT_AN_INODE_NUMBER, D_INO): Move to ...
106 * src/system.h: ... here, for use in ...
107 * src/ls.c (main): ... here. Prefer dirent.d_ino to stat when
109 (gobble_file): Add inode argument.
110 (print_dir): Pass inode if available.
111 (usage): Remove inaccuracy.
113 2006-02-23 Jim Meyering <jim@meyering.net>
115 * TODO: Update/correct some obsolete entries.
117 2006-02-20 Paul Eggert <eggert@cs.ucla.edu>
119 * doc/coreutils.texi (join invocation): Mention `sort -k 1b,1'.
120 * src/join.c (usage): Likewise.
121 Documentation problem reported by Philip Kensche.
123 2006-02-20 Eric Blake <ebb9@byu.net>
125 * man/rm.x: Update documentation to match previous patch.
127 2006-02-18 Eric Blake <ebb9@byu.net>
129 New option for rm: --interactive=once (-I).
130 * NEWS: Document it, along with change to rm --interactive.
131 * TODO: Remove entry for implementing rm -I
132 * src/rm.c (INTERACTIVE_OPTION): New enum value.
133 (interactive_type): New enum.
134 (long_opts): Let interactive take an optional argument.
135 (interactive_args, interactive_types): New option arguments.
136 (usage): Document -I, --interactive=WHEN. Use program_name
137 instead of a basename.
138 (main): New -I option, new behavior to --interactive.
139 * tests/rm/interactive-once: New tests.
140 * tests/rm/interactive-always: Ditto.
141 * tests/rm/Makefile.am (TESTS): Run them.
143 2006-02-18 Jim Meyering <jim@meyering.net>
145 * Makefile.maint (sc_two_space_separator_in_usage): Make the regular
146 expression match more of the target lines, e.g., those that start with
147 `-S,' (short option followed by a comma) or that include `=[...]'.
148 Patch by Nicolas François.
149 Fix the four offenders thus exposed:
150 * src/join.c (usage): Use two spaces (not one) to separate the
151 --first-only option string from its description, so help2man formats
152 the derived man page properly.
153 * src/pr.c (usage): Likewise.
154 * src/uniq.c (usage): Likewise.
155 * src/install.c (usage): Likewise.
157 2006-02-15 Jim Meyering <jim@meyering.net>
159 * Makefile.maint (alpha beta major): For `make major', ensure that the
160 version string is of the form N.N[.N]*, where N is one or more digits.
162 2006-02-14 Jim Meyering <jim@meyering.net>
164 * INSTALL: Update from gnulib.
166 2006-02-13 Jim Meyering <jim@meyering.net>
168 * GNUmakefile (all): Emit diagnostics to stderr, not stdout.
170 2006-02-12 Jim Meyering <jim@meyering.net>
172 * Makefile.maint (patch-check): New target.
173 (local-checks-available): Add to the list.
175 2006-02-11 Jim Meyering <jim@meyering.net>
177 * src/c99-to-c89.diff: New file.
178 * src/Makefile.am (EXTRA_DIST): Add c99-to-c89.diff.
180 * .x-po-check: New file, with exclusions so that `make distcheck'
182 * Makefile.am (EXTRA_DIST): Add .x-po-check.
184 rm -r must remove an empty directory, even if it is inaccessible.
185 * src/remove.c (close_preserve_errno): New function.
186 (fd_to_subdirp): Don't print a diagnostic in this function.
187 Do it from the callers instead, unless rmdir succeeds.
188 (remove_cwd_entries, remove_dir): Adjust callers.
189 * tests/rm/empty-inacc: New test for the above.
190 * tests/rm/Makefile.am (TESTS): Add empty-inacc.
191 * NEWS: Mention this bug fix.
192 * tests/rm/rm2: Adjust two expected diagnostics, now that they're
193 a tiny bit less precise: cannot remove `a/1': ... instead of
194 cannot open directory `a/1': ...
196 * Makefile.maint (syntax-check-rules): Automatically derive this
197 list of sc_-prefixed rule names.
199 2006-02-10 Paul Eggert <eggert@cs.ucla.edu>
201 * Makefile.maint (CVS_LIST): Don't assume cvsu is available.
202 (CVS_LIST_EXCEPT): New macro, to simplify exception-processing.
203 Most uses of CVS_LIST changed to use CVS_LIST_EXCEPT.
204 (syntax-check-rules): Bring back sc_changelong. (Hmm, why did it
205 go away? was that an accident?)
206 (sc_cast_of_argument_to_free, sc_cast_of_x_alloc_return_value):
207 (sc_cast_of_alloca_return_value, sc_space_tab, sc_prohibit_atoi_atof):
208 (sc_error_exit_success, sc_file_system, sc_no_if_have_config_h):
209 (sc_system_h_headers, sc_sun_os_names, sc_trailing_blank):
210 (sc_two_space_separator_in_usage, sc_unmarked_diagnostics):
211 (sc_obsolete_symbols, sc_changelog, sc_prohibit_jm_in_m4):
212 (sc_useless_cpp_parens, makefile-check, m4-check, po-check):
213 (author_mark_check, makefile_path_separator_check):
214 Output line numbers, to simplify navigation of Emacs *compilation*
216 (sc_prohibit_atoi_atof, sc_file_system):
217 Rework slightly so that Makefile.maint doesn't get reported as a
218 violation of its own syntax rules.
219 (sc_dd_max_sym_length): Use ifneq to do nothing, instead of doing
220 it at run-time (which didn't work with Bison). Fix a makefile typo,
221 caught by Makefile.maint itself: spaces where a tab should be.
222 (po-check): Check lib/*.[ch] even if not in CVS; used by Bison,
223 which copies from ../gnulib/lib/*.[ch] to lib/*.[ch].
224 Ignore djgpp and man subdirectories, to avoid false matches with
225 Bison and coreutils, respectively. Use sort -u to remove the
226 resulting duplicates.
227 * gnupload: Rework slightly to avoid bogus warning from
228 sc_two_space_separator_in_usage.
230 2006-02-10 Jim Meyering <jim@meyering.net>
232 Use gzip's --rsyncable option only if it's available.
233 * Makefile.maint (gzip_rsyncable): New variable.
236 2006-02-08 Jim Meyering <jim@meyering.net>
238 * Makefile.maint (local-checks-available): Define in terms of
239 the expansion, $(syntax-check-rules), rather than the single,
240 top-level target `syntax-check', so that it's easier to exclude
241 individual rules (via $(local-checks-to-skip)).
242 (tgz-md5, tgz-sha1, ...): Remove now-unused definitions.
244 2006-02-07 Jim Meyering <jim@meyering.net>
246 * src/system.h (!defined O_DIRECT): If O_DIRECTIO is defined (as it
247 is on Tru64), define O_DIRECT to that. Patch From James Lemley.
249 * tests/help-version (expected_failure_status_vdir):
250 Redirect an expected disk-full diagnostic to /dev/null.
252 2006-02-06 Jim Meyering <jim@meyering.net>
254 * src/unexpand.c (usage): Use two spaces (not one) to separate the
255 --first-only option string from its description, so help2man formats
256 the derived man page properly.
257 * src/rm.c (usage): Likewise for --no-preserve-root.
258 * src/chown.c (usage): Likewise.
259 * src/chgrp.c (usage): Likewise.
261 Add a rule to ensure that the above doesn't happen again.
262 * Makefile.maint (sc_two_space_separator_in_usage): New rule.
263 (syntax-check-rules): Add it.
264 * .x-sc_two_space_separator_in_usage: New empty file.
265 * Makefile.am (EXTRA_DIST): Add .x-sc_two_space_separator_in_usage.
267 2006-02-06 Jim Meyering <jim@meyering.net>
269 * src/cp.c (usage): Use two spaces (not one) to separate each
270 option string from its description, so help2man formats the
271 derived man page properly.
272 * src/mv.c (usage): Likewise.
273 Patch from Nicolas François in http://bugs.debian.org/351601.
275 2006-02-04 Jim Meyering <jim@meyering.net>
277 * src/copy.c (copy_internal): cp -RL would fail when encountering
278 the same directory more than once in the hierarchy beneath a single
279 command-line argument. That is legitimate, e.g. when there are
280 two or more symbolic links, each pointing to some directory that
281 would not otherwise be copied. Reported by Christophe LYON.
282 * tests/cp/cp-deref: New file. Test for today's fix.
283 * tests/cp/Makefile.am (TESTS): Add cp-deref.
284 * NEWS: Document this.
286 2006-02-03 Jim Meyering <jim@meyering.net>
288 * configure.ac: Require automake-1.9.6, not 1.8.3.
290 2006-02-01 Paul Eggert <eggert@cs.ucla.edu>
292 * src/od.c (usage): Mention that -t a ignores high order bit.
293 Documentation problem reported by Ed Avis.
295 2006-02-01 Jim Meyering <jim@meyering.net>
297 * src/pwd.c (find_dir_entry): Remove unused local, `ent_sb_valid'.
299 2006-01-30 Paul Eggert <eggert@cs.ucla.edu>
301 * src/head.c (main): Use a better diagnostic when someone uses a
302 trailing numeric option in an invalid way. Problem reported by
304 * src/tail.c (parse_options): Likewise.
306 2006-01-30 Jim Meyering <jim@meyering.net>
308 * man/wc.x: Include `count' keyword in man page synopsis,
309 per suggestion from http://bugs.debian.org/181585.
311 2006-01-24 Paul Eggert <eggert@cs.ucla.edu>
313 * src/df.c (show_dev): If the file system claims to have
314 more available than total blocks, report the number of used
315 blocks as being total - available (a negative number) rather
316 than as garbage. Problem reported by Toralf Foerster.
318 2006-01-24 Jim Meyering <jim@meyering.net>
320 * src/tail.c (tail_forever): Don't exit-nonzero when an attempt
321 to put a regular file in O_NONBLOCK mode fails with EPERM.
322 That happens on Linux (up to 2.6.15) when using tail -f on a file with
323 the append-only attribute. Reported by Dean Gaudet. For details,
324 see http://savannah.gnu.org/bugs/?func=detailitem&item_id=15473.
325 * NEWS: Mention this fix.
326 * tests/tail-2/append-only: New file. Test for the above.
327 * tests/tail-2/Makefile.am (TESTS): Add append-only.
328 * tests/Makefile.am (check-root): Add tail-2/append-only
330 2006-01-21 Jim Meyering <jim@meyering.net>
332 * NEWS: Mention fts-related improvements and bug fixes.
334 2006-01-19 Jim Meyering <jim@meyering.net>
336 * tests/fmt/basic (pfx-1, pfx-2): New tests, to demonstrate the bug
337 reported as http://bugs.debian.org/147577. Forwarded by Thomas Hood.
339 2006-01-18 Jim Meyering <jim@meyering.net>
341 * tests/du/Makefile.am (TESTS): Add long-from-unreadable.
343 2006-01-17 Jim Meyering <jim@meyering.net>
345 Now that fts no longer changes the current working directory, adjust
346 its clients accordingly -- note that du.c uses fts but doesn't need
347 any adjustment, since it doesn't operate on the actual files,
348 but rather just uses the stat buffers provided by fts.
350 * src/chown-core.c: Include "openat.h".
351 Don't include "lchown.h".
352 (restricted_chown): Accept a new parameter, CWD_FD, and use it in
353 calling openat, lchownat, chownat, rather than open, lchown, chown.
355 * src/chmod.c: Include "openat.h".
356 (process_file): Use chmodat (fts->fts_cwd_fd,... in place of chmod (...
358 * tests/du/long-from-unreadable: New test, to exercise one small
361 2006-01-13 Jim Meyering <jim@meyering.net>
363 * tests/Makefile.am (SUBDIRS): Add comments discouraging the
364 addition of new directories under tests/.
366 * tests/acl: Redirect stdin to /dev/null. Otherwise, FreeBSD 5.0's
369 2006-01-12 Jim Meyering <jim@meyering.net>
371 * tests/du/long-sloop: Adjust not to hard-code the expected
372 diagnostic corresponding to ELOOP. Solaris' diagnostic differs
373 from that of GNU libc. Reported by Paul Eggert.
375 * tests/du/long-sloop: Create file at end of symlink chain.
377 * tests/misc/test: New file, with a test for one of the
378 bugs fixed by yesterday's test.c changes.
379 * tests/misc/Makefile.am (TESTS): Add test.
381 2006-01-11 Jim Meyering <jim@meyering.net>
383 * tests/du/long-sloop: New file. Test for today's fts.c bug fix.
384 That bug could make du -L, chgrp -L, or chown -L fail to diagnose
385 a very long sequence of symbolic links (not necessarily a loop).
386 * tests/du/Makefile.am (TESTS): Add long-sloop.
388 2006-01-11 Paul Eggert <eggert@cs.ucla.edu>
390 * src/test.c (test_syntax_error): Append a newline. All callers
391 changed, except for the ones that didn't already append a newline.
392 Bug reported by Eric Blake.
394 2006-01-11 Jim Meyering <jim@meyering.net>
396 * src/system.h (X2NREALLOC): Now that verify_true is no longer
397 void, cast its result to void, to avoid gcc's warning that
398 ``left-hand operand of comma expression has no effect''.
399 (DECIMAL_DIGIT_ACCUMULATE, X2REALLOC): Likewise.
401 2006-01-10 Jim Meyering <jim@meyering.net>
403 * tests/chmod/no-x: Add a test for today's fts.c fix.
405 2006-01-10 Jim Meyering <jim@meyering.net> (tiny change)
407 * src/ls.c (gobble_file): Use DTTOIF only if it's defined.
408 This is necessary for Dragonfly. Patch by Joerg Sonnenberger.
410 2006-01-10 Paul Eggert <eggert@cs.ucla.edu>
412 * src/system.h (X2NREALLOC, X2REALLOC, DECIMAL_DIGIT_ACCUMULATE):
413 Use verify_true instead of verify_expr, to sync with gnulib.
415 2006-01-08 Jim Meyering <jim@meyering.net>
417 * src/date.c (usage): Adjust the formatting of the entries for
418 %::z and %:::z (separate with two spaces, not one) so that help2man
419 formats them properly. Reported by Philip Rowlands.
421 2006-01-06 Paul Eggert <eggert@cs.ucla.edu>
423 * configure.ac (gl_IGNORE_UNUSED_LIBRARIES): Add.
425 2006-01-06 Jim Meyering <jim@meyering.net>
427 * Makefile.maint (copyright-check): Use date +%Y in place of
430 * src/remove.c (rm_1): Remove `static' attribute on local `status'.
431 First off, the attribute should have been `volatile' (not static)
432 to avoid longjmp-related risk of clobber. Secondly, now there is
433 no longer any risk of a local variable being clobbered, so there's
434 no need for any attribute at all.
436 2006-01-05 Jim Meyering <jim@meyering.net>
438 * src/remove.c: Give a few functions the inline attribute.
439 (AD_pop_and_chdir): Use gotos to avoid some duplication.
440 (AD_push): Rewrite an assertion so that the entire computation
441 goes away when assertions are turned off.
443 * src/tail.c (ENOSYS) [!defined ENOSYS]: Don't define here.
444 It's already defined in "system.h".
445 * Makefile.maint: Add a FIXME comment.
447 2006-01-04 Jim Meyering <jim@meyering.net>
449 * ChangeLog: Remove entries from 2005-10-22 and earlier.
450 * ChangeLog-2005: New file, for entries up to version 5.92.
452 2006-01-03 Jim Meyering <jim@meyering.net>
454 * tests/du/no-x: Also allow a slightly different diagnostic -- the
455 one you get when using openat-enabled fts.c and du (coming soon).
456 * tests/chmod/no-x: Likewise.
457 * tests/chgrp/no-x: Likewise.
459 * src/system.h (O_DIRECTORY) [!defined O_DIRECTORY]: Define.
461 2006-01-02 Paul Eggert <eggert@cs.ucla.edu>
463 * src/chown-core.c (RC_do_ordinary_chown): New enum value.
464 (restricted_chown): Return it, if the file cannot be accessed due
465 to EPERM, or if no uid or gid are required, or if the file is
466 neither a directory nor a regular file. Rewrite to avoid gotos.
467 (change_file_owner): Handle RC_do_ordinary_chown case.
468 Rewrite to avoid gotos.
469 * tests/chgrp/basic: Make sure we can change the group of
472 * src/date.c (usage): Explain %g, %G, and %V a bit better.
474 2006-01-02 Jim Meyering <jim@meyering.net>
476 * src/copy.c (set_owner): Correct a comment.
478 * src/tail.c (parse_options): Change warning to say that --retry
479 is useful `mainly' (not `only') when following by name.
480 Reported here: http://bugs.debian.org/273781
482 2006-01-01 Paul Eggert <eggert@cs.ucla.edu>
484 * NEWS: Document that mkfifo and mknod -m no longer set special bits.
485 * src/copy.c: Include lchmod.h.
486 (copy_internal): Use lchmod rather than chmod.
487 * src/cp.c: Include lchmod.h.
488 (re_protect, make_dir_parents_private): Use lchmod rather than chmod.
489 * src/mkdir.c: Include lchmod.h.
490 (usage): Clarify -m's operation.
491 (main): Use lchmod rather than chmod. Don't use lchmod unless the
492 new mode contains bits outside the 777 range.
493 * src/mkfifo.c (usage): Clarify -m's operation.
494 (main): If -m is given, don't invoke chmod; use umask 0 instead.
495 Report an error if -m asks for bits outside the 777 range.
496 * src/mknod.c (usage, main): Likewise.
498 * src/mkdir.c, src/mkfifo.c, src/mknod.c: Undo 2005-12-19 changes.
500 2005-12-27 Jim Meyering <jim@meyering.net>
502 * Makefile.maint (sc_obsolete_symbols): Prohibit use of O_NDELAY.
503 (sc_prohibit_assert_without_use): New rule.
504 (syntax-check-rules): Add it to the list.
505 * .x-sc_prohibit_assert_without_use: New empty file.
506 * Makefile.am (EXTRA_DIST): Add it.
508 * Makefile.maint (CVS_LIST): Define in terms of $(srcdir).
510 * cp.c, df.c, link.c, mknod.c, nice.c, sleep.c, unlink.c:
511 Don't include <assert.h>; it wasn't used.
513 2005-12-26 Paul Eggert <eggert@cs.ucla.edu>
515 * src/chown-core.c (restricted_chown):
516 Don't try O_WRONLY unless O_RDONLY failed wth EACCES.
517 * src/remove.c (fd_to_subdirp): Open with O_DIRECTORY | O_NOCTTY
518 | O_NOFOLLOW too, for consistency with other dir-openers.
519 Use POSIX-preferred O_NONBLOCK rather than O_NDELAY.
520 (is_empty_dir): Likewise.
521 * src/shred.c (wipename): Likewise. Don't bother trying to open
522 dir for writing, since POSIX prohibits it.
524 2005-12-22 Jim Meyering <jim@meyering.net>
526 * tests/help-version: Redirect stderr to /dev/full, to suppress
527 write error diagnostic.
529 2005-12-19 Jim Meyering <jim@meyering.net>
531 * src/mkdir.c, src/mknod.c, src/mkfifo.c (main)
532 Avoid a minor race condition when `-m MODE' is specified, by using
533 open, fchown, and close rather than just chown. To do that reliably --
534 even with an overly restrictive umask -- ensure that each mkdir,
535 mknod and mkfifo call uses a mode including at least owner-read access.
536 * src/mknod.c (main): When `-m MODE' is specified, exit nonzero if
537 the subsequent chown (or equivalent open,fchown,close) fails.
538 * tests/misc/mknod: New tests.
539 * tests/misc/Makefile.am (TESTS): Add mknod.
541 2005-12-17 Jim Meyering <jim@meyering.net>
543 * src/remove.c (is_empty_dir): Open with O_NDELAY, so we don't hang,
544 e.g., on a named pipe.
545 (OPEN_NO_FOLLOW_SYMLINK): Remove definition. Use O_NOFOLLOW in
546 place of all uses, since it is guaranteed (system.h) to be defined.
548 2005-12-05 Andreas Gruenbacher <agruen@suse.de>
550 Add POSIX ACL support
551 * src/ls.c: Switch back from HAVE_ACL to USE_ACL: The acl() syscall
552 is no requirement for ACL support; particularly, it does not exist
553 on systems that have POSIX ACLs.
554 * src/copy.h (cp_option_init) [umask_kill]: Remove member.
555 * src/cp.c (umask_kill): With default acls, the umask is not to be
556 applied. Remove umask_kill, don't change the process umask, and let
557 the kernel apply the umask where appropriate.
558 * src/cp.c (make_dir_parents_private): Fix logic for POSIX ACLs.
559 * src/copy.c (get_dest_mode): Remove; it is obsolete after removing
561 (copy_reg, copy_internal): Use copy_acl and set_acl
562 instead of fchown/chown. Fix the logic for POSIX ACLs.
563 (chown_succeded): Remove; we now always copy acls and
564 preserve S_ISUID, S_ISGID, and S_ISVTX when needed, no matter if we
565 did a chown before or not.
566 * src/mv.c, src/install.c (cp_option_init): Don't set umask_kill member.
567 * src/Makefile.am (dir_LDADD, ls_LDADD, vdir_LDADD, cp_LDADD,
568 mv_LDADD, ginstall_LDADD): On systems with an ACL library, arrange
569 to link with it via $(LIB_ACL), for the utilities that need it.
571 2005-12-16 Paul Eggert <eggert@cs.ucla.edu>
573 * src/remove.c (OPENAT_CWD_RESTORE__REQUIRE): Remove.
574 (OPENAT_CWD_RESTORE__ALLOW_FAILURE): Likewise.
575 (fd_to_subdirp): Remove openat_cwd_restore_allow_failure arg; its
576 value is now signified by whether cwd_errno is null.
577 (fd_to_subdirp, remove_dir, rm_1); Change cwd failure indicator from
578 pointer-to-bool to pointer-to-errno-value. All callers changed.
579 (rm_1): Don't bother setting a local cwd failure flag and then
580 ORing it into the caller's. Just set the caller's.
581 (rm): Use cwd failure errno value to print a slightly-better
584 2005-12-15 Jim Meyering <jim@meyering.net>
586 * src/stat.c (print_it): Properly handle a backslash at the
587 end of a --printf format string. Reported by Paul Eggert.
588 * tests/misc/stat-printf (end-bs): Add a test for the above.
590 2005-12-15 Paul Eggert <eggert@cs.ucla.edu>
592 * tests/acl: Port to pre-POSIX shells like Solaris 8 /bin/sh.
593 Don't assume /etc/passwd contains user names; use 'id' instead.
595 2005-12-15 Jim Meyering <jim@meyering.net>
597 stat: revert behavior of --format=FMT (-c)
598 stat: add new option: --printf=FMT
599 * NEWS: Mention this.
600 * src/stat.c (isodigit, octtobin, hextobin): Define.
601 (PRINTF_OPTION): Define.
602 (interpret_backslash_escapes, trailing_delim): New globals.
603 (usage): Document them. Alphabetize on long option names.
604 (print_esc_char): New function.
605 (print_it): Rewrite, in order to handle backslash escapes.
606 (main): Handle new option. Set globals for --format, too.
608 * tests/misc/stat-printf: Test --printf and --format.
609 * tests/misc/Makefile.am (TESTS): Add stat-printf.
611 2005-12-14 Paul Eggert <eggert@cs.ucla.edu>
613 * NEWS: sort now reports incompatible options.
614 * src/sort.c (incompatible_options, check_ordering_compatibility):
616 (main): Use them. Don't bother with a usage message for
617 "sort -c a b", for consistency with other error diagnostics.
618 * tests/sort/Test.pm (incompat1, incompat2, incompat3, incompat4):
621 * src/cat.c (main): Undo previous change. close_stdout already
622 does the check, so the previous change wasn't necessary.
624 2005-12-13 Paul Eggert <eggert@cs.ucla.edu>
626 * src/cat.c (main): Check for close (STDOUT_FILENO) failure.
628 2005-12-12 Paul Eggert <eggert@cs.ucla.edu>
630 Install a more-conservative approach for sort -R. It's the
631 same basic idea as the existing code, except it uses the full ISAAC
632 approach (called the "more kosher" approach in the existing comments).
633 This makes "sort -R" quite a bit slower (about a factor of 2 on my
634 little tests involving 10000 lines on a 2.4 GHz P4), but I think it's
635 better to be conservative here at first, and review any performance
636 improvements carefully.
637 * .x-sc_require_config_h: Add src/rand-isaac.c.
638 * src/rand-isaac.h: Remove. All uses now simply include rand-isaac.c.
639 * src/Makefile.am (noinst_HEADERS): Remove rand-isaac.h.
640 (shred_SOURCES, sort_SOURCES): Remove.
641 (EXTRA_DIST): Add rand-isaac.c.
642 * src/rand-isaac.c: Revert to what used to be in shred.c, without
643 changing it to allow for varying numbers of words in the state.
644 Alter so that we include rand-isaac.c directly rather than
645 compiling it and linking to it. Don't include config.h or
646 system.h; that's the includer's responsibility.
647 Omit functions that are specific to shred.
648 (ISAAC_LOG, ISAAC_WORDS, ISAAC_BYTES, struct isaac_state, ind):
649 (isaac_step, struct irand_state):
650 Resurrect these, with the same defns that used to be in shred.c.
651 (ISAAC_SIZE, isaac_new, isaac_copy): Remove.
652 (isaac_refill, isaac_seed_start, isaac_seed_data, irand_init, irand32):
654 (struct isaac_state, isaac_refill, isaac_mix, isaac_init):
655 (isaac_seed_start, isaac_seed_data, isaac_seed_finish, isaac_seed):
656 (irand_init, irand32, irand_mod):
657 Number of words is constant again.
658 (struct irand_state, irand_init, irand32, irand_mod): Move to shred.c.
659 * src/shred.c: Include rand-isaac.c rather than rand-isaac.h.
660 * src/sort.c: Likewise.
661 * src/shred.c (fillrand, dopass, main): Undo previous change.
662 (struct irand_state, irand_init, irand32, irand_mod): Moved back here,
664 * src/sort.c: Don't include md5.h; it wasn't needed.
665 (struct keyfield): Rename random_hash to random, for consistency
666 with the other member names. All uses changed.
667 (usage): Tweak wording to mention STRING for --seed option.
668 (short_options): Rorder for consistency with other programs.
669 (rand_state): Now a struct, not a pointer to one. All uses changed.
670 (HASH_WORDS, HASH_SIZE): Remove.
671 (get_hash): Remove comments around resbuf size, since we can assume C89.
672 Use a "more-kosher" (but slower) approach of invoking isaac_refill.
673 (keycompare): Adjust to the new get_hash.
675 (badfieldspec): Omit recently-introduced comment; it isn't needed.
676 (main): Don't set need_random simply because gkey has it set; that
677 doesn't necessarily mean we'll need random numbers.
678 Redo seeding to match new get_hash approach.
680 2005-12-10 Jim Meyering <jim@meyering.net>
682 * src/Makefile.am (noinst_HEADERS): Add rand-isaac.h.
684 Avoid shred segfault on 64-bit systems.
685 * src/rand-isaac.c (isaac_refill): Don't try to negate a
686 local of type uint32_t. Make the local an `int' instead.
688 * NEWS: Mention sort's new options.
690 * src/rand-isaac.c (isaac_mix): Declare to be static.
691 Mark all other functions as `extern' so the tight-scope
692 part of `make distcheck' passes once again.
693 * src/rand-isaac.h (isaac_mix): Remove declaration.
695 * src/sort.c (get_hash): Change position of `*' in parameter
696 type to conform with convention.
697 (main): Split a long line so it fits in 80 columns.
698 (keycompare): Remove stray SPACE before TAB that was
699 causing `make distcheck' to fail.
701 * src/shred.c: Don't include gethrxtime.h. No longer needed.
703 * tests/misc/sort-rand: New file: basic tests for the new options.
704 * tests/misc/Makefile.am (TESTS): Add sort-rand.
706 2005-12-10 Frederik Eaton <frederik@ofb.net>
708 * src/Makefile.am (sort_LDADD): Add $(LIB_GETHRXTIME).
709 (shred_SOURCES, sort_SOURCES): New macros, so we compile rand-isaac.c.
710 * src/rand-isaac.c: New file, containing ISAAC code that was in shred.c.
711 Make state size runtime-configurable.
712 (isaac_new, isaac_copy): New functions.
713 * src/rand-isaac.h: New file.
714 * src/shred.c: Include rand-isaac.h. Move ISAAC code to rand-isaac.c.
715 (fillrand, main): Adjust to the fact that the state size is now
716 runtime-configurable.
717 * src/sort.c (short_options, long_options, WORDS, keycompare, main):
718 (usage): Add options --random-sort and --seed to implement a random
720 Include md5.h and rand-isaac.h.
721 (get_hash): New function.
722 (rand_state): New var.
723 (HASH_WORDS, HASH_SIZE): New macros.
725 2005-12-09 Paul Eggert <eggert@cs.ucla.edu>
727 * tests/dd/misc: Add test for dd iflags=noatime.
729 2005-12-09 Jim Meyering <jim@meyering.net>
731 * src/sort.c (usage): Mention white space vs -b and -t options.
734 2005-12-09 Eric Blake <ebb9@byu.net>
736 * src/test.c (main): Fix misleading comment.
738 2005-12-07 Paul Eggert <eggert@cs.ucla.edu>
740 * NEWS: Mention dd's new noatime flag.
741 * src/system.h (O_NOATIME): Define to 0 if not already defined.
742 * src/dd.c (flags, usage): Add support for noatime flag.
744 2005-12-07 Jim Meyering <jim@meyering.net>
746 Distribute the cvsu script, used only by `make syntax-check'.
747 * Makefile.am (EXTRA_DIST): Add build-aux/cvsu.
748 * Makefile.maint (CVS_LIST): Use build-aux/cvsu, now that we
749 distribute a copy of this script.
750 * .x-sc_unmarked_diagnostics: Add build-aux/cvsu.
752 * tests/mv/acl: exit-77 before the trap, not after, if we fail
753 to create a temporary directory on another partition.
754 From Andreas Gruenbacher.
756 2005-12-06 Tomas Pospisek <tpo@sourcepole.ch> (tiny change)
758 * man/basename.x: Cross-reference to dirname and readlink.
759 * man/dirname.x: Cross-reference to basename and readlink.
761 2005-12-05 Andreas Gruenbacher
763 * src/copy.c [!HAVE_FCHOWN]: Define fchown(...) to -1.
764 (set_owner, preserve_author): New functions, factored out of copy_reg.
765 (copy_reg): Use them.
766 (copy_internal): Use them here, too.
768 2005-12-04 Jim Meyering <jim@meyering.net>
770 * src/sleep.c (usage): Say what happens with two or more arguments.
771 Suggested by Justin Pryzby.
773 * src/uptime.c (print_uptime): Move decl of `upsecs' into scope
776 2005-12-03 Jim Meyering <jim@meyering.net>
778 * src/rm.c (long_opts): Change the name of each undocumented, for-
779 testing-only option to start with `-', so that it cannot render
780 ambiguous any prefix it happens to share with some other option name.
781 Problem reported by Eric Blake.
782 * src/head.c (long_options): Likewise.
783 * src/tail.c (long_options): Likewise.
785 * tests/misc/head-elide-tail: Update uses of undocumented, for-
786 testing-only --presume* options to start with `---'.
787 * tests/rm/dangling-symlink: Likewise.
788 * tests/rm/dir-no-w: Likewise.
789 * tests/rm/isatty: Likewise.
791 2005-11-30 Jim Meyering <jim@meyering.net>
793 * Makefile.maint: Add a comment about cvsu.
795 2005-11-25 Paul Eggert <eggert@cs.ucla.edu>
797 * NEWS: df updates for "none", "proc", inaccessible file systems.
798 * src/df.c (show_point): Ignore inaccessible file systems.
799 (usage): -a includes dummy file systems, not size-0 file systems.
801 * src/od.c (unsigned_long_long_int): Renamed from ulonglong_t,
802 to avoid collision with POSIX name space. All uses changed.
804 2005-11-24 Jim Meyering <jim@meyering.net>
806 * tests/Makefile.am (EXTRA_DIST): Add acl to the list.
807 * tests/acl: Add `$0: ' prefix to diagnostics.
809 * .x-sc_require_config_h: Add lib/buffer-lcm.c to the list.
811 2005-11-23 Paul Eggert <eggert@cs.ucla.edu>
813 * src/copy.c: Improve performance a bit by optimizing away
814 unnecessary system calls and going to a block size of at least
815 8192 (on normal hosts, anyway). This improved performance 5% on my
816 Debian stable host (2.4.27 kernel, x86, copying from root
817 ext3 file system to itself).
818 Include "buffer-lcm.h".
819 (copy_reg): Omit last argument. All callers changed.
820 Use xmalloc to allocate rather than trusting alloca
821 (which is unwise with large block sizes).
822 Declare locals more locally, if possible.
823 Use uintptr_t words instead of int words, for a bit more speed
824 when looking for null blocks on 64-bit hosts.
825 Optimize away reads of zero bytes on regular files.
826 In the typical case, insist on 8 KiB buffers, at least.
827 Avoid unnecessary extra call to fstat when checking for sparse files.
828 Avoid now-unnecessary cast to off_t, and "0L".
829 Avoid unnecessary test of *new_dst when checking for same owner
832 2005-11-22 Paul Eggert <eggert@cs.ucla.edu>
834 * src/remove.c (rm): Don't assume C99 for-loop syntax.
836 2005-11-22 Jim Meyering <jim@meyering.net>
838 * src/remove.c (AD_push): Remove debugging cruft.
840 * tests/rm/unread2 (rm): Change expected diagnostic,
841 `cannot open directory' to `cannot remove', to align with
843 * tests/rm/rm2: Ensure that rm now continues removing entries
844 even after certain types of failure.
846 * src/remove.c: Rewrite. Now, this module is reentrant on systems
847 that provide openat (Solaris), and on systems like Linux+procfs
848 where our openat emulation code is reentrant. This also fixes a
849 few low-probability leaks and eliminates some code that could,
850 in very unusual circumstances, cause rm() (via a callee) to exit.
851 * NEWS: Mention this.
853 * configure.ac: Put copyright dates all on one line so the
854 emacs function that updates them works properly.
856 2005-11-18 Paul Eggert <eggert@cs.ucla.edu>
858 * configure.ac (AM_PROG_CC_C_O): Add. Needed for CVS Automake.
859 Problem reported by Eric Blake.
860 (AC_PROG_CC_STDC): Use this instead of AC_PROG_CC, so that
861 we get a standard-conforming compiler. This relies on the new
862 m4/c.m4 file. Note that it's a bit tricky, since c.m4 doesn't
863 define AC_PROG_CC_STDC; we are relying on Autoconf 2.59 internals.
864 m4/c.m4 can go away with Autoconf 2.60 comes out.
866 2005-11-17 Jim Meyering <jim@meyering.net>
868 * src/remove.c (AD_mark_helper): Make a `char *' parameter `const'.
869 (AD_mark_current_as_unremovable): Likewise, but for a local.
872 * tests/mv/acl: Let traps handle removing temporary directories.
874 Expect acl-related tests to fail, until the corresponding
875 patches are committed.
876 * tests/mv/Makefile.am (XFAIL_TESTS): Add acl.
877 * tests/cp/Makefile.am (XFAIL_TESTS): Likewise.
879 ACL tests, from Andreas Gruenbacher.
880 * tests/acl, tests/mv/acl, tests/cp/acl: New files.
881 * tests/mv/Makefile.am (TESTS): Add acl.
882 * tests/cp/Makefile.am (TESTS): Add acl.
884 * src/ls.c (basename_is_dot_or_dotdot): Correct wording in comment.
886 2005-11-16 Paul Eggert <eggert@cs.ucla.edu>
888 * NEWS: Improve quality of ln's diagnostics.
889 * src/ln.c (do_link, usage): Likewise.
890 (do_link): Don't use alloca on a buffer of unbounded size.
892 2005-11-16 Jim Meyering <jim@meyering.net>
894 * tests/cp/fail-perm: Accommodate HPUX. It appears to fail
895 with EACCES rather than EPERM. Reported by Peter O'Gorman here:
896 http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/5766
898 2005-11-14 Jim Meyering <jim@meyering.net>
900 * NEWS (sort): Mention consequences of today's mkstemp-safer.c fix.
902 2005-11-13 Jim Meyering <jim@meyering.net>
904 * announce-gen: Accept new option, --gpg-key-id=ID and
905 emit a blurb telling how to use the .sig files.
906 * Makefile.cfg (gpg_key_ID): Define.
907 * Makefile.maint (announcement): Use new option and key.
909 Require that most .c files include <config.h>.
910 * Makefile.maint (sc_require_config_h): New rule.
911 (syntax-check-rules): Add it.
912 * .x-sc_require_config_h: New file listing exceptions to the
913 above rule. Some are legit, others are simply grandfathered in.
914 * Makefile.am (EXTRA_DIST): Add .x-sc_require_config_h here, too.
916 2005-11-12 Jim Meyering <jim@meyering.net>
918 * src/checksum.h, src/md5.c, src/sha1sum.c: Remove now-unused files.
920 2005-11-11 Jim Meyering <jim@meyering.net>
922 * NEWS: Mention `readlink -f' bug fix in 5.3.0 news.
923 Mention new readlink options in 5.3.0's `New features' section.
924 Spotted by Thomas Hood.
926 2005-11-08 Jim Meyering <jim@meyering.net>
928 * NEWS: Merge in changes from b5_9x branch.
930 2005-11-08 Paul Eggert <eggert@cs.ucla.edu>
932 * NEWS: ls now defaults to --time-style='locale', which in turn acts
933 like --time-style='posix-long-iso' if the locale settings are messed up.
934 * src/ls.c (decode_switches): Implement this.
936 2005-11-08 Jim Meyering <jim@meyering.net>
938 * tests/du/2g: s/expensive/very expensive/ in a comment.
941 2005-10-17 Eric Blake <ebb9@byu.net>
943 * src/ls.c (usage): Fix descriptions of --sort, --time.
944 Reported by Vitaly A. Ostanin.
946 2005-11-04 Paul Eggert <eggert@cs.ucla.edu>
948 * src/ln.c: Include filenamecat.c.
949 (FILE_BASENAME_CONCAT): Remove.
950 (do_link): Remove last arg DEST_IS_DIR. All callers changed.
951 (main): Use file_name_concat, base_name, and strip_trailing_slashes
952 instead of FILE_BASENAME_CONCAT. This simplifies the code, and avoids
955 2005-11-04 Jim Meyering <jim@meyering.net>
957 * src/du.c (process_file): Don't overflow for files of size >= 2^31
958 on systems with stat.st_blocks of a signed 32-bit type.
959 This bug causes trouble on some AIX 5.1 systems.
960 Report and trivial patch from Paul Townsend:
961 <http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00033.html>
962 * NEWS: Mention this.
964 * tests/du/2g: New (very-expensive) test for the above-fixed bug.
965 * tests/du/Makefile.am (TESTS): Add it here.
966 * tests/very-expensive: New file.
967 * tests/Makefile.am (EXTRA_DIST): Add it here.
968 * tests/cp/perm: Mark this test as `very-expensive', too.
970 2005-11-02 Paul Eggert <eggert@cs.ucla.edu>
972 * NEWS: Mention that rm -d and maybe ln -d are scheduled for
974 * src/remove.h (struct rm_options): Remove unlink_dirs. All uses
976 * src/rm.c (usage): Don't mention rm -d.
978 2005-11-02 Jim Meyering <jim@meyering.net>
980 * tests/dd/skip-seek: Fix typo in comment: s/fileutils/coreutils.
983 * tests/dd/unblock-sync: Redirect stderr to /dev/null so the
984 `M+N records in/out' lines don't pollute `make check' output.
986 * tests/dd/skip-seek (sk-seek4): New test, to exercise the bug
987 fixed on 2005-10-31. This test uses the new, IN_PIPE specifier.
988 * tests/Coreutils.pm: Accept a new type of input specifier: IN_PIPE,
989 to indicate that the input file should be piped into the command
990 under test (via `cat FILE | $prog ...').
992 * src/remove.c (remove_entry): Emit a better diagnostic when rm
993 (without -r) fails to remove a directory on a non-Linux system.
994 This change affects only newer Solaris systems (with priv_*
995 functions like priv_allocset). Reported by Keith Thompson.
997 * tests/rm/dir-nonrecur: New file/test for the above fix.
998 * tests/rm/Makefile.am (TESTS): Add dir-nonrecur.
1000 2005-11-01 Paul Eggert <eggert@cs.ucla.edu>
1002 * NEWS: "tail -c 2 FILE" and "touch 0101000000" now operate as
1003 POSIX 1002.1-2001 requires.
1004 * src/tail.c (parse_obsolete_option): Implement this.
1005 Problem reported by Vincent Lefevre.
1006 * src/touch.c (main): Pass PDS_PRE_2000 to posixtime.
1007 * tests/tail/Test.pm (c-2, c-2-minus, c2, c2-minus): New tests.
1008 (test_vector): Add special cases for _POSIX2_VERSION, and
1009 regularize the old ones a bit.
1010 * tests/touch/obsolescent: Add y2000 test.
1012 2005-10-31 Paul Eggert <eggert@cs.ucla.edu>
1014 * src/dd.c (skip): Fix off-by-one error reported by
1015 Theodoros V. Kalamatianos.
1017 2005-10-30 Paul Eggert <eggert@cs.ucla.edu>
1019 * tests/mkdir/p-3: Require that the test be run as non-root.
1020 Problem and trivial fix reported by Theodoros V. Kalamatianos.
1022 2005-10-28 Paul Eggert <eggert@cs.ucla.edu>
1024 * src/ln.c (FILE_BASENAME_CONCAT): Omit unnecessary slashes in the
1025 boundary between DEST and SOURCE in the result.
1027 2005-10-26 Dmitry V. Levin <ldv@altlinux.org>
1029 * src/md5sum.c (main) [!O_BINARY]: Changed default read mode
1030 back to text, to sync with documentation and for backwards
1033 2005-10-25 Jim Meyering <jim@meyering.net>
1035 * tests/dircolors/simple (other-wr): Add an explicit test for
1036 the dircolors bug (NULL-dereference) fixed yesterday.
1038 2005-10-24 Jim Meyering <jim@meyering.net>
1040 * src/tac.c (tac_file): When determining whether a file is seekable,
1041 also test whether it is a tty. Using only the lseek-based test would
1042 give a false positive on Solaris. Reported by Peter Fales.
1044 2005-10-24 Dmitry V. Levin <ldv@altlinux.org>
1046 * tests/install/d-slashdot: New test, for "install -d" failure.
1047 * tests/install/Makefile.am (TESTS): Add d-slashdot.
1048 * tests/mkdir/p-slashdot: New test, for "mkdir -p" failure.
1049 * tests/mkdir/Makefile.am (TESTS): Add p-slashdot.
1051 2005-10-24 Jim Meyering <jim@meyering.net>
1053 * src/dircolors.c (ls_codes): Add missing comma.
1054 Anonymous report and patch from
1055 http://savannah.gnu.org/bugs/?func=detailitem&item_id=14849
1057 * src/dircolors.c: Add compile-time assertion that the slack_codes
1058 and ls_codes arrays have the same number of elements. This would
1059 have prevented the above-fixed bug.
1061 * src/expand.c (parse_tab_stops): Add a comment to make this function
1062 identical to the one in unexpand.c.
1063 * src/unexpand.c (parse_tab_stops): Adjust syntax to make this function
1064 identical to the one in expand.c.
1066 * src/expand.c (next_file): Don't assume fopen cannot return stdin.
1068 2005-10-23 Jim Meyering <jim@meyering.net>
1070 * src/md5sum.c (digest_check, main): Use ptr_align rather than
1071 a dangerous pointer-value-to-`unsigned' cast.
1072 * NEWS: mention the new sha* programs.
1073 * AUTHORS: Add new sha* programs.
1075 2005-08-28 David Madore <david.madore@ens.fr>
1077 Add new programs: sha224sum, sha256sum, sha384sum, sha512sum.
1078 * README: Add their names to the list.
1079 * src/md5sum.c: Provide framework for computing sha-2 hashes.
1080 * src/Makefile.am (sha224sum, sha256sum, sha384sum, sha512sum):
1081 Rules for compiling sha-2 utilities
1082 (noinst_HEADERS): Remove checksum.h.
1083 * man/sha512sum.x, man/sha384sum.x, man/sha256sum.x, man/sha224sum.x:
1085 * man/Makefile.am (dist_man_MANS): Add the corresponding .1 names.
1086 (sha224sum.1, sha256sum.1, sha384sum.1, sha512sum.1): New dependencies.
1087 * tests/misc/sha224sum, tests/misc/sha256sum: New files.
1088 * tests/misc/sha384sum, tests/misc/sha512sum: New files.
1089 * tests/misc/Makefile.am (TESTS): Add new sha224sum, sha256sum,
1090 sha384sum, sha512sum test scripts here rather that each in its
1093 2005-08-28 David Madore <david.madore@ens.fr>
1095 * tests/sha1sum/basic-1 (million-a): Add the "million a's" test (one
1096 of the FIPS test vectors).
1098 2005-10-23 Jim Meyering <jim@meyering.net>
1100 * configure.ac: Use 6.0-cvs as the version string.
1101 * NEWS: Adjust accordingly.