From: Paul Eggert Date: Sun, 20 Feb 2011 10:53:22 +0000 (-0800) Subject: Import filemode module from gnulib. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~779^2~1^2~2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cfd812fa0392942aaaa496fa0b8592a9357669b8;p=emacs.git Import filemode module from gnulib. * Makefile.in (base_obj): Remove filemode.o, as it's now in ../lib. * deps.mk (dired.o): Depend on ../lib/filemode.h, too. (filemode.o): Remove; this is now in ../lib. * dired.c: Include . (filemodestring): Remove now-redundant decl. * config.in: Regenerate. 2011-02-20 Paul Eggert --- diff --git a/src/ChangeLog b/src/ChangeLog index 54d912cc15d..880fb10e85a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2011-02-20 Paul Eggert + + Import filemode module from gnulib. + * Makefile.in (base_obj): Remove filemode.o, as it's now in ../lib. + * deps.mk (dired.o): Depend on ../lib/filemode.h, too. + (filemode.o): Remove; this is now in ../lib. + * dired.c: Include . + (filemodestring): Remove now-redundant decl. + * config.in: Regenerate. + 2011-02-20 Paul Eggert Import crypto/md5 and stdint modules from gnulib. diff --git a/src/Makefile.in b/src/Makefile.in index 41b6767f26e..e1195968f7f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -347,7 +347,7 @@ base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ cm.o term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ) \ emacs.o keyboard.o macros.o keymap.o sysdep.o \ buffer.o filelock.o insdel.o marker.o \ - minibuf.o fileio.o dired.o filemode.o \ + minibuf.o fileio.o dired.o \ cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \ alloc.o data.o doc.o editfns.o callint.o \ eval.o floatfns.o fns.o font.o print.o lread.o \ diff --git a/src/config.in b/src/config.in index 9e8364ec45b..9c23fb583fa 100644 --- a/src/config.in +++ b/src/config.in @@ -152,6 +152,10 @@ along with GNU Emacs. If not, see . */ don't. */ #undef HAVE_DECL_LOCALTIME_R +/* Define to 1 if you have the declaration of `strmode', and to 0 if you + don't. */ +#undef HAVE_DECL_STRMODE + /* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you don't. */ #undef HAVE_DECL_SYS_SIGLIST @@ -686,6 +690,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if `struct utimbuf' is declared by . */ #undef HAVE_STRUCT_UTIMBUF +/* Define if struct stat has an st_dm_mode member. */ +#undef HAVE_ST_DM_MODE + /* Define to 1 if you have the `sync' function. */ #undef HAVE_SYNC @@ -981,6 +988,9 @@ along with GNU Emacs. If not, see . */ STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION +/* Define to 1 if the `S_IS*' macros in do not work properly. */ +#undef STAT_MACROS_BROKEN + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS @@ -1149,6 +1159,9 @@ along with GNU Emacs. If not, see . */ /* Define to the name of the strftime replacement function. */ #undef my_strftime +/* Define to the type of st_nlink in struct stat, or a supertype. */ +#undef nlink_t + /* Define to `int' if does not define. */ #undef pid_t diff --git a/src/deps.mk b/src/deps.mk index 5bd4a682bfa..77994bcaadb 100644 --- a/src/deps.mk +++ b/src/deps.mk @@ -73,7 +73,7 @@ pre-crt0.o: pre-crt0.c dbusbind.o: dbusbind.c termhooks.h frame.h keyboard.h lisp.h $(config_h) dired.o: dired.c commands.h buffer.h lisp.h $(config_h) character.h charset.h \ coding.h regex.h systime.h blockinput.h atimer.h composite.h \ - ../lib/unistd.h globals.h + ../lib/filemode.h ../lib/unistd.h globals.h dispnew.o: dispnew.c systime.h commands.h process.h frame.h coding.h \ window.h buffer.h termchar.h termopts.h termhooks.h cm.h \ disptab.h indent.h $(INTERVALS_H) nsgui.h ../lib/unistd.h \ @@ -98,7 +98,6 @@ fileio.o: fileio.c window.h buffer.h systime.h $(INTERVALS_H) character.h \ commands.h globals.h ../lib/unistd.h filelock.o: filelock.c buffer.h character.h coding.h systime.h composite.h \ ../lib/unistd.h lisp.h globals.h $(config_h) -filemode.o: filemode.c $(config_h) font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \ font.h lisp.h globals.h $(config_h) buffer.h composite.h fontset.h \ xterm.h nsgui.h msdos.h diff --git a/src/dired.c b/src/dired.c index 7b4b83cbe54..e2f974e1bf0 100644 --- a/src/dired.c +++ b/src/dired.c @@ -54,6 +54,8 @@ along with GNU Emacs. If not, see . */ #include #include +#include + #define DIRENTRY struct direct extern DIR *opendir (char *); @@ -82,9 +84,6 @@ extern struct re_pattern_buffer *compile_pattern (Lisp_Object, struct re_registers *, Lisp_Object, int, int); -/* From filemode.c. Can't go in Lisp.h because of `stat'. */ -extern void filemodestring (struct stat *, char *); - /* if system does not have symbolic links, it does not have lstat. In that case, use ordinary stat instead. */