forked from Github/emacs
5d4cf1fef8
This is a companion to the recent set-file-modes patch. It adds support for a ‘nofollow’ flag to set-file-times (Bug#39773). Like the set-file-modes patch, it needs work in the w32 port. * admin/merge-gnulib (GNULIB_MODULES): Add futimens, utimensat. Remove utimens. * doc/lispref/files.texi (Changing Files): * etc/NEWS: Mention the change. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * lisp/files.el (copy-directory): * lisp/gnus/gnus-cloud.el (gnus-cloud-replace-file): * lisp/net/tramp-adb.el (tramp-adb-handle-copy-file): * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file): * lisp/tar-mode.el (tar-copy): * test/lisp/filenotify-tests.el (file-notify-test03-events): * test/lisp/files-tests.el: (files-tests-file-name-non-special-set-file-times): * test/lisp/net/tramp-tests.el (tramp-test22-file-times): When setting file times, avoid following symbolic links when the file is not supposed to be a symbolic link. * lib/futimens.c, lib/utimensat.c, m4/futimens.m4, m4/utimensat.m4: New files, copied from Gnulib. * lisp/gnus/gnus-cloud.el (gnus-cloud-replace-file): When creating a file that is not supposed to exist already, use the excl flag to check this. * lisp/net/tramp-adb.el (tramp-adb-handle-set-file-times): * lisp/net/tramp-sh.el (tramp-sh-handle-set-file-times): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-set-file-times): Accept an optional FLAG arg that is currently ignored, and add a FIXME comment for it. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-set-file-times): * src/fileio.c (Fset_file_times): Support an optional FLAG arg. * src/fileio.c (Fcopy_file): Use futimens instead of set_file_times, as it’s simpler and is a POSIX API. * src/sysdep.c (set_file_times): Move from here ... * src/w32.c (set_file_times): ... to here, and make it static, since it is now used only in w32.c. Presumably w32.c should also add support for futimens and utimensat (the POSIX APIs, which Emacs now uses) and it can remove fdutimens (the Gnulib API, which Emacs no longer uses).
121 lines
3.8 KiB
Bash
Executable file
121 lines
3.8 KiB
Bash
Executable file
#! /bin/sh
|
|
# Merge gnulib sources into Emacs sources.
|
|
# Typical usage:
|
|
#
|
|
# admin/merge-gnulib
|
|
|
|
# Copyright 2012-2020 Free Software Foundation, Inc.
|
|
|
|
# This file is part of GNU Emacs.
|
|
|
|
# GNU Emacs is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
|
|
# GNU Emacs is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
# written by Paul Eggert
|
|
|
|
GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
|
|
|
|
GNULIB_MODULES='
|
|
alloca-opt binary-io byteswap c-ctype c-strcase
|
|
canonicalize-lgpl
|
|
careadlinkat close-stream copy-file-range
|
|
count-leading-zeros count-one-bits count-trailing-zeros
|
|
crypto/md5-buffer crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer
|
|
d-type diffseq dosname double-slash-root dtoastr dtotimespec dup2
|
|
environ execinfo explicit_bzero faccessat
|
|
fchmodat fcntl fcntl-h fdopendir
|
|
filemode filevercmp flexmember fpieee fstatat fsusage fsync futimens
|
|
getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
|
|
ieee754-h ignore-value intprops largefile lstat
|
|
manywarnings memmem-simple mempcpy memrchr minmax mkostemp mktime nstrftime
|
|
pathmax pipe2 pselect pthread_sigmask
|
|
qcopy-acl readlink readlinkat regex
|
|
sig2str socklen stat-time std-gnu11 stdalign stddef stdio
|
|
stpcpy strnlen strtoimax symlink sys_stat sys_time
|
|
tempname time time_r time_rz timegm timer-time timespec-add timespec-sub
|
|
update-copyright unlocked-io utimensat
|
|
vla warnings
|
|
'
|
|
|
|
AVOIDED_MODULES='
|
|
btowc close dup fchdir fstat langinfo lock
|
|
malloc-posix mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo
|
|
openat-die opendir pthread-h raise
|
|
save-cwd select setenv sigprocmask stat stdarg stdbool
|
|
threadlib tzset unsetenv utime utime-h
|
|
wchar wcrtomb wctype-h
|
|
'
|
|
|
|
GNULIB_TOOL_FLAGS='
|
|
--conditional-dependencies --import --no-changelog --no-vc-files
|
|
--gnu-make
|
|
--makefile-name=gnulib.mk.in
|
|
'
|
|
|
|
# The source directory, with a trailing '/'.
|
|
# If empty, the source directory is the working directory.
|
|
src=$2
|
|
case $src in
|
|
*/ | '') ;;
|
|
*) src=$src/ ;;
|
|
esac
|
|
|
|
# Gnulib's source directory.
|
|
gnulib_srcdir=${1-$src../gnulib}
|
|
|
|
case $gnulib_srcdir in
|
|
-*) src=- ;;
|
|
esac
|
|
case $src in
|
|
-*)
|
|
printf '%s\n' >&2 "$0: usage: $0 [GNULIB_SRCDIR [SRCDIR]]
|
|
|
|
SRCDIR is the Emacs source directory (default: working directory).
|
|
GNULIB_SRCDIR is the Gnulib source directory (default: SRCDIR/../gnulib)."
|
|
exit 1 ;;
|
|
esac
|
|
|
|
test -x "$src"autogen.sh || {
|
|
printf '%s\n' >&2 "$0: '${src:-.}' is not an Emacs source directory."
|
|
exit 1
|
|
}
|
|
|
|
test -d "$gnulib_srcdir" ||
|
|
git clone -- "$GNULIB_URL" "$gnulib_srcdir" ||
|
|
exit
|
|
|
|
test -x "$gnulib_srcdir"/gnulib-tool || {
|
|
printf '%s\n' >&2 "$0: '$gnulib_srcdir' is not a Gnulib source directory."
|
|
exit 1
|
|
}
|
|
|
|
avoided_flags=
|
|
for module in $AVOIDED_MODULES; do
|
|
avoided_flags="$avoided_flags --avoid=$module"
|
|
done
|
|
|
|
"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \
|
|
$avoided_flags $GNULIB_MODULES &&
|
|
rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \
|
|
"$src"m4/gl-openssl.m4 \
|
|
"$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \
|
|
"$src"m4/manywarnings-c++.m4 \
|
|
"$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 &&
|
|
cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
|
|
cp -- "$gnulib_srcdir"/build-aux/config.guess \
|
|
"$gnulib_srcdir"/build-aux/config.sub \
|
|
"$gnulib_srcdir"/build-aux/install-sh \
|
|
"$gnulib_srcdir"/build-aux/move-if-change \
|
|
"$src"build-aux &&
|
|
{ test -z "$src" || cd "$src"; } &&
|
|
./autogen.sh
|