#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
int status;
for (cursor = strchr (file_name, '/');
- cursor != NULL;
+ cursor;
cursor = strchr (cursor + 1, '/'))
{
/* Avoid mkdir of empty string, if leading or double '/'. */
while (*sizeleft > 0)
{
union block *data_block = find_next_block ();
- if (data_block == NULL)
+ if (! data_block)
{
ERROR ((0, 0, _("Unexpected EOF on archive file")));
return;
case GNUTYPE_SPARSE:
sp_array_size = 10;
- sparsearray = (struct sp_array *)
+ sparsearray =
xmalloc (sp_array_size * sizeof (struct sp_array));
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
room. */
sp_array_size *= 2;
- sparsearray = (struct sp_array *)
+ sparsearray =
xrealloc (sparsearray,
- sp_array_size * (sizeof (struct sp_array)));
+ 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;
#else /* not O_CTG */
if (typeflag == CONTTYPE)
{
- static int conttype_diagnosed = 0;
+ static int conttype_diagnosed;
if (!conttype_diagnosed)
{
REAL interesting unless we do this. */
name_length_bis = strlen (CURRENT_FILE_NAME) + 1;
- name = (char *) xmalloc (name_length_bis);
+ name = xmalloc (name_length_bis);
memcpy (name, CURRENT_FILE_NAME, name_length_bis);
size = current_stat.st_size;
extract_sparse_file (fd, &size, current_stat.st_size, name);
worked. */
data_block = find_next_block ();
- if (data_block == NULL)
+ if (! data_block)
{
ERROR ((0, 0, _("Unexpected EOF on archive file")));
break; /* FIXME: What happens, then? */
}
if (multi_volume_option)
- assign_string (&save_name, NULL);
+ assign_string (&save_name, 0);
/* If writing to stdout, don't try to do anything to the filename;
it doesn't exist, or we don't want to touch it anyway. */
#else
{
- static int warned_once = 0;
+ static int warned_once;
if (!warned_once)
{
}
#if !MSDOS
- /* MSDOS does not associate timestamps with directories. In this
+ /* MSDOS does not associate time stamps with directories. In this
case, no need to try delaying their restoration. */
if (touch_option)
else
{
- data = ((struct delayed_set_stat *)
- xmalloc (sizeof (struct delayed_set_stat)));
+ data = xmalloc (sizeof (struct delayed_set_stat));
data->file_name = xstrdup (CURRENT_FILE_NAME);
data->stat_info = current_stat;
data->next = delayed_set_stat_head;
{
struct delayed_set_stat *data;
- while (delayed_set_stat_head != NULL)
+ while (delayed_set_stat_head)
{
data = delayed_set_stat_head;
delayed_set_stat_head = delayed_set_stat_head->next;