Commit Graph
4409 Commits
Author SHA1 Message Date
Jim Meyering 6b970542fe (set_initialize): Remove unnecessary initialization of the `in_set'
buffer; that initialization triggered the same compiler bug as above.
2004-05-31 11:30:27 +00:00
Jim Meyering 7b03cfb5dc tr cleanup, mostly having to do with integer type ranges.
Remove all casts.

Here are examples of the failures:

   $ echo a | tr a '[x*][y*2147483646][y*2147483646][y*4]'
   x
   $ echo abcd | tr abc '[b*\9]'
   bbbd
   $ echo abcd | tr abc '[b*0]'
   tr: invalid repeat count `0' in [c*n] construct
   $ echo abcd | tr -c '[a*65536]\n' '[b*]'
   tr: ../../coreutils-5.2.1/src/tr.c:1942: main: Assertion `get_next (s2, ((void *)0)) == -1 || truncate_set1' failed.
   Aborted

(N_CHARS, N_CHAR_CLASSES): Now an enum, not a macro.
This is safe since the code already assumes N_CHARS fits in int.
(Filter): Remove: we want to prototype everything.
(ORD, CHR): Remove.  All uses removed.  Some replaced with:
(uchar): New function.  All places where a char must be converted
to an unsigned char are now done this way, not by ad-hoc methods.
(count): New type.  Use it whenever counts or states are needed.
(BEGIN_STATE): Increase from INT_MAX - 1 (which was bogus, anyway,
since we used it in an unsigned int context) to UINTMAX_MAX - 1.
(REPEAT_COUNT_MAXIMUM): New macro.  Use it in place of BEGIN_STATE
whenever appropriate.
(NOT_A_CHAR): Remove global macro; now a local enum.
(UL_LOWER, UL_UPPER, UL_NONE): No longer specify values, since
the rest of the code no longer depends on them.
(class_ok): Remove; all uses changed to use inline comparisons.
(RE_NO_TYPE): Remove; wasn't used or needed.
(struct List_element): normal_char and equiv_code are now unsigned
char, not int.
first_char, last_char, and the_repeated_char are now unsigned char,
not unsigned int.  repeat_count is now count, not size_t.
All uses changed.
(struct Spec_list): state is now count, not unsigned int.
lengthis now count, not size_t.
n_indefinite_repeats is now size_t, not int.
has_equiv_class, has_char_class, and has_restricted_char_class
are now bool, not int.  All uses changed.
(struct E_string): s is now char *, not unsigned char *.
escaped is now bool *, not int *.  All uses changed.
(ES_MATCH): Remove macro, replacing with:
(es_match): New inline function.  All uses changed.
(squeeze_repeats, complement, posix_pedantic, truncate_set1,
translating): Now bool, not int.
(io_buf): Now char array, not unsigned char.
(SET_TYPE): Remove.  All uses replaced with bool.
(is_equiv_class_member, unquote, append_range, append_char_class,
append_equiv_class, find_closing_delim, star_digits_closebracket,
build_spec_list, parse_str, homogeneous_spec_list):
Now returns bool, not int.  All uses changed.
(is_equiv_class_member): Now inline.
(is_equiv_class_member, is_char_class_member, make_printable_str,
append_normal_char, append_range, append_repeated_char,
get_s2_spec_stats):
Args are now of proper integer type.
(unquote, look_up_char_class, make_printable_str,
append_equiv_class, build_spec_list, squeeze_filter):
Avoid unsigned char *p; gently convert *p to unsigned char instead.
(unquote, get_spec_stats): Do not jump past declarations and then
use them; C doesn't allow this in portable programs.
(make_printable_str): Check for overflow in size calculations.
(xmemdup): Remove.  All uses rewritten.
(find_bracketed_repeat): Args are now of proper pointer-to-integer
type.  Do not reject [c*0].  Use xstrtoumax, not xstrtoul.
(find_bracketed_repeat, star_digits_closebracket): Check that the
digits are not escaped.
(build_spec_list): Don't bother to copy opnd_str; not needed.
(build_spec_list, get_next): Simplify internal logic a bit.
(card_of_complement): Fix bug due to char overflow.
(get_spec_stats): Don't assume len fits into int.
Check for integer overflow.  Use abort() rather than assert(0).
(string2_extend): Fix subscript error: is_char_class_member (..., 255)
was being invoked.
(squeeze_filter): READER is never null now; simplify code.
READER arg now has a simpler type.  Remove unnecessary casts.
(squeeze_filter, main): Calls to fwrite improperly checked result
against zero, rather than against requested size.
(plain_read): New function.
(read_and_delete, read_and_xlate):
Remove unused filter arg, and don't worry about hit_eof.
Simplify by using plain_read.
(set_initialize): Args are bool and bool *, not int and SET_TYPE *.
(main): Always pass a non-null procedure to squeeze_filter.
Rewrite so that class_ok isn't needed.
2004-05-31 10:06:23 +00:00
Jim Meyering 06fc3fc833 Work around HPUX /bin/cc compiler bug.
(card_of_complement): Use cleaner `sizeof in_set'
rather than `N_CHARS * sizeof(in_set[0])'.  Using HPUX's /bin/cc
(aC++/ANSI C B3910B A.05.55 [Dec 04 2003]) on an ia64-hp-hpux11.22
system, those two expressions are not the same (256 vs. 1024).
The effect of this problem was that `tr -c x y' would fail:
tr: when not truncating set1, string2 must be non-empty
2004-05-30 20:09:24 +00:00
Jim Meyering ca3ad6589a (dosync): Ignore EBADF errors, as IRIX 6.5
fdatasync reports EBADF when syncing (unwritable) directories.
Problem reported by Albert Chin-A-Young in:
http://lists.gnu.org/archive/html/bug-coreutils/2004-05/msg00165.html
2004-05-30 08:43:35 +00:00
Jim Meyering 97930170e8 . 2004-05-29 22:23:31 +00:00
Jim Meyering e6a2492833 (rm_option_init): Initialize new member, 2004-05-29 22:07:03 +00:00
Jim Meyering 56d5c6f7ca (rm_option_init): Initialize new member, x->require_restore_cwd. 2004-05-29 22:06:25 +00:00
Jim Meyering 8f7ac733b9 (struct rm_options) [require_restore_cwd]: New member. 2004-05-29 22:05:26 +00:00
Jim Meyering 9c29642d37 rm -r would get a failed assertion when run from an inaccessible
directory and with two or more command line arguments including an
absolute-named directory followed by a relative-named directory.

(struct cwd_state): Define.
(AD_pop_and_chdir): Redesign interface so that a restore_cwd failure
can be detected by the caller.  Instead of returning a malloc'd
directory name, communicate it to caller via a new parameter, and
return an indication of whether restore_cwd failed.  Update caller.
Eliminate an unnecessary call to AC_stack_top.
(remove_dir): Change type of cwd_state parameter to `struct cwd_state'
so we can now communicate to caller whether/how functions like
restore_cwd have failed.  Update caller.
(rm_1): Fail if we've failed to restore the working directory
and the name of the next file to remove is `.'-relative.
(rm): Fail if the require_restore_cwd flag is true and we've
failed to restore the working directory.
2004-05-29 22:04:55 +00:00
Jim Meyering 0c5b66e10c (text_buffer_maxend): Remove declarations unused variable. 2004-05-29 11:33:15 +00:00
Jim Meyering 70c5c9e8c4 (push_dir): Merge declaration and adjacent assignment into a single statement. 2004-05-28 22:31:26 +00:00
Jim Meyering 6fcceb6b02 tweak a comment 2004-05-28 22:30:40 +00:00
Jim Meyering 19387038f5 (AD_mark_helper): Eliminate unnecessary comparison. 2004-05-28 21:39:55 +00:00
Jim Meyering 3ba72c8b9c (rm): Use free rather than XFREE.
(remove_dir): Use xmalloc, not XMALLOC.
(ds_init): Likewise.
2004-05-22 16:29:20 +00:00
Jim Meyering 84b82a4aa2 Use translatable diagnostics, e.g.
change "%s: remove" to _("%s: failed to remove") and
change "%s: close"  to _("%s: failed to close").
2004-05-20 11:35:40 +00:00
Jim Meyering 40d4847f4c (names): Bring back lower-case letters, "_", and
".".  But continue to omit +, =, %, @, #, as they're either
shell metacharacters (for some shells) or are not in some
character sets, or (in the case of '%') must be a
metacharacter somewhere.
2004-05-18 15:28:27 +00:00
Jim Meyering 7f814a5e96 (cut_fields): Adjust to new signature of getndelim2. 2004-05-17 13:16:53 +00:00
Jim Meyering ee47cc09f6 (incname): Decrement `len' only once per loop iteration. 2004-05-17 12:34:36 +00:00
Jim Meyering 636a950344 chgrp and chown now dereference symlinks by default, per POSIX.
(usage): Update to reflect this.
2004-05-17 12:08:09 +00:00
Jim Meyering c2740635cd (chopt_init): Affect each symlink referent by default. 2004-05-17 12:07:48 +00:00
Jim Meyering 37adce2680 chown --dereference did nothing when the owner/group of a
symlink matched the desired owner/group.  Reported by David Malone.
Also reported in 1999 as http://bugs.debian.org/39642.

(change_file_owner): When --dereference has
been specified, and when processing a symlink, stat it to get the
owner and group of the referent.
2004-05-16 21:39:35 +00:00
Jim Meyering 3bb407ccf3 In shred, check for errors from fdatasync more carefully. If
fdatasync fails with errno==EINVAL, it means this implementation
does not support synchronized I/O for this file.  Do not report
this as an error, as (for example) AIX 5.2 fdatasync reports it
for raw disk devices.  Problem reported by Albert Chin in
<http://mail.gnu.org/archive/html/bug-gnu-utils/2004-05/msg00028.html>.

Check for write errors, though: the old code ignored them.
Improve error checking in a few other cases, too (e.g., close of a
directory).

Also, change several 'int' values to 'bool', so that the error
checking is a bit clearer.  Similarly, change unsigned values
to size_t where appropriate.

* src/shred.c: Include "dirname.h".
(datasync) [!HAVE_FDATASYNC]: Remove.
(dosync): New function.
(dopass): Use it.  Return 1 on write error, -1 on other error.
All callers changed.  Report write error if dosync does.
(do_wipefd, wipefd, wipename, wipefile): Return bool (true/false),
not int (0/-1).  All callers changed.  Return false if there's a
write error.
(incname): Return bool (true/false), not int (0/1).  Accept
size_t length, not unsigned.  All callers changed.  Do not
bother checking for non-digits; it can't happen.  Replace
recursion with iteration.
(wipename): Use dir_name, base_name, etc. instead of assuming
Unix file names.  Use size_t for length, not unsigned.
Report error if unlink or close fails.
(wipename, main): Use bool for booleans.

(names): Use only digits and uppercase letters, for greater
portability.
2004-05-16 19:32:30 +00:00
Jim Meyering c54468df2e (AD_pop_and_chdir): Eliminate an unnecessary call to AC_stack_top. 2004-05-14 15:47:53 +00:00
Jim Meyering c134ce8fab . 2004-05-14 09:16:23 +00:00
Jim Meyering 8e0b4648a6 Improve performance of `sort -m' on large files, at the cost of
making some contrived examples unsafe.  POSIX allows this
optimization.  Performance problem reported by Jonathan Baker in
<http://mail.gnu.org/archive/html/bug-coreutils/2004-05/msg00071.html>.

(first_same_file): Do not treat input pipes
differently from other files.
2004-05-14 07:34:09 +00:00
Jim Meyering 62f51917b8 (unquote, make_printable_str): Use e.g. '\a' rather than '\007',
for portability to EBCDIC hosts.
2004-05-13 07:27:10 +00:00
Jim Meyering 179af74c1a (print_esc_char): Use e.g. '\a' rather than '\007',
for portability to EBCDIC hosts.
2004-05-13 07:26:46 +00:00
Jim Meyering 364d39ccd8 (print_ascii, dump_strings): Use e.g. '\a' rather than
'\007', for portability to EBCDIC hosts.
2004-05-13 07:26:14 +00:00
Jim Meyering 50f956a0b0 Don't assume that "make -C" works; Solaris "make" doesn't have -C.
(all_programs.list): New rule, copied from
man/Makefile.am and tests/Makefile.am, except that we use the
system tr rather than ./tr and we don't use tr -s.
2004-05-13 07:03:00 +00:00
Jim Meyering 9549a2091e (AD_pop_and_chdir): Move lstat-`.' into if-block
where the result is used.  This avoids one unnecessary lstat call
per command line argument.
2004-05-12 09:35:06 +00:00
Jim Meyering 0a9f091665 Don't include "save-cwd.h". It's no longer used. 2004-05-11 16:14:11 +00:00
Jim Meyering 0837deb037 (AD_push): Don't use errno in diagnostic about `changed dev/ino'. 2004-05-10 14:27:45 +00:00
Jim Meyering 6e9bba3889 (unquote): Use xcalloc rather than xmalloc and
a loop initializing the just-allocated memory to zero.
2004-05-09 19:29:42 +00:00
Jim Meyering 2e83808dd6 Fix bug where "rm" gave up too easily, reported by Dan Jacobsen in
<http://mail.gnu.org/archive/html/bug-coreutils/2004-05/msg00013.html>.

(remove_entry): Check for errno values like ENOENT
that show the file cannot be directory, instead of for errno
values like EPERM that show the file might be a directory.  This
is necessary because, when a single unlink() call has multiple
reasons to fail, it can set errno to any of those reasons; it's
only the rare errno value like ENOENT that excludes all the other
possible reasons to fail even when the file is a directory.
(remove_cwd_entries): Don't attempt chdir if the file is known
to not be a directory.
(remove_dir): Use the same method that remove_cwd_entries uses
(for some reason they differed).  Don't assert that saved_errno
must be EPERM; it might be just about anything.
2004-05-08 12:49:22 +00:00
Jim Meyering 89bba9158d (main): Use xnmalloc, rather than xmalloc. 2004-05-06 14:51:20 +00:00
Jim Meyering e93ae52456 (main): Use xnmalloc, rather than xmalloc. 2004-05-06 14:50:17 +00:00
Jim Meyering 4d9d9f4d02 (list_entries_users): Use xnmalloc, rather than xmalloc. 2004-05-06 14:49:32 +00:00
Jim Meyering 433aacf5c6 (do_wipefd): Use xnmalloc, rather than xmalloc. 2004-05-06 14:48:07 +00:00
Jim Meyering 1c4154dbb0 (xgetgroups): Use variable name, rather than type name in computing buffer
size for xnmalloc.
2004-05-06 14:46:00 +00:00
Jim Meyering 76ef73f50a (xgetgroups): Use xnmalloc, rather than xmalloc.
Don't add `1' to the buffer size (it was to protect against malloc
implementations that fail to allocate a buffer of size zero).
That is no longer necessary, since we use a malloc wrapper
on such systems.
2004-05-06 14:43:31 +00:00
Jim Meyering 782b73c514 (main): Use xnmalloc, rather than xmalloc. 2004-05-06 14:24:50 +00:00
Jim Meyering 94c2794761 (elide_tail_bytes_pipe): Use xnmalloc, rather than xmalloc. 2004-05-06 14:24:16 +00:00
Jim Meyering 4de12cc012 (get_input_fstatus): Use xnmalloc, rather than xmalloc. 2004-05-06 14:23:08 +00:00
Jim Meyering 3145fdd1ed (show_disk, show_point): If several filesystems are
mounted on the same mount point, prefer the last one, not the first.
Problem reported by Christian Jones in
<http://mail.gnu.org/archive/html/bug-coreutils/2004-04/msg00200.html>.
(show_disk): Remove unused statp arg.  Return bool, not int.
(show_point): Rewrite to avoid gotos.  Use the same algorithm
for lofs and dummies for each pass through the mount table,
rather than subtly different algorithms (which are probably
inadvertent).
2004-05-04 07:26:33 +00:00
Jim Meyering 617884e704 . 2004-05-03 11:07:59 +00:00
Jim Meyering 83db4e147a When chown or chgrp is modifying the referent of a symlink,
use the chown(2) function, if possible.

(change_file_owner): Don't hard-code the
open/fchown/close kludge here.  Use `chown' instead.
The chown function works just fine on conforming systems.
Other systems now go through the new chown wrapper that
resorts to the old kludge.
2004-05-01 14:33:41 +00:00
Jim Meyering 27b510575d (change_file_owner): Add a comment. 2004-05-01 06:48:55 +00:00
Jim Meyering 70b9c50903 . 2004-04-29 16:03:21 +00:00
Jim Meyering 173f088735 . 2004-04-27 19:01:00 +00:00
Jim Meyering 372762d891 (syntax_table, re_syntax_table): Remove declarations of two unused
variables (they were exposed by the above change).
2004-04-27 18:39:21 +00:00