From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chad Brown Newsgroups: gmane.emacs.devel Subject: Re: recent commit broke src/dired.c on OSX Date: Tue, 27 Jul 2010 14:40:26 -0700 Message-ID: <4449EC4A-94C7-4C9E-A156-1EC94EE64707@mit.edu> References: <86iq4379w0.fsf@red.stonehenge.com> <86eier7942.fsf@red.stonehenge.com> <86aapf78af.fsf@red.stonehenge.com> <83d3uab2np.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v1081) Content-Type: multipart/mixed; boundary=Apple-Mail-2--835568095 X-Trace: dough.gmane.org 1280266845 24029 80.91.229.12 (27 Jul 2010 21:40:45 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 27 Jul 2010 21:40:45 +0000 (UTC) To: Emacs development discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jul 27 23:40:43 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OdrtC-0001eh-Rw for ged-emacs-devel@m.gmane.org; Tue, 27 Jul 2010 23:40:43 +0200 Original-Received: from localhost ([127.0.0.1]:37640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdrtB-0006Sw-TV for ged-emacs-devel@m.gmane.org; Tue, 27 Jul 2010 17:40:42 -0400 Original-Received: from [140.186.70.92] (port=51928 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Odrt3-0006Sj-62 for emacs-devel@gnu.org; Tue, 27 Jul 2010 17:40:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Odrt2-0001O4-Am for emacs-devel@gnu.org; Tue, 27 Jul 2010 17:40:33 -0400 Original-Received: from dmz-mailsec-scanner-4.mit.edu ([18.9.25.15]:45573) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Odrt2-0001Nw-7V for emacs-devel@gnu.org; Tue, 27 Jul 2010 17:40:32 -0400 X-AuditID: 1209190f-b7b0aae000000a7d-5f-4c4f525241ce Original-Received: from mailhub-auth-3.mit.edu (MAILHUB-AUTH-3.MIT.EDU [18.9.21.43]) by dmz-mailsec-scanner-4.mit.edu (Symantec Brightmail Gateway) with SMTP id 6B.E2.02685.2525F4C4; Tue, 27 Jul 2010 17:40:34 -0400 (EDT) Original-Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id o6RLeVVL019539 for ; Tue, 27 Jul 2010 17:40:31 -0400 Original-Received: from [10.0.0.41] ([64.241.37.140]) (authenticated bits=0) (User authenticated as yandros@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id o6RLeRhh003327 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT) for ; Tue, 27 Jul 2010 17:40:29 -0400 (EDT) In-Reply-To: <83d3uab2np.fsf@gnu.org> X-Mailer: Apple Mail (2.1081) X-Brightmail-Tracker: AAAAAA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:127893 Archived-At: --Apple-Mail-2--835568095 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Second try at the patch, with ChangeLogs and msdos build system changes = included. --Apple-Mail-2--835568095 Content-Disposition: attachment; filename=dirent.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="dirent.patch" Content-Transfer-Encoding: quoted-printable =3D=3D=3D=20modified=20file=20'ChangeLog'=0A---=20ChangeLog=092010-07-25=20= 19:09:54=20+0000=0A+++=20ChangeLog=092010-07-27=2001:56:57=20+0000=0A@@=20= -1,3=20+1,7=20@@=0A+2010-07-27=20=20Chad=20Brown=20=0A+=0A= +=09*=20configure.in:=20Check=20for=20dirent.h=0A+=0A=202010-07-25=20=20= Andreas=20Schwab=20=20=0A=20=0A=20=09*=20= configure.in:=20Check=20for=20__executable_start.=0A=0A=3D=3D=3D=20= modified=20file=20'configure.in'=0A---=20configure.in=092010-07-25=20= 19:09:54=20+0000=0A+++=20configure.in=092010-07-26=2002:36:43=20+0000=0A= @@=20-1204,7=20+1204,7=20@@=0A=20=20=20linux/version.h=20= sys/systeminfo.h=20termios.h=20limits.h=20string.h=20stdlib.h=20\=0A=20=20= =20stdio_ext.h=20fcntl.h=20strings.h=20coff.h=20pty.h=20sys/mman.h=20\=0A= =20=20=20sys/param.h=20sys/vlimit.h=20sys/resource.h=20locale.h=20= sys/_mbstate_t.h=20\=0A-=20=20sys/utsname.h=20pwd.h=20utmp.h)=0A+=20=20= sys/utsname.h=20pwd.h=20utmp.h=20dirent.h)=0A=20=0A=20AC_MSG_CHECKING(if=20= personality=20LINUX32=20can=20be=20set)=0A=20AC_TRY_COMPILE([#include=20= ],=20[personality=20(PER_LINUX32)],=0A=0A=3D=3D=3D=20= modified=20file=20'msdos/ChangeLog'=0A---=20msdos/ChangeLog=092010-07-24=20= 11:53:19=20+0000=0A+++=20msdos/ChangeLog=092010-07-27=2002:22:21=20+0000=0A= @@=20-1,3=20+1,7=20@@=0A+2010-07-27=20=20Chad=20Brown=20=20= =0A+=0A+=09*=20sed2v2.inp=20(HAVE_DIRENT_H):=20Edit=20= to=201=0A+=0A=202010-07-12=20=20Eli=20Zaretskii=20=20=0A=20= =0A=20=09*=20sed1v2.inp=20(C_WARNINGS_SWITCH,=20PROFILING_CFLAGS,=20= PROFILING_LDFLAGS):=0A=0A=3D=3D=3D=20modified=20file=20= 'msdos/sed2v2.inp'=0A---=20msdos/sed2v2.inp=092010-07-11=2013:43:10=20= +0000=0A+++=20msdos/sed2v2.inp=092010-07-27=2001:05:52=20+0000=0A@@=20= -57,6=20+57,7=20@@=0A=20/^#undef=20PACKAGE_TARNAME/s/^.*$/#define=20= PACKAGE_TARNAME=20""/=0A=20/^#undef=20PACKAGE_VERSION/s/^.*$/#define=20= PACKAGE_VERSION=20""/=0A=20/^#undef=20= SYS_SIGLIST_DECLARED/s/^.*$/#define=20SYS_SIGLIST_DECLARED=201/=0A= +/^#undef=20HAVE_DIRENT_H/s/^.*$/#define=20HAVE_DIRENT_H=201/=0A=20=0A=20= /^#undef=20GNU_MALLOC=20*$/s/^.*$/#define=20GNU_MALLOC=201/=0A=20= /^#undef=20REL_ALLOC=20*$/s/^.*$/#define=20REL_ALLOC=201/=0A=0A=3D=3D=3D=20= modified=20file=20'src/ChangeLog'=0A---=20src/ChangeLog=092010-07-26=20= 00:43:58=20+0000=0A+++=20src/ChangeLog=092010-07-27=2002:19:03=20+0000=0A= @@=20-1,3=20+1,11=20@@=0A+2010-07-27=20=20Chad=20Brown=20=20= =0A+=0A+=09Replace=20tests=20for=20SYSV_SYSTEM_DIR=20= with=20HAVE_DIRENT_H,=20set=20via=20autoconf=0A+=09*=20dired.c,=20= sysdep.c:=20test=20HAVE_DIRENT_H=20instead=20of=20SYSV_SYSTEM_DIR=0A+=0A= +=09*=20s/aix4-2.h,=20s/bsd-common.h,=20s/cygwin.h,=20s/gnu-linux.h,=0A+=09= =20=20s/msdos.h,=20s/usg5-4.h:=20don't=20define=20SYSV_SYSTEM_DIR=0A+=0A=20= 2010-07-26=20=20Juanma=20Barranquero=20=20=0A=20=0A=20=09= *=20lread.c=20(unreadpure,=20mapatoms_1):=20Make=20static.=0A=0A=3D=3D=3D=20= modified=20file=20'src/config.in'=0A---=20src/config.in=092010-07-25=20= 19:09:54=20+0000=0A+++=20src/config.in=092010-07-26=2002:43:53=20+0000=0A= @@=20-737,6=20+737,9=20@@=0A=20/*=20Define=20to=201=20if=20you=20have=20= the=20=20header=20file.=20*/=0A=20#undef=20HAVE_UTMP_H=0A=20=0A= +/*=20Define=20to=201=20if=20you=20have=20the=20=20header=20= file.=20*/=0A+#undef=20HAVE_DIRENT_H=0A+=0A=20/*=20Define=20to=201=20if=20= you=20have=20the=20`vfork'=20function.=20*/=0A=20#undef=20HAVE_VFORK=0A=20= =0A=0A=3D=3D=3D=20modified=20file=20'src/dired.c'=0A---=20src/dired.c=09= 2010-07-25=2000:20:51=20+0000=0A+++=20src/dired.c=092010-07-27=20= 00:55:10=20+0000=0A@@=20-48,29=20+48,22=20@@=0A=20=20=20=20Since=20= applying=20strlen=20to=20the=20name=20always=20works,=20we'll=20just=20= do=20that.=20=20*/=0A=20#define=20NAMLEN(p)=20strlen=20(p->d_name)=0A=20=0A= -#ifdef=20SYSV_SYSTEM_DIR=0A+#ifdef=20HAVE_DIRENT_H=0A=20=0A=20#include=20= =0A=20#define=20DIRENTRY=20struct=20dirent=0A=20=0A-#else=20/*=20= not=20SYSV_SYSTEM_DIR=20*/=0A+#else=20/*=20not=20HAVE_DIRENT_H=20*/=0A=20= =0A-#ifdef=20MSDOS=0A-#include=20=0A-#else=0A=20#include=20= =0A-#endif=0A-=0A=20#include=20=0A=20=0A-#ifndef=20= MSDOS=0A=20#define=20DIRENTRY=20struct=20direct=0A=20=0A=20extern=20DIR=20= *opendir=20(char=20*);=0A=20extern=20struct=20direct=20*readdir=20(DIR=20= *);=0A=20=0A-#endif=20/*=20not=20MSDOS=20*/=0A-#endif=20/*=20not=20= SYSV_SYSTEM_DIR=20*/=0A+#endif=20/*=20HAVE_DIRENT_H=20*/=0A=20=0A=20/*=20= Some=20versions=20of=20Cygwin=20don't=20have=20d_ino=20in=20`struct=20= dirent'.=20=20*/=0A=20#if=20defined(MSDOS)=20||=20defined(__CYGWIN__)=0A=0A= =3D=3D=3D=20modified=20file=20'src/s/aix4-2.h'=0A---=20src/s/aix4-2.h=09= 2010-06-30=2002:48:54=20+0000=0A+++=20src/s/aix4-2.h=092010-07-26=20= 08:23:46=20+0000=0A@@=20-47,11=20+47,6=20@@=0A=20/*=20Define=20= HAVE_SOCKETS=20if=20system=20supports=204.2-compatible=20sockets.=20=20= */=0A=20#define=20HAVE_SOCKETS=0A=20=0A-=0A-/*=20Define=20= SYSV_SYSTEM_DIR=20to=20use=20the=20V.3=20getdents/readir=20library=0A-=20= =20=20functions.=20=20Almost,=20but=20not=20quite=20the=20same=20as=20= the=204.2=20functions.=20=20*/=0A-#define=20SYSV_SYSTEM_DIR=0A-=0A=20/*=20= The=20file=20containing=20the=20kernel's=20symbol=20table=20is=20called=20= /unix.=20=20*/=0A=20#define=20KERNEL_FILE=20"/unix"=0A=20=0A=0A=3D=3D=3D=20= modified=20file=20'src/s/bsd-common.h'=0A---=20src/s/bsd-common.h=09= 2010-06-06=2008:57:39=20+0000=0A+++=20src/s/bsd-common.h=092010-07-26=20= 08:23:45=20+0000=0A@@=20-45,8=20+45,6=20@@=0A=20#define=20HAVE_TERMIOS=0A= =20#define=20NO_TERMIO=0A=20=0A-#define=20SYSV_SYSTEM_DIR=0A-=0A=20/*=20= If=20the=20system's=20imake=20configuration=20file=20defines=20= `NeedWidePrototypes'=0A=20=20=20=20as=20`NO',=20we=20must=20define=20= NARROWPROTO=20manually.=20=20Such=20a=20define=20is=0A=20=20=20=20= generated=20in=20the=20Makefile=20generated=20by=20`xmkmf'.=20=20If=20we=20= don't=0A=0A=3D=3D=3D=20modified=20file=20'src/s/cygwin.h'=0A---=20= src/s/cygwin.h=092010-06-06=2008:57:39=20+0000=0A+++=20src/s/cygwin.h=09= 2010-07-26=2008:23:44=20+0000=0A@@=20-89,7=20+89,6=20@@=0A=20#define=20= CYGWIN=201=0A=20=0A=20#define=20PENDING_OUTPUT_COUNT(FILE)=20((FILE)->_p=20= -=20(FILE)->_bf._base)=0A-#define=20SYSV_SYSTEM_DIR=201=0A=20=0A=20= #define=20HAVE_SOCKETS=0A=20=0A=0A=3D=3D=3D=20modified=20file=20= 'src/s/gnu-linux.h'=0A---=20src/s/gnu-linux.h=092010-06-06=2008:57:39=20= +0000=0A+++=20src/s/gnu-linux.h=092010-07-26=2008:23:43=20+0000=0A@@=20= -124,8=20+124,6=20@@=0A=20#define=20INTERRUPT_INPUT=0A=20#endif=20/*=20= emacs=20*/=0A=20=0A-#define=20SYSV_SYSTEM_DIR=20=20=20=20=20=20=20/*=20= use=20dirent.h=20*/=0A-=0A=20#define=20POSIX=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20/*=20affects=20getpagesize.h=20and=20systty.h=20*/=0A= =20=0A=20/*=20This=20is=20to=20work=20around=20mysterious=20gcc=20= failures=20in=20some=20system=20versions.=0A=0A=3D=3D=3D=20modified=20= file=20'src/s/msdos.h'=0A---=20src/s/msdos.h=092010-07-12=2016:56:59=20= +0000=0A+++=20src/s/msdos.h=092010-07-26=2008:23:42=20+0000=0A@@=20-38,8=20= +38,6=20@@=0A=20=20=20=20It=20sets=20the=20Lisp=20variable=20= system-type.=20=20*/=0A=20#define=20SYSTEM_TYPE=20"ms-dos"=0A=20=0A= -#define=20SYSV_SYSTEM_DIR=0A-=0A=20/*=20subprocesses=20should=20be=20= defined=20if=20you=20want=20to=20have=20code=20for=0A=20=20=20=20= asynchronous=20subprocesses=20(as=20used=20in=20M-x=20compile=20and=20= M-x=20shell).=0A=20=20=20=20This=20is=20the=20only=20system=20that=20= needs=20this.=20=20*/=0A=0A=3D=3D=3D=20modified=20file=20= 'src/s/usg5-4.h'=0A---=20src/s/usg5-4.h=092010-07-11=2010:31:10=20+0000=0A= +++=20src/s/usg5-4.h=092010-07-26=2008:23:40=20+0000=0A@@=20-35,10=20= +35,6=20@@=0A=20=20=20=20for=20terminal=20control.=20=20*/=0A=20#define=20= HAVE_TERMIO=0A=20=0A-/*=20Define=20SYSV_SYSTEM_DIR=20to=20use=20the=20= V.3=20getdents/readir=20library=0A-=20=20=20functions.=20Almost,=20but=20= not=20quite=20the=20same=20as=20the=204.2=20functions.=20=20*/=0A= -#define=20SYSV_SYSTEM_DIR=0A-=0A=20/*=20The=20file=20containing=20the=20= kernel's=20symbol=20table=20is=20called=20/unix.=20=20*/=0A=20#define=20= KERNEL_FILE=20"/unix"=0A=20=0A=0A=3D=3D=3D=20modified=20file=20= 'src/sysdep.c'=0A---=20src/sysdep.c=092010-07-13=2010:57:00=20+0000=0A= +++=20src/sysdep.c=092010-07-26=2009:01:39=20+0000=0A@@=20-2447,7=20= +2447,7=20@@=0A=20=0C=0A=20/*=20Directory=20routines=20for=20systems=20= that=20don't=20have=20them.=20*/=0A=20=0A-#ifdef=20SYSV_SYSTEM_DIR=0A= +#ifdef=20HAVE_DIRENT_H=0A=20=0A=20#include=20=0A=20=0A@@=20= -2464,7=20+2464,7=20@@=0A=20=20=20return=20rtnval;=0A=20}=0A=20#endif=20= /*=20not=20HAVE_CLOSEDIR=20*/=0A-#endif=20/*=20SYSV_SYSTEM_DIR=20*/=0A= +#endif=20/*=20HAVE_DIRENT_H=20*/=0A=20=0A=20=0C=0A=20int=0A=0A= --Apple-Mail-2--835568095--