#if defined(_POSIX_VERSION)
#include <utime.h>
+#else
+struct utimbuf
+{
+ long actime;
+ long modtime;
+};
#endif
extern FILE *msg_file;
int mode;
int atime;
int mtime;
- saved_dir_info *next;
+ struct saved_dir_info *next;
};
struct saved_dir_info *saved_dir_info_head;
register char *data;
int fd, check, namelen, written, openflag;
long size;
- time_t acc_upd_times[2];
+ struct utimbuf acc_upd_times;
register int skipcrud;
register int i;
/* int sparse_ind = 0;*/
struct saved_dir_info *tmp;
/* int end_nulls; */
char **longp;
- static char *longname;
- static char *longlink;
+ char *bp;
saverec(&head); /* Make sure it sticks around */
userec(head); /* And go past it in the archive */
decode_header(head, &hstat, &head_standard, 1); /* Snarf fields */
- if(f_confirm && !confirm("extract",head->header.name)) {
+ if(f_confirm && !confirm("extract",current_file_name)) {
if (head->header.isextended)
skip_extended_headers();
skip_file((long)hstat.st_size);
* the header record.
*/
skipcrud = 0;
- while (!f_absolute_paths && '/' == head->header.name[skipcrud]) {
+ while (!f_absolute_paths
+ && '/' == current_file_name[skipcrud]) {
static int warned_once = 0;
skipcrud++; /* Force relative path */
default:
msg("Unknown file type '%c' for %s, extracted as normal file",
- head->header.linkflag, skipcrud+head->header.name);
+ head->header.linkflag, skipcrud+current_file_name);
/* FALL THRU */
/*
* Appears to be a file.
* See if it's really a directory.
*/
- namelen = strlen(skipcrud+head->header.name)-1;
- if (head->header.name[skipcrud+namelen] == '/')
+ namelen = strlen(skipcrud+current_file_name)-1;
+ if (current_file_name[skipcrud+namelen] == '/')
goto really_dir;
/* FIXME, deal with protection issues */
fd = 1;
goto extract_file;
}
- #ifdef O_CTG
+#ifdef O_CTG
/*
* Contiguous files (on the Masscomp) have to specify
* the size in the open call that creates them.
*/
if (head->header.linkflag == LF_CONTIG)
- fd = open(skipcrud+head->header.name, openflag | O_CTG,
- hstat.st_mode, hstat.st_size);
+ fd = open((longname ? longname : head->header.name)
+ + skipcrud,
+ openflag | O_CTG,
+ hstat.st_mode, hstat.st_size);
else
- #endif
+#endif
{
- #ifdef NO_OPEN3
+#ifdef NO_OPEN3
/*
* On raw V7 we won't let them specify -k (f_keep), but
* we just bull ahead and create the files.
*/
- fd = creat(skipcrud+head->header.name,
- hstat.st_mode);
- #else
+ fd = creat((longname
+ ? longname
+ : head->header.name) + skipcrud,
+ hstat.st_mode);
+#else
/*
* With 3-arg open(), we can do this up right.
*/
- fd = open(skipcrud+head->header.name, openflag,
- hstat.st_mode);
- #endif
+ fd = open(skipcrud + current_file_name,
+ openflag, hstat.st_mode);
+#endif
}
if (fd < 0) {
- if (make_dirs(skipcrud+head->header.name))
+ if (make_dirs(skipcrud + current_file_name))
goto again_file;
- msg_perror("Could not create file %s",skipcrud+head->header.name);
+ msg_perror("Could not create file %s",
+ skipcrud + current_file_name);
if (head->header.isextended)
skip_extended_headers();
skip_file((long)hstat.st_size);
* that happen to contain the filename will look
* REAL interesting unless we do this.
*/
- namelen = strlen(skipcrud+head->header.name);
+ namelen = strlen(skipcrud + current_file_name);
name = (char *) malloc((sizeof(char)) * namelen);
- bcopy(skipcrud+head->header.name, name, namelen);
+ bcopy(skipcrud+current_file_name, name, namelen);
size = hstat.st_size;
- extract_sparse_file(fd, &size, hstat.st_size,
- name);
+ extract_sparse_file(fd, &size, hstat.st_size, name);
}
else
for (size = hstat.st_size;
numbytes;*/
if(f_multivol) {
- save_name=head->header.name;
+ save_name=current_file_name;
save_totsize=hstat.st_size;
save_sizeleft=size;
}
* Print it, skip to next file in archive.
*/
if(check<0)
- msg_perror("couldn't write to file %s",skipcrud+head->header.name);
+ msg_perror("couldn't write to file %s",
+ skipcrud + current_file_name);
else
- msg("could only write %d of %d bytes to file %s",written,check,skipcrud+head->header.name);
+ msg("could only write %d of %d bytes to file %s",
+ written,check,skipcrud + current_file_name);
skip_file((long)(size - written));
break; /* Still do the close, mod time, chmod, etc */
}
}*/
check = close(fd);
if (check < 0) {
- msg_perror("Error while closing %s",skipcrud+head->header.name);
+ msg_perror("Error while closing %s",
+ skipcrud + current_file_name);
}
* user; if running as root, we extract as the original owner.
*/
if (we_are_root || f_do_chown) {
- if (chown(skipcrud+head->header.name, hstat.st_uid,
- hstat.st_gid) < 0) {
- msg_perror("cannot chown file %s to uid %d gid %d",skipcrud+head->header.name,hstat.st_uid,hstat.st_gid);
+ if (chown(skipcrud + current_file_name,
+ hstat.st_uid, hstat.st_gid) < 0) {
+ msg_perror("cannot chown file %s to uid %d gid %d",
+ skipcrud + current_file_name,
+ hstat.st_uid,hstat.st_gid);
}
}
if (!f_modified) {
/* fixme if f_gnudump should set ctime too, but how? */
if(f_gnudump)
- acc_upd_times[0]=hstat.st_atime;
- else acc_upd_times[0] = now; /* Accessed now */
- acc_upd_times[1] = hstat.st_mtime; /* Mod'd */
- if (utime(skipcrud+head->header.name,
- acc_upd_times) < 0) {
- msg_perror("couldn't change access and modification times of %s",skipcrud+head->header.name);
+ acc_upd_times.actime=hstat.st_atime;
+ else
+ acc_upd_times.actime = now; /* Accessed now */
+ acc_upd_times.modtime = hstat.st_mtime; /* Mod'd */
+ if (utime(skipcrud + current_file_name,
+ &acc_upd_times) < 0) {
+ msg_perror("couldn't change access and modification times of %s",skipcrud + current_file_name);
}
}
/* We do the utime before the chmod because some versions of
*/
if ((!f_keep)
|| (hstat.st_mode & (S_ISUID|S_ISGID|S_ISVTX))) {
- if (chmod(skipcrud+head->header.name,
- notumask & (int)hstat.st_mode) < 0) {
- msg_perror("cannot change mode of file %s to %ld",skipcrud+head->header.name,notumask & (int)hstat.st_mode);
+ if (chmod(skipcrud + current_file_name,
+ notumask & (int)hstat.st_mode) < 0) {
+ msg_perror("cannot change mode of file %s to %ld",
+ skipcrud + current_file_name,
+ notumask & (int)hstat.st_mode);
}
}
{
struct stat st1,st2;
- check = link (head->header.linkname,
- skipcrud+head->header.name);
+ check = link (current_link_name, skipcrud + current_file_name);
+
if (check == 0)
break;
- if (make_dirs(skipcrud+head->header.name))
+ if (make_dirs(skipcrud + current_file_name))
goto again_link;
if(f_gnudump && errno==EEXIST)
break;
- if( stat(head->header.linkname, &st1) == 0
- && stat(skipcrud+head->header.name, &st2)==0
+ if(stat(current_link_name, &st1) == 0
+ && stat(current_file_name + skipcrud, &st2)==0
&& st1.st_dev==st2.st_dev
&& st1.st_ino==st2.st_ino)
break;
msg_perror("Could not link %s to %s",
- skipcrud+head->header.name,head->header.linkname);
+ skipcrud + current_file_name,
+ current_link_name);
}
break;
#ifdef S_ISLNK
case LF_SYMLINK:
again_symlink:
- check = symlink(head->header.linkname,
- skipcrud+head->header.name);
+ check = symlink(current_link_name,
+ skipcrud + current_file_name);
/* FIXME, don't worry uid, gid, etc... */
if (check == 0)
break;
- if (make_dirs(skipcrud+head->header.name))
+ if (make_dirs(current_file_name + skipcrud))
goto again_symlink;
- msg_perror("Could not create symlink to %s",head->header.linkname);
+ msg_perror("Could not create symlink to %s",
+ current_link_name);
break;
#endif
#endif
#if defined(S_IFCHR) || defined(S_IFBLK)
make_node:
- check = mknod(skipcrud+head->header.name,
+ check = mknod(current_file_name + skipcrud,
(int) hstat.st_mode, (int) hstat.st_rdev);
if (check != 0) {
- if (make_dirs(skipcrud+head->header.name))
+ if (make_dirs(skipcrud + current_file_name))
goto make_node;
- msg_perror("Could not make %s",skipcrud+head->header.name);
+ msg_perror("Could not make %s",
+ current_file_name + skipcrud);
break;
};
goto set_filestat;
/* If local system doesn't support FIFOs, use default case */
case LF_FIFO:
make_fifo:
- check = mkfifo(skipcrud+head->header.name,
+ check = mkfifo(current_file_name + skipcrud,
(int) hstat.st_mode);
if (check != 0) {
- if (make_dirs(skipcrud+head->header.name))
- goto make_fifo;
- msg_perror("Could not make %s",skipcrud+head->header.name);
- break;
+ if (make_dirs(current_file_name + skipcrud))
+ goto make_fifo;
+ msg_perror("Could not make %s",
+ skipcrud + current_file_name);
+ break;
};
- goto set_filestat;
+ goto set_filestat;
#endif
case LF_DIR:
case LF_DUMPDIR:
- namelen = strlen(skipcrud+head->header.name)-1;
+ namelen = strlen(current_file_name) + skipcrud - 1;
really_dir:
/* Check for trailing /, and zap as many as we find. */
- while (namelen && head->header.name[skipcrud+namelen] == '/')
- head->header.name[skipcrud+namelen--] = '\0';
+ while (namelen
+ && current_file_name[skipcrud+namelen] == '/')
+ current_file_name[skipcrud+namelen--] = '\0';
if(f_gnudump) { /* Read the entry and delete files
that aren't listed in the archive */
gnu_restore(skipcrud);
again_dir:
- check = mkdir(skipcrud+head->header.name,
+ check = mkdir(skipcrud+current_file_name,
(we_are_root ? 0 : 0300) | (int)hstat.st_mode);
if (check != 0) {
struct stat st1;
- if (make_dirs(skipcrud+head->header.name))
+ if (make_dirs(skipcrud+current_file_name))
goto again_dir;
/* If we're trying to create '.', let it be. */
- if (head->header.name[skipcrud+namelen] == '.' &&
+ if (current_file_name[skipcrud+namelen] == '.' &&
(namelen==0 ||
- head->header.name[skipcrud+namelen-1]=='/'))
+ current_file_name[skipcrud+namelen-1]=='/'))
goto check_perms;
if( errno==EEXIST
- && stat(skipcrud+head->header.name,&st1)==0
+ && stat(skipcrud+current_file_name,&st1)==0
&& (S_ISDIR(st1.st_mode)))
break;
- msg_perror("Could not create directory %s",skipcrud+head->header.name);
+ msg_perror("Could not create directory %s",skipcrud+current_file_name);
break;
}
if (!we_are_root && 0300 != (0300 & (int) hstat.st_mode)) {
hstat.st_mode |= 0300;
msg("Added write and execute permission to directory %s",
- skipcrud+head->header.name);
+ skipcrud+current_file_name);
}
if (f_modified)
goto set_filestat;
- tmp = malloc (sizeof (struct saved_dir_info));
- tmp->path = malloc (strlen (skipcrud + head->header.name) + 1);
- strcpy (tmp->path, skipcrud + head->header.name);
+ tmp = (struct saved_dir_info *) malloc (sizeof (struct saved_dir_info));
+ tmp->path = malloc (strlen (skipcrud + current_file_name) + 1);
+ strcpy (tmp->path, skipcrud + current_file_name);
tmp->mode = hstat.st_mode;
tmp->atime = hstat.st_atime;
tmp->mtime = hstat.st_mtime;
saved_dir_info_head = tmp;
case LF_VOLHDR:
if(f_verbose) {
- printf("Reading %s\n",head->header.name);
+ printf("Reading %s\n", current_file_name);
}
break;
break;
case LF_MULTIVOL:
- msg("Can't extract '%s'--file is continued from another volume\n",head->header.name);
+ msg("Can't extract '%s'--file is continued from another volume\n",current_file_name);
skip_file((long)hstat.st_size);
break;
case LF_LONGNAME:
- longp = &longname;
- goto extract_long;
-
- case LF_LONGLINK
- longp = &longlink;
- extract_long:
-
- if (*longp)
- free (*longp);
- *longp = ck_malloc (hstat.st_size);
-
- /* This loop is copied from the extract_file label above;
- as a result, some of the variable names (like `written')
- might be confusing. */
- for (size = hstat.st_size;
- size > 0;
- size -= written)
- {
-
-
-
- }
-
+ case LF_LONGLINK:
+ msg ("Visible long name error\n");
+ skip_file ((long)hstat.st_size);
+ break;
+ }
+
/* We don't need to save it any longer. */
saverec((union record **) 0); /* Unsave it */
}
/* Set back the utime and mode for all the extracted directories. */
void restore_saved_dir_info ()
{
- time_t acc_upd_times[2];
- saved_dir_info *tmp;
+ struct utimbuf acc_upd_times;
+ struct saved_dir_info *tmp;
- while (saved_info_head != NULL)
+ while (saved_dir_info_head != NULL)
{
/* fixme if f_gnudump should set ctime too, but how? */
if(f_gnudump)
- acc_upd_times[0]=saved_info_head -> atime;
- else acc_upd_times[0] = now; /* Accessed now */
- acc_upd_times[1] = saved_info_head -> mtime; /* Mod'd */
- if (utime(saved_info_head -> path, acc_upd_times) < 0) {
+ acc_upd_times.actime=saved_dir_info_head -> atime;
+ else
+ acc_upd_times.actime = now; /* Accessed now */
+ acc_upd_times.modtime = saved_dir_info_head -> mtime; /* Mod'd */
+ if (utime(saved_dir_info_head -> path, &acc_upd_times) < 0) {
msg_perror("couldn't change access and modification times of %s",
- saved_info_head -> path);
+ saved_dir_info_head -> path);
}
- if ((!f_keep) || (saved_info_head -> mode & (S_ISUID|S_ISGID|S_ISVTX)))
+ if ((!f_keep) || (saved_dir_info_head -> mode & (S_ISUID|S_ISGID|S_ISVTX)))
{
- if (chmod(saved_info_head -> path,
- notumask & saved_info_head -> mode) < 0) {
+ if (chmod(saved_dir_info_head -> path,
+ notumask & saved_dir_info_head -> mode) < 0) {
msg_perror("cannot change mode of file %s to %ld",
- saved_info_head -> path,
- notumask & saved_info_head -> mode);
+ saved_dir_info_head -> path,
+ notumask & saved_dir_info_head -> mode);
}
}
- saved_info_head = saved_info_head -> next;
+ saved_dir_info_head = saved_dir_info_head -> next;
}
}
projects / chaz / tar / blobdiff