[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103380: Merge: Assume S_ISLNK etc. w
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103380: Merge: Assume S_ISLNK etc. work, since gnulib supports this. |
Date: |
Mon, 21 Feb 2011 17:58:44 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103380 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2011-02-21 17:58:44 -0800
message:
Merge: Assume S_ISLNK etc. work, since gnulib supports this.
modified:
ChangeLog
Makefile.in
configure
configure.in
lib-src/ChangeLog
lib-src/etags.c
lib/Makefile.in
lib/gnulib.mk
src/ChangeLog
src/config.in
src/dired.c
src/fileio.c
src/filelock.c
src/lread.c
src/xrdb.c
=== modified file 'ChangeLog'
--- a/ChangeLog 2011-02-21 23:46:32 +0000
+++ b/ChangeLog 2011-02-22 01:55:20 +0000
@@ -1,3 +1,11 @@
+2011-02-22 Paul Eggert <address@hidden>
+
+ Assume S_ISLNK etc. work, since gnulib supports this.
+ * Makefile.in (GNULIB_MODULES): Add sys_stat.
+ * configure.in: Check for lstat and set HAVE_LSTAT=0 if not.
+ Pretend to be using the gnulib lstat module for benefit of sys/stat.h.
+ * configure, lib/Makefile.in, lib/gnulib.mk: Regenerate.
+
2011-02-21 Paul Eggert <address@hidden>
* lib/min-max.h: New file, for "min" and "max".
=== modified file 'Makefile.in'
--- a/Makefile.in 2011-02-20 10:51:50 +0000
+++ b/Makefile.in 2011-02-22 01:55:20 +0000
@@ -332,7 +332,7 @@
# as per $(gnulib_srcdir)/DEPENDENCIES.
GNULIB_MODULES = \
crypto/md5 dtoastr filemode getloadavg getopt-gnu \
- ignore-value mktime strftime
+ ignore-value mktime strftime sys_stat
GNULIB_TOOL_FLAGS = \
--import --no-changelog --no-vc-files --makefile-name=gnulib.mk
sync-from-gnulib: $(gnulib_srcdir)
=== modified file 'configure'
--- a/configure 2011-02-21 17:56:37 +0000
+++ b/configure 2011-02-22 01:55:20 +0000
@@ -2963,6 +2963,7 @@
as_fn_append ac_header_list " sys/stat.h"
as_fn_append ac_header_list " sys/time.h"
as_fn_append ac_func_list " localtime_r"
+as_fn_append ac_func_list " lstat"
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -17211,6 +17212,23 @@
+# Emacs does not care about lstat's behavior on files whose names end in
+# trailing slashes, so it does not use the gnulib lstat module.
+# However, Emacs does want the "#define lstat stat" in sys/stat.h
+# when lstat does not exist, so it pretends to use the lstat module
+# even though it implements only the lstat-checking part of that module.
+
+
+
+test $ac_cv_func_lstat = yes || HAVE_LSTAT=0
+
+
+
+ GNULIB_LSTAT=1
+
+
+
+
# UNIX98 PTYs.
for ac_func in grantpt
do :
=== modified file 'configure.in'
--- a/configure.in 2011-02-20 19:46:08 +0000
+++ b/configure.in 2011-02-22 01:55:20 +0000
@@ -2661,6 +2661,15 @@
gl_ASSERT_NO_GNULIB_TESTS
gl_INIT
+# Emacs does not care about lstat's behavior on files whose names end in
+# trailing slashes, so it does not use the gnulib lstat module.
+# However, Emacs does want the "#define lstat stat" in sys/stat.h
+# when lstat does not exist, so it pretends to use the lstat module
+# even though it implements only the lstat-checking part of that module.
+AC_CHECK_FUNCS_ONCE([lstat])
+test $ac_cv_func_lstat = yes || HAVE_LSTAT=0
+gl_SYS_STAT_MODULE_INDICATOR([lstat])
+
# UNIX98 PTYs.
AC_CHECK_FUNCS(grantpt)
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2011-02-22 00:49:54 +0000
+++ b/lib-src/ChangeLog 2011-02-22 01:58:44 +0000
@@ -1,3 +1,8 @@
+2011-02-22 Paul Eggert <address@hidden>
+
+ Assume S_ISLNK etc. work, since gnulib supports this.
+ * etags.c (S_ISREG): Remove.
+
2011-02-22 Juanma Barranquero <address@hidden>
* makefile.w32-in (obj): Remove filemode.o.
=== modified file 'lib-src/etags.c'
--- a/lib-src/etags.c 2011-01-25 04:08:28 +0000
+++ b/lib-src/etags.c 2011-02-22 01:55:20 +0000
@@ -190,10 +190,6 @@
# define assert(x) ((void) 0)
#endif
-#if !defined (S_ISREG) && defined (S_IFREG)
-# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif
-
#ifdef NO_LONG_OPTIONS /* define this if you don't have GNU getopt */
# define NO_LONG_OPTIONS TRUE
# define getopt_long(argc,argv,optstr,lopts,lind) getopt (argc, argv, optstr)
@@ -5327,7 +5323,7 @@
*/
static int
prolog_pr (char *s, char *last)
-
+
/* Name of last clause. */
{
int pos;
@@ -5484,7 +5480,7 @@
*/
static int
erlang_func (char *s, char *last)
-
+
/* Name of last clause. */
{
int pos;
=== modified file 'lib/Makefile.in'
--- a/lib/Makefile.in 2011-02-20 10:51:50 +0000
+++ b/lib/Makefile.in 2011-02-22 01:55:20 +0000
@@ -24,7 +24,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=.
--makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files
crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value mktime strftime
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=.
--makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files
crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value mktime strftime
sys_stat
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
=== modified file 'lib/gnulib.mk'
--- a/lib/gnulib.mk 2011-02-20 10:51:50 +0000
+++ b/lib/gnulib.mk 2011-02-22 01:55:20 +0000
@@ -9,7 +9,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=.
--makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files
crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value mktime strftime
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=.
--makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files
crypto/md5 dtoastr filemode getloadavg getopt-gnu ignore-value mktime strftime
sys_stat
MOSTLYCLEANFILES += core *.stackdump
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-21 20:00:19 +0000
+++ b/src/ChangeLog 2011-02-22 01:55:20 +0000
@@ -1,3 +1,22 @@
+2011-02-22 Paul Eggert <address@hidden>
+
+ Assume S_ISLNK etc. work, since gnulib supports this.
+ * config.in: Regenerate.
+ * dired.c (lstat): Remove.
+ (file_name_completion): Assume S_ISDIR works.
+ (file_name_completion_stat): Assume S_ISLNK works.
+ Do not bother calling stat unless lstat says it's a symlink.
+ * fileio.c (S_ISLNK, S_ISFIFO, S_ISREG, lstat): Remove.
+ (Fcopy_file): Assume S_ISREG and S_ISLNK work.
+ (check_writable, Ffile_writable_p, Fset_file_times):
+ Assume S_ISDIR works.
+ (Ffile_readable_p): Use S_IFIFO, not S_ISFIFO, to guess whether
+ fifos exist.
+ (Ffile_regular_p, Finsert_file_contents): Assumes S_ISREG works.
+ * filelock.c (S_ISLNK): Remove.
+ * lread.c (openp): Assume S_ISDIR works.
+ * xrdb.c (S_ISDIR): Remove.
+
2011-02-21 Eli Zaretskii <address@hidden>
* makefile.w32-in ($(BLD)/filemode.$(O)): Move recipe to
=== modified file 'src/config.in'
--- a/src/config.in 2011-02-20 10:53:22 +0000
+++ b/src/config.in 2011-02-22 01:55:20 +0000
@@ -465,6 +465,9 @@
/* Define to 1 if you have the `lrand48' function. */
#undef HAVE_LRAND48
+/* Define to 1 if you have the `lstat' function. */
+#undef HAVE_LSTAT
+
/* Define to 1 if using libm17n-flt. */
#undef HAVE_M17N_FLT
=== modified file 'src/dired.c'
--- a/src/dired.c 2011-02-20 17:14:24 +0000
+++ b/src/dired.c 2011-02-22 01:55:20 +0000
@@ -84,13 +84,6 @@
struct re_registers *,
Lisp_Object, int, int);
-/* if system does not have symbolic links, it does not have lstat.
- In that case, use ordinary stat instead. */
-
-#ifndef S_IFLNK
-#define lstat stat
-#endif
-
Lisp_Object Qdirectory_files;
Lisp_Object Qdirectory_files_and_attributes;
Lisp_Object Qfile_name_completion;
@@ -539,7 +532,7 @@
if (file_name_completion_stat (encoded_dir, dp, &st) < 0)
continue;
- directoryp = ((st.st_mode & S_IFMT) == S_IFDIR);
+ directoryp = S_ISDIR (st.st_mode);
tem = Qnil;
/* If all_flag is set, always include all.
It would not actually be helpful to the user to ignore any possible
@@ -843,20 +836,16 @@
memcpy (fullname + pos, dp->d_name, len);
fullname[pos + len] = 0;
-#ifdef S_IFLNK
/* We want to return success if a link points to a nonexistent file,
but we want to return the status for what the link points to,
in case it is a directory. */
value = lstat (fullname, st_addr);
- stat (fullname, st_addr);
- return value;
-#else
- value = stat (fullname, st_addr);
+ if (value == 0 && S_ISLNK (st_addr->st_mode))
+ stat (fullname, st_addr);
#ifdef MSDOS
_djstat_flags = save_djstat_flags;
#endif /* MSDOS */
return value;
-#endif /* S_IFLNK */
}
Lisp_Object
=== modified file 'src/fileio.c'
--- a/src/fileio.c 2011-02-16 18:39:46 +0000
+++ b/src/fileio.c 2011-02-22 01:55:20 +0000
@@ -26,18 +26,6 @@
#include <setjmp.h>
#include <unistd.h>
-#if !defined (S_ISLNK) && defined (S_IFLNK)
-# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-#endif
-
-#if !defined (S_ISFIFO) && defined (S_IFIFO)
-# define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
-#endif
-
-#if !defined (S_ISREG) && defined (S_IFREG)
-# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif
-
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
@@ -95,10 +83,6 @@
#include "commands.h"
-#ifndef S_ISLNK
-# define lstat stat
-#endif
-
#ifndef FILE_SYSTEM_CASE
#define FILE_SYSTEM_CASE(filename) (filename)
#endif
@@ -1922,7 +1906,6 @@
Fcons (file, Fcons (newname, Qnil)));
}
-#if defined (S_ISREG) && defined (S_ISLNK)
if (input_file_statable_p)
{
if (!(S_ISREG (st.st_mode)) && !(S_ISLNK (st.st_mode)))
@@ -1934,7 +1917,6 @@
report_file_error ("Non-regular file", Fcons (file, Qnil));
}
}
-#endif /* S_ISREG && S_ISLNK */
#ifdef MSDOS
/* System's default file type was set to binary by _fmode in emacs.c. */
@@ -2408,7 +2390,7 @@
struct stat st;
if (stat (filename, &st) < 0)
return 0;
- return (st.st_mode & S_IWRITE || (st.st_mode & S_IFMT) == S_IFDIR);
+ return (st.st_mode & S_IWRITE || S_ISDIR (st.st_mode));
#else /* not MSDOS */
#ifdef HAVE_EUIDACCESS
return (euidaccess (filename, 2) >= 0);
@@ -2500,7 +2482,7 @@
return Qnil;
#else /* not DOS_NT and not macintosh */
flags = O_RDONLY;
-#if defined (S_ISFIFO) && defined (O_NONBLOCK)
+#if defined (S_IFIFO) && defined (O_NONBLOCK)
/* Opening a fifo without O_NONBLOCK can wait.
We don't want to wait. But we don't want to mess wth O_NONBLOCK
except in the case of a fifo, on a system which handles it. */
@@ -2555,7 +2537,7 @@
should check ACLs though, which do affect this. */
if (stat (SDATA (dir), &statbuf) < 0)
return Qnil;
- return (statbuf.st_mode & S_IFMT) == S_IFDIR ? Qt : Qnil;
+ return S_ISDIR (statbuf.st_mode) ? Qt : Qnil;
#else
return (check_writable (!NILP (dir) ? SSDATA (dir) : "")
? Qt : Qnil);
@@ -2681,7 +2663,7 @@
if (stat (SSDATA (absname), &st) < 0)
return Qnil;
- return (st.st_mode & S_IFMT) == S_IFDIR ? Qt : Qnil;
+ return S_ISDIR (st.st_mode) ? Qt : Qnil;
}
DEFUN ("file-accessible-directory-p", Ffile_accessible_directory_p,
Sfile_accessible_directory_p, 1, 1, 0,
@@ -2744,12 +2726,12 @@
if (result < 0)
return Qnil;
- return (st.st_mode & S_IFMT) == S_IFREG ? Qt : Qnil;
+ return S_ISREG (st.st_mode) ? Qt : Qnil;
}
#else
if (stat (SSDATA (absname), &st) < 0)
return Qnil;
- return (st.st_mode & S_IFMT) == S_IFREG ? Qt : Qnil;
+ return S_ISREG (st.st_mode) ? Qt : Qnil;
#endif
}
@@ -3007,8 +2989,7 @@
struct stat st;
/* Setting times on a directory always fails. */
- if (stat (SDATA (encoded_absname), &st) == 0
- && (st.st_mode & S_IFMT) == S_IFDIR)
+ if (stat (SSDATA (encoded_absname), &st) == 0 && S_ISDIR (st.st_mode))
return Qnil;
#endif
report_file_error ("Setting file times", Fcons (absname, Qnil));
@@ -3267,7 +3248,6 @@
goto notfound;
}
-#ifdef S_IFREG
/* This code will need to be changed in order to work on named
pipes, and it's probably just not worth it. So we should at
least signal an error. */
@@ -3282,7 +3262,6 @@
xsignal2 (Qfile_error,
build_string ("not a regular file"), orig_filename);
}
-#endif
if (fd < 0)
if ((fd = emacs_open (SSDATA (filename), O_RDONLY, 0)) < 0)
=== modified file 'src/filelock.c'
--- a/src/filelock.c 2011-02-16 15:02:50 +0000
+++ b/src/filelock.c 2011-02-22 01:55:20 +0000
@@ -51,10 +51,6 @@
#include <utmp.h>
#endif
-#if !defined (S_ISLNK) && defined (S_IFLNK)
-#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-#endif
-
/* A file whose last-modified time is just after the most recent boot.
Define this to be NULL to disable checking for this file. */
#ifndef BOOT_TIME_FILE
=== modified file 'src/lread.c'
--- a/src/lread.c 2011-02-18 17:18:16 +0000
+++ b/src/lread.c 2011-02-22 01:55:20 +0000
@@ -1402,8 +1402,7 @@
encoded_fn = ENCODE_FILE (string);
pfn = SSDATA (encoded_fn);
- exists = (stat (pfn, &st) >= 0
- && (st.st_mode & S_IFMT) != S_IFDIR);
+ exists = (stat (pfn, &st) == 0 && ! S_ISDIR (st.st_mode));
if (exists)
{
/* Check that we can access or open it. */
@@ -4385,7 +4384,7 @@
Qdir_ok = intern_c_string ("dir-ok");
staticpro (&Qdir_ok);
-
+
Qdo_after_load_evaluation = intern_c_string ("do-after-load-evaluation");
staticpro (&Qdo_after_load_evaluation) ;
=== modified file 'src/xrdb.c'
--- a/src/xrdb.c 2011-02-14 17:21:10 +0000
+++ b/src/xrdb.c 2011-02-22 01:55:20 +0000
@@ -38,10 +38,6 @@
#endif
#include <sys/stat.h>
-#if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
-
#include "lisp.h"
#ifdef USE_MOTIF
@@ -764,4 +760,3 @@
XCloseDisplay (display);
}
#endif /* TESTRM */
-
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103380: Merge: Assume S_ISLNK etc. work, since gnulib supports this.,
Paul Eggert <=