Commit Graph
154 Commits
Author SHA1 Message Date
Jim Meyering fc80caecd8 (triple_hash, triple_hash_no_name): Adjust to reflect
type changes (unsigned int -> size_t) in hash.c.
2003-10-25 15:34:01 +00:00
Jim Meyering 498de26ac5 (copy_internal): Don't #ifdef-out simple uses of
S_ISLNK or S_ISSOCK.  The S_IS* macros are guaranteed to be defined
via system.h.
2003-10-12 07:03:57 +00:00
Jim Meyering 819f39dc9b Remove unnecessary cast of alloca, since now it's guaranteed to be (void *). 2003-09-28 08:17:39 +00:00
Jim Meyering f29d0b1c91 Alphabetize includes.
Remove duplicate inclusion of "same.h".
2003-09-09 17:25:02 +00:00
Jim Meyering 97bf7dae4f When source and destination arguments refer to the same file, reside
on a partition (e.g. VFAT) on which distinct names may refer to the
same directory entry (often due to variations in case), and when the
link count for the file is 1, mv no longer unlinks the file.
FIXME: this is a band-aid fix.  If the file happens to have a link
count of 2 or greater, mv will still unlink it.

(same_file_ok): Invoke same_name (which might still
return false for names that refer to the same directory entry)
only if the link count is 2 or more.
2003-08-30 18:13:23 +00:00
Jim Meyering 9b51a5db83 Include utimens.h.
(copy_internal): Set file timestamps with utimens, not utime.
2003-08-09 17:48:41 +00:00
Jim Meyering b220480e9d Tweak comment: Solaris2.5.1 -> Solaris 2.5.1 2003-07-23 06:38:18 +00:00
Jim Meyering 64521cfa9a It appears that the `#pragma alloca' included via "system.h" is
adequate, since join.c uses alloca, yet lacked an in-file #pragma.

Remove `#pragma alloca'.
2003-07-12 11:38:43 +00:00
Jim Meyering 5fe0d2293d (copy_internal) [HAVE_STRUCT_STAT_ST_AUTHOR]:
Use `error_t' (rather than int) as type for local `err'.
2003-06-19 22:01:47 +00:00
Jim Meyering f0a5712f74 (copy_internal) [HAVE_STRUCT_STAT_ST_AUTHOR]:
Fix author preservation code.
2003-06-19 21:17:48 +00:00
Jim Meyering 3b7798ab52 (struct F_triple) [name]: Remove const attribute.
(triple_free): Don't apply cast to argument of free.
(seen_file): Add cast here instead.
2003-05-13 14:45:00 +00:00
Jim Meyering 6c93bdeeaa Remove anachronistic casts of xmalloc,
xrealloc, and xcalloc return values and of xrealloc's first argument.
2003-04-11 10:51:56 +00:00
Jim Meyering fc6073d633 Because of inappropriate (but POSIX-mandated) behavior of rename,
`mv a b' would not remove `a' in some unusual cases.  Work around
this by unlinking `a' when necessary.

(same_file_ok): Add an output parameter.
Set it in the offending case.
(copy_internal): When necessary, unlink SRC_PATH and inform caller.
2003-04-04 21:53:27 +00:00
Jim Meyering 8c0f326660 (copy_internal) [un_backup]: When recovering from a
failure to create a hard link, do not remove the entry associating
the source dev/ino with the destination file name.
2003-03-02 06:09:28 +00:00
Jim Meyering a1d2e330ec (copy_internal): When link fails because of an
existing destination file, unlink that file and try again.
2003-02-28 21:36:18 +00:00
Jim Meyering a5f14f167e Remove all uses of `PARAMS'. 2002-12-15 20:54:29 +00:00
Jim Meyering 6daabb7578 In move mode, always first try to rename. Before, upon failure to
rename a directory, this code would never attempt to rename any
other file in that directory, but would thenceforth always copy.
On some systems (NetApp version ??), renaming a directory may fail
with EXDEV, yet renaming files within that directory to a newly-
created destination directory succeeds.

(copy_internal): Remove local, move_mode;
use x->move_mode instead.  Based on a patch from Tom Haynes.
2002-09-29 08:43:19 +00:00
Jim Meyering bcfbac9349 (copy_internal): Use file_name_lookup, not getdport.
Patch by Alfred M. Szmidt.
2002-07-20 20:06:41 +00:00
Jim Meyering 071b36fd90 Change all `preserving ...' diagnostics to
`failed to preserve ...' to make the failure clearer.
2002-06-21 12:10:02 +00:00
Jim Meyering d7313803f0 Include hurd.h.
(copy_internal): Preserve the stat.st_author field.
2002-06-21 12:06:17 +00:00
Jim Meyering e913eebe7c (copy_reg): Use a temporary to avoid a warning
from gcc -W about comparison between signed and unsigned.
(copy_internal): Likewise, but use a cast.
2002-05-30 07:49:56 +00:00
Jim Meyering 9211474a6e (copy_internal): Move the block that sets `earlier_file'
down to just before the first use of that variable.  Otherwise, it was
possible to make mv (and probably cp, too) malfunction when copying
hard-linked files into a directory containing at least one of the
source file names.  Call forget_created everywhere thereafter where
this function returns without creating a destination file that might
subsequently be linked.  Reported by Iida Yosiaki.
2002-03-30 07:10:57 +00:00
Jim Meyering 73c74c33e6 use only one space after semicolon 2002-03-19 08:49:28 +00:00
Jim Meyering b3354081ac (copy_internal) [move_mode]: Give a better diagnostic
(using errno from the failed unlink) when a cross-device `mv'
fails, e.g., because the destination cannot be unlinked.
Prompted by a report from Karl Berry.
2002-03-17 16:00:54 +00:00
Jim Meyering ae5a552bf1 (copy_reg): Don't exit upon finding a replaced file.
Instead, just skip it like the diagnostic says.
Reported by Paul Eggert.
2002-03-10 08:28:30 +00:00
Jim Meyering 0d4eeae035 (copy_reg): Use a more concise diagnostic for
reporting replaced files.  This avoids a bug in the code,
which mishandled ino_t wider than long.
2002-03-10 08:26:48 +00:00
Jim Meyering 337e4b174d (copy_internal): Remove -r warning; no longer needed. 2002-03-03 22:29:31 +00:00
Jim Meyering 3c3e5c4a31 add a comment 2002-03-02 17:17:49 +00:00
Jim Meyering e2497bb4fd (copy_internal): For each symlink copied by cp -r,
issue a warning that `cp -r' is not portable.
2002-03-02 17:16:42 +00:00
Jim Meyering dea4262fa6 (copy_reg): Detect abuse of a race condition
whereby an unprivileged user could gain read access to otherwise-
inaccessible files when root uses cp or mv to copy a hierarchy
belonging to that user.
2002-03-02 08:38:47 +00:00
Jim Meyering f57432bb1d tweak comment 2002-02-26 08:32:56 +00:00
Jim Meyering 50c1199e09 (copy_reg): Don't treat errno==ENOENT as a special case.
(same_file_ok): Detect a case that would have lead to the errno==ENOENT
condition above (and a misleading diagnostic), and return 0 so we give
a diagnostic about the source and destination being the same file.
(copy_internal): Use an explicit test for errno==EXDEV to detect
that rename has failed because source and destination are on
different devices.  This reverts part of a change from 1997-12-13,
and is to avoid letting a race condition evoke a bogus diagnostic.
Note that while POSIX has encouraged the errno==EXDEV test for
years, it was inadequate back in 1997.	I'm hoping that many
more systems have conforming support these days.
Reported by Michael Gaughen <mgaughen@polyserve.com>
2002-01-12 22:29:55 +00:00
Jim Meyering 507e4c7e69 (triple_hash_no_name): New function.
(src_info_init): New function.
(copy_internal): Warn and return early for the second and subsequent
occurrences of the same source file named on the command line.
2001-11-22 19:45:27 +00:00
Jim Meyering 7a0fd15ee7 (seen_file): Change type of `stats' parameter to pointer.
(copy_internal): Update caller.
2001-11-22 12:25:09 +00:00
Jim Meyering 31bfafc32e (struct F_triple): Rename from dest_info.
(seen_file): Rename from seen_dest.  Rename parameters accordingly.
(record_file): Rename from record_dest.  Rename parameters accordingly.
(triple_hash): Rename from dest_info_hash.
(triple_compare): Rename from dest_info_compare.
(triple_free): Rename from dest_info_free.
2001-11-22 12:22:46 +00:00
Jim Meyering 6f1ebf7e68 copy.c shouldn't maintain static state.
(dest_info): Remove declaration of file-scoped global.
(dest_info_init): Require a parameter.
Update all callers.
(seen_dest): Require a hash table parameter.  Update callers.
(record_dest): Likewise.
2001-11-22 10:52:15 +00:00
Jim Meyering e735c8f6e0 yikes. put the preserve_metadata assignment *after* declarations.
gcc-3.0 didn't complain.
2001-10-21 18:50:16 +00:00
Jim Meyering b9bda3c30d Include xreadlink.h.
(copy_internal): Don't use PATH_MAX.
Rewrite the symlink-copying code to use xreadlink.
2001-10-21 15:21:28 +00:00
Jim Meyering a7870f9997 (dest_info_free): New function.
(dest_info_init): Make the hash table code use it.
(record_dest): Store each DEST in malloc'd  memory.  Hence the above.
Use dest_info_free to free the `ent' we couldn't insert.
2001-10-18 07:42:11 +00:00
Jim Meyering d78d5d448f (copy_internal): Tighten up and add comments
describing the test for when to record (via remember_copied)
a <dst_path, source_dev, source_ino> triple.
Relax the test that guards the hard-linked-dir check and
the hard-link-preserving code.
2001-10-13 20:53:36 +00:00
Jim Meyering b604e6b1f1 * src/copy.h (struct cp_options): Rename members:
s/preserve_owner_and_group/preserve_ownership/, and
s/preserve_chmod_bits/preserve_mode/.
* src/copy.c, src/cp.c, src/install.c, src/mv.c: Update all uses.
2001-10-13 17:24:09 +00:00
Jim Meyering 3cff443b59 (copy_dir): Now that remember_copied copies the
file name, free the temporary `dst_path' allocated here.
2001-10-07 08:40:00 +00:00
Jim Meyering f5b2352264 (record_dest): Fix test for whether to free `ent'.
Thank heavens for regression tests.
2001-10-06 17:07:15 +00:00
Jim Meyering 706a45c0b8 (record_dest): Avoid a small leak.
(copy_internal): Call remember_copied only for if the source file
has 1 < st_nlink, or if it's a directory.
Now that EARLIER_FILE is set conditionally, initialize it to NULL.
2001-10-06 16:43:07 +00:00
Jim Meyering 175e677c82 Include hash-pjw.h and remove definition of hash_pjw. 2001-10-05 11:46:57 +00:00
Jim Meyering 10a482fd41 (copy_internal): Call record_dest for all types of
files (for which this makes sense), not just regular ones.
2001-09-29 09:35:01 +00:00
Jim Meyering 9d0fbdaf36 Include "hash.h" and "same.h".
(struct Dest_info): Define.
(dest_info): Declare global.
(DEST_INFO_INITIAL_CAPACITY): Define.
(hash_pjw): New function.
(dest_info_hash): Likewise.
(dest_info_compare): Likewise.
(dest_info_init): Likewise.
(seen_dest): Likewise.
(record_dest): Likewise.
(copy_internal): If the destination exists, fail if it's in the set
of files that have already been created as part of this mv or cp.
(copy_internal) [move_mode]: Record the destination dev/ino/filename.
(copy_internal) [!move_mode, regular file]: Likewise.
2001-09-28 19:51:19 +00:00
Jim Meyering 3939790637 Mostly clean-up (modulo the better diagnostic).
(copy_internal): Rename parameter, move_mode, to
command_line_arg, and adjust caller.  Now, move_mode is a local
that is derived from command_line_arg.
Factor some involved code to produce something slightly more readable.
Use x->move_mode, not move_mode in determining which diagnostic
to give (`backing up %s would destroy source;  %s not moved').
2001-09-22 08:27:27 +00:00
Jim Meyering e1e70abfab (UNWRITABLE): Define (factored out of copy_internal).
(copy_internal): Use UNWRITABLE.
2001-09-15 12:46:05 +00:00
Jim Meyering cb40817c27 (copy_internal) [move_mode]: Support the new
--reply=... option.
2001-09-15 12:34:17 +00:00