Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore other symlink attributes.

This commit is contained in:
enami 2002-10-13 22:58:55 +00:00
parent f3d9e2a4ab
commit 9fdb1e7ba1
2 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gnu/dist/tar/src/extract.c vendored
View File

@ -22,6 +22,7 @@
#include "system.h"
#include <quotearg.h>
#if !HAVE_LUTIMES
#if HAVE_UTIME_H
# include <utime.h>
#else
@ -31,6 +32,7 @@ struct utimbuf
long modtime;
};
#endif
#endif
#include "common.h"
@ -128,6 +130,26 @@ extr_init (void)
}
}
static int
set_time (char const *file_name, time_t atime, time_t mtime)
{
#if HAVE_LUTIMES
struct timeval tv[2];
tv[0].tv_sec = atime;
tv[0].tv_usec = 0;
tv[1].tv_sec = mtime;
tv[1].tv_usec = 0;
return lutimes (file_name, tv);
#else
struct utimbuf utimbuf;
utimbuf.actime = atime;
utimbuf.modtime = mtime;
return utime (file_name, &utimbuf);
#endif
}
/* If restoring permissions, restore the mode for FILE_NAME from
information given in *STAT_INFO (where *CURRENT_STAT_INFO gives
the current status if CURRENT_STAT_INFO is nonzero); otherwise invert the
@ -180,7 +202,11 @@ set_mode (char const *file_name, struct stat const *stat_info,
mode = current_stat_info->st_mode ^ invert_permissions;
}
#if HAVE_LCHMOD
if (lchmod (file_name, mode) != 0)
#else
if (chmod (file_name, mode) != 0)
#endif
chmod_error_details (file_name, mode);
}
@ -214,9 +240,11 @@ set_stat (char const *file_name, struct stat const *stat_info,
mode_t invert_permissions, enum permstatus permstatus,
char typeflag)
{
struct utimbuf utimbuf;
time_t atime;
#if !HAVE_LUTIMES
if (typeflag != SYMTYPE)
#endif
{
/* We do the utime before the chmod because some versions of utime are
broken and trash the modes of the file. */
@ -230,13 +258,11 @@ set_stat (char const *file_name, struct stat const *stat_info,
/* FIXME: incremental_option should set ctime too, but how? */
if (incremental_option)
utimbuf.actime = stat_info->st_atime;
atime = stat_info->st_atime;
else
utimbuf.actime = start_time;
atime = start_time;
utimbuf.modtime = stat_info->st_mtime;
if (utime (file_name, &utimbuf) < 0)
if (set_time (file_name, atime, stat_info->st_mtime) < 0)
utime_error (file_name);
else
{
@ -244,7 +270,12 @@ set_stat (char const *file_name, struct stat const *stat_info,
check_time (file_name, stat_info->st_mtime);
}
}
}
#if !HAVE_LCHMOD
if (typeflag != SYMTYPE)
#endif
{
/* Some systems allow non-root users to give files away. Once this
done, it is not possible anymore to change file permissions, so we
have to set permissions prior to possibly giving files away. */

5
gnu/usr.bin/tar.new/Makefile.defs
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.defs,v 1.1 2002/10/09 16:13:07 itojun Exp $
# $NetBSD: Makefile.defs,v 1.2 2002/10/13 22:58:56 enami Exp $
DIST= ${NETBSDSRCDIR}/gnu/dist/tar
@ -17,7 +17,8 @@ CPPFLAGS+=-DDEFAULT_ARCHIVE=\"-\" -DDEFAULT_BLOCKING=20 \
-DHAVE_GETEUID=1 -DHAVE_GETGID=1 -DHAVE_GETPAGESIZE=1 \
-DHAVE_GETTEXT=1 -DHAVE_GETUID=1 -DHAVE_INTTYPES_H=1 \
-DHAVE_ISASCII=1 -DHAVE_ISWPRINT=1 -DHAVE_LANGINFO_CODESET=1 \
-DHAVE_LCHOWN=1 -DHAVE_LC_MESSAGES=1 -DHAVE_LIMITS_H=1 \
-DHAVE_LCHMOD=1 -DHAVE_LCHOWN=1 -DHAVE_LUTIMES=1 \
-DHAVE_LC_MESSAGES=1 -DHAVE_LIMITS_H=1 \
-DHAVE_LOCALE_H=1 -DHAVE_LOCALTIME_R=1 \
-DHAVE_LONG_FILE_NAMES=1 -DHAVE_LONG_LONG=1 \
-DHAVE_LSTAT=1 -DHAVE_MALLOC_H=1 -DHAVE_MBRTOWC=1 \