#include "system.h"
-#include <time.h>
-#ifndef time
-time_t time ();
-#endif
-
#if HAVE_UTIME_H
# include <utime.h>
#else
#include "common.h"
-static time_t now; /* current time */
static int we_are_root; /* true if our effective uid == 0 */
static mode_t newdir_umask; /* umask when creating new directories */
static mode_t current_umask; /* current umask (which is set to 0 if -p) */
-#if 0
-/* "Scratch" space to store the information about a sparse file before
- writing the info into the header or extended header. */
-struct sp_array *sparsearray;
-
-/* Number of elts storable in the sparsearray. */
-int sp_array_size = 10;
-#endif
-
struct delayed_set_stat
{
struct delayed_set_stat *next;
void
extr_init (void)
{
- now = time (0);
we_are_root = geteuid () == 0;
+ same_permissions_option += we_are_root;
+ same_owner_option += we_are_root;
/* Option -p clears the kernel umask, so it does not affect proper
restoration of file permissions. New intermediate directories will
comply with umask at start of program. */
newdir_umask = umask (0);
- if (same_permissions_option)
+ if (0 < same_permissions_option)
current_umask = 0;
else
{
normal, we merely skip the chmod. This works because we did umask (0)
when -p, so umask will have left the specified mode alone. */
- if ((we_are_root || same_permissions_option)
+ if (0 < same_permissions_option
&& ((!keep_old_files_option && !unlink_first_option)
|| (stat_info->st_mode & (S_ISUID | S_ISGID | S_ISVTX))))
if (chmod (file_name, ~current_umask & stat_info->st_mode) < 0)
if (incremental_option)
utimbuf.actime = stat_info->st_atime;
else
- utimbuf.actime = now;
+ utimbuf.actime = start_time;
utimbuf.modtime = stat_info->st_mtime;
extract as the original owner. Or else, if we are running as a user,
leave the owner and group as they are, so we extract as that user. */
- if (we_are_root || same_owner_option)
+ if (0 < same_owner_option)
{
-#if HAVE_LCHOWN
-
/* When lchown exists, it should be used to change the attributes of
the symbolic link itself. In this case, a mere chown would change
the attributes of the file the symbolic link is pointing to, and
if (symlink_flag)
{
+#if HAVE_LCHOWN
if (lchown (file_name, stat_info->st_uid, stat_info->st_gid) < 0)
ERROR ((0, errno, _("%s: Cannot lchown to uid %lu gid %lu"),
file_name,
(unsigned long) stat_info->st_uid,
(unsigned long) stat_info->st_gid));
+#endif
}
else
{
file_name,
(unsigned long) stat_info->st_uid,
(unsigned long) stat_info->st_gid));
- }
-
-#else /* not HAVE_LCHOWN */
-
- if (!symlink_flag)
-
- if (chown (file_name, stat_info->st_uid, stat_info->st_gid) < 0)
- ERROR ((0, errno, _("%s: Cannot chown to uid %lu gid %lu"),
- file_name,
- (unsigned long) stat_info->st_uid,
- (unsigned long) stat_info->st_gid));
-#endif/* not HAVE_LCHOWN */
-
- if (!symlink_flag)
-
- /* On a few systems, and in particular, those allowing to give files
- away, changing the owner or group destroys the suid or sgid bits.
- So let's attempt setting these bits once more. */
-
- if (stat_info->st_mode & (S_ISUID | S_ISGID | S_ISVTX))
- set_mode (file_name, stat_info);
+ /* On a few systems, and in particular, those allowing to give files
+ away, changing the owner or group destroys the suid or sgid bits.
+ So let's attempt setting these bits once more. */
+ if (stat_info->st_mode & (S_ISUID | S_ISGID | S_ISVTX))
+ set_mode (file_name, stat_info);
+ }
}
}
break;
}
- errno = saved_errno; /* FIXME: errno should be read-only */
+ errno = saved_errno;
return did_something; /* tell them to retry if we made one */
}
for (counter = 0; counter < SPARSES_IN_OLDGNU_HEADER; counter++)
{
- sparsearray[counter].offset =
- OFF_FROM_CHARS (current_header->oldgnu_header.sp[counter].offset);
- sparsearray[counter].numbytes =
- SIZE_FROM_CHARS (current_header->oldgnu_header.sp[counter].numbytes);
+ struct sparse const *s = ¤t_header->oldgnu_header.sp[counter];
+ sparsearray[counter].offset = OFF_FROM_HEADER (s->offset);
+ sparsearray[counter].numbytes = SIZE_FROM_HEADER (s->numbytes);
if (!sparsearray[counter].numbytes)
break;
}
}
for (counter = 0; counter < SPARSES_IN_SPARSE_HEADER; counter++)
{
+ struct sparse const *s = &exhdr->sparse_header.sp[counter];
if (counter + ind > sp_array_size - 1)
{
/* Realloc the scratch area since we've run out of
xrealloc (sparsearray,
sp_array_size * sizeof (struct sp_array));
}
- if (exhdr->sparse_header.sp[counter].numbytes[0] == 0)
+ if (s->numbytes[0] == 0)
break;
sparsearray[counter + ind].offset =
- OFF_FROM_CHARS (exhdr->sparse_header.sp[counter].offset);
+ OFF_FROM_HEADER (s->offset);
sparsearray[counter + ind].numbytes =
- SIZE_FROM_CHARS (exhdr->sparse_header.sp[counter].numbytes);
+ SIZE_FROM_HEADER (s->numbytes);
}
if (!exhdr->sparse_header.isextended)
break;
if (written > size)
written = size;
- errno = 0; /* FIXME: errno should be read-only */
+ errno = 0;
sstatus = full_write (fd, data_block->buffer, written);
set_next_block_after ((union block *)
if (stat (CURRENT_FILE_NAME, &st1) == 0 && S_ISDIR (st1.st_mode))
goto check_perms;
- errno = saved_errno; /* FIXME: errno should be read-only */
+ errno = saved_errno;
}
if (maybe_recoverable (CURRENT_FILE_NAME))