mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2025-01-07 16:43:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

(copy_reg): Move declaration of local, `n_read', into

Browse Source 
the scope where it's used.
(copy_internal): In calling copy_reg, pass not the raw `src_mode',
but the possibly-umask-relative mode, `get_dest_mode (x, src_mode)'.
This commit is contained in:
Jim Meyering 2000-08-14 09:58:25 +00:00
parent d927d60b36
commit 0f8dd3a954
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/copy.c
View File

@ -169,7 +169,6 @@ copy_reg (const char *src_path, const char *dst_path,
int buf_size;
int dest_desc;
int source_desc;
int n_read;
struct stat sb;
char *cp;
int *ip;
@ -241,7 +240,7 @@ copy_reg (const char *src_path, const char *dst_path,
for (;;)
{
n_read = read (source_desc, buf, buf_size);
int n_read = read (source_desc, buf, buf_size);
if (n_read < 0)
{
#ifdef EINTR
@ -815,8 +814,10 @@ copy_internal (const char *src_path, const char *dst_path,
{
copied_as_regular = 1;
/* POSIX says the permission bits of the source file must be
used as the 3rd argument in the open call. */
if (copy_reg (src_path, dst_path, x->sparse_mode, src_mode))
used as the 3rd argument in the open call, but that's not consistent
with historical practice. */
if (copy_reg (src_path, dst_path, x->sparse_mode,
get_dest_mode (x, src_mode)))
goto un_backup;
}
else