X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fextract.c;h=0ed41532592c683bec9a905e2ad749bf6c080957;hb=488430f739e8230e852f88bdd5086f0a47b8eba0;hp=1731b3a8237e976af3c085dbbedac8d4a4438774;hpb=87fa28ed2abd92693a08e58523d7ab7f7c4563f0;p=chaz%2Ftar diff --git a/src/extract.c b/src/extract.c index 1731b3a..0ed4153 100644 --- a/src/extract.c +++ b/src/extract.c @@ -1,7 +1,7 @@ /* Extract files from a tar archive. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000, - 2001, 2003 Free Software Foundation, Inc. + 2001, 2003, 2004 Free Software Foundation, Inc. Written by John Gilmore, on 1985-11-19. @@ -315,11 +315,11 @@ delay_set_stat (char const *file_name, struct stat const *stat_info, } /* Update the delayed_set_stat info for an intermediate directory - created on the path to DIR_NAME. The intermediate directory turned + created within the file name of DIR. The intermediate directory turned out to be the same as this directory, e.g. due to ".." or symbolic links. *DIR_STAT_INFO is the status of the directory. */ static void -repair_delayed_set_stat (char const *dir_name, +repair_delayed_set_stat (char const *dir, struct stat const *dir_stat_info) { struct delayed_set_stat *data; @@ -344,7 +344,7 @@ repair_delayed_set_stat (char const *dir_name, } ERROR ((0, 0, _("%s: Unexpected inconsistency when making directory"), - quotearg_colon (dir_name))); + quotearg_colon (dir))); } /* After a file/link/symlink/directory creation has failed, see if @@ -355,13 +355,13 @@ static int make_directories (char *file_name) { char *cursor0 = file_name + FILESYSTEM_PREFIX_LEN (file_name); - char *cursor; /* points into path */ + char *cursor; /* points into the file name */ int did_something = 0; /* did we do anything yet? */ int mode; int invert_permissions; int status; - + for (cursor = cursor0; *cursor; cursor++) { if (! ISSLASH (*cursor)) @@ -372,7 +372,7 @@ make_directories (char *file_name) if (cursor == cursor0 || ISSLASH (cursor[-1])) continue; - /* Avoid mkdir where last part of path is "." or "..". */ + /* Avoid mkdir where last part of file name is "." or "..". */ if (cursor[-1] == '.' && (cursor == cursor0 + 1 || ISSLASH (cursor[-2]) @@ -380,7 +380,7 @@ make_directories (char *file_name) && (cursor == cursor0 + 2 || ISSLASH (cursor[-3]))))) continue; - *cursor = '\0'; /* truncate the path there */ + *cursor = '\0'; /* truncate the name there */ mode = MODE_RWX & ~ newdir_umask; invert_permissions = we_are_root ? 0 : MODE_WXUSR & ~ mode; status = mkdir (file_name, mode ^ invert_permissions); @@ -419,21 +419,54 @@ make_directories (char *file_name) return did_something; /* tell them to retry if we made one */ } +static bool +file_newer_p (const char *file_name, struct tar_stat_info *tar_stat) +{ + struct stat st; + + if (stat (file_name, &st)) + { + stat_warn (file_name); + return true; /* Be on the safe side */ + } + if (!S_ISDIR (st.st_mode) + && st.st_mtime >= tar_stat->stat.st_mtime) + { + return true; + } + return false; +} + /* Prepare to extract a file. Return zero if extraction should not proceed. */ static int -prepare_to_extract (char const *file_name, bool directory) +prepare_to_extract (char const *file_name) { if (to_stdout_option) return 0; - if (old_files_option == UNLINK_FIRST_OLD_FILES - && !remove_any_file (file_name, recursive_unlink_option) - && errno && errno != ENOENT) + switch (old_files_option) { - unlink_error (file_name); - return 0; + case UNLINK_FIRST_OLD_FILES: + if (!remove_any_file (file_name, recursive_unlink_option) + && errno && errno != ENOENT) + { + unlink_error (file_name); + return 0; + } + break; + + case KEEP_NEWER_FILES: + if (file_newer_p (file_name, ¤t_stat_info)) + { + WARN ((0, 0, _("Current `%s' is newer"), file_name)); + return 0; + } + break; + + default: + break; } return 1; @@ -446,6 +479,8 @@ prepare_to_extract (char const *file_name, bool directory) static int maybe_recoverable (char *file_name, int *interdir_made) { + int e = errno; + if (*interdir_made) return 0; @@ -456,9 +491,17 @@ maybe_recoverable (char *file_name, int *interdir_made) switch (old_files_option) { - default: + case KEEP_OLD_FILES: return 0; + case KEEP_NEWER_FILES: + if (file_newer_p (file_name, ¤t_stat_info)) + { + errno = e; + return 0; + } + /* FALL THROUGH */ + case DEFAULT_OLD_FILES: case NO_OVERWRITE_DIR_OLD_FILES: case OVERWRITE_OLD_FILES: @@ -467,6 +510,9 @@ maybe_recoverable (char *file_name, int *interdir_made) errno = EEXIST; return r; } + + case UNLINK_FIRST_OLD_FILES: + break; } case ENOENT: @@ -553,7 +599,6 @@ extract_archive (void) int openflag; mode_t mode; off_t size; - off_t file_size; int interdir_made = 0; char typeflag; char *file_name; @@ -572,10 +617,10 @@ extract_archive (void) if (verbose_option) print_header (¤t_stat_info, -1); - file_name = safer_name_suffix (current_stat_info.file_name, 0); - if (strip_path_elements) + file_name = safer_name_suffix (current_stat_info.file_name, false); + if (strip_name_components) { - size_t prefix_len = stripped_prefix_len (file_name, strip_path_elements); + size_t prefix_len = stripped_prefix_len (file_name, strip_name_components); if (prefix_len == (size_t) -1) { skip_member (); @@ -583,7 +628,7 @@ extract_archive (void) } file_name += prefix_len; } - + apply_nonancestor_delayed_set_stat (file_name, 0); /* Take a safety backup of a previously existing file. */ @@ -600,7 +645,10 @@ extract_archive (void) /* Extract the archive entry according to its type. */ - typeflag = current_header->header.typeflag; + /* KLUDGE */ + typeflag = sparse_member_p (¤t_stat_info) ? + GNUTYPE_SPARSE : current_header->header.typeflag; + switch (typeflag) { case GNUTYPE_SPARSE: @@ -631,7 +679,7 @@ extract_archive (void) goto extract_file; } - if (! prepare_to_extract (file_name, 0)) + if (! prepare_to_extract (file_name)) { skip_member (); if (backup_option) @@ -676,7 +724,7 @@ extract_archive (void) } extract_file: - if (typeflag == GNUTYPE_SPARSE) + if (current_stat_info.is_sparse) { sparse_extract_file (fd, ¤t_stat_info, &size); } @@ -746,7 +794,7 @@ extract_archive (void) case SYMTYPE: #ifdef HAVE_SYMLINK - if (! prepare_to_extract (file_name, 0)) + if (! prepare_to_extract (file_name)) break; if (absolute_names_option @@ -830,7 +878,7 @@ extract_archive (void) status = 0; } } - + if (status != 0 && backup_option) undo_last_backup (); break; @@ -851,12 +899,13 @@ extract_archive (void) #endif case LNKTYPE: - if (! prepare_to_extract (file_name, 0)) + if (! prepare_to_extract (file_name)) break; again_link: { - char const *link_name = safer_name_suffix (current_stat_info.link_name, 1); + char const *link_name = safer_name_suffix (current_stat_info.link_name, + true); struct stat st1, st2; int e; @@ -873,7 +922,7 @@ extract_archive (void) && ds->ino == st1.st_ino && ds->mtime == st1.st_mtime) { - struct string_list *p = + struct string_list *p = xmalloc (offsetof (struct string_list, string) + strlen (file_name) + 1); strcpy (p->string, file_name); @@ -914,7 +963,7 @@ extract_archive (void) #if S_IFCHR || S_IFBLK make_node: - if (! prepare_to_extract (file_name, 0)) + if (! prepare_to_extract (file_name)) break; status = mknod (file_name, current_stat_info.stat.st_mode, @@ -935,7 +984,7 @@ extract_archive (void) #if HAVE_MKFIFO || defined mkfifo case FIFOTYPE: - if (! prepare_to_extract (file_name, 0)) + if (! prepare_to_extract (file_name)) break; while (status = mkfifo (file_name, current_stat_info.stat.st_mode), @@ -972,7 +1021,7 @@ extract_archive (void) | (we_are_root ? 0 : MODE_WXUSR)) & MODE_RWX); - status = prepare_to_extract (file_name, 1); + status = prepare_to_extract (file_name); if (status == 0) break; if (status < 0) @@ -1004,7 +1053,7 @@ extract_archive (void) } errno = EEXIST; } - + if (maybe_recoverable (file_name, &interdir_made)) goto again_dir;