Commit c3e7b943 authored by Paul Eggert's avatar Paul Eggert

Merge from gnulib.

This incorporates:
2014-05-21 fchdir: port 'open' and 'close' redefinitions to AIX 7.1
* doc/misc/texinfo.tex, lib/openat-proc.c: Update from gnulib.
parent a366fbe2
2014-05-27 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2014-05-21 fchdir: port 'open' and 'close' redefinitions to AIX 7.1
* lib/openat-proc.c: Update from gnulib.
2014-05-26 Paul Eggert <eggert@cs.ucla.edu> 2014-05-26 Paul Eggert <eggert@cs.ucla.edu>
Fix port to 32-bit AIX (Bug#17540). Fix port to 32-bit AIX (Bug#17540).
......
2014-05-27 Paul Eggert <eggert@cs.ucla.edu>
* texinfo.tex: Update from gnulib.
2014-05-26 Paul Eggert <eggert@cs.ucla.edu> 2014-05-26 Paul Eggert <eggert@cs.ucla.edu>
Specify coding if Latin-1 Emacs would misinterpret (Bug#17575). Specify coding if Latin-1 Emacs would misinterpret (Bug#17575).
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex. % Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
% %
\def\texinfoversion{2014-05-05.10} \def\texinfoversion{2014-05-20.16}
% %
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
...@@ -8856,20 +8856,20 @@ ...@@ -8856,20 +8856,20 @@
{ {
\catcode`\_ = \active \catcode`\_ = \active
\globaldefs=1 \globaldefs=1
\parseargdef\documentlanguage{\begingroup \parseargdef\documentlanguage{%
\let_=\normalunderscore % normal _ character for filenames
\tex % read txi-??.tex file in plain TeX. \tex % read txi-??.tex file in plain TeX.
% Read the file by the name they passed if it exists. % Read the file by the name they passed if it exists.
\let_ = \normalunderscore % normal _ character for filename test
\openin 1 txi-#1.tex \openin 1 txi-#1.tex
\ifeof 1 \ifeof 1
\documentlanguagetrywithoutunderscore{#1_\finish}% \documentlanguagetrywithoutunderscore #1_\finish
\else \else
\globaldefs = 1 % everything in the txi-LL files needs to persist \globaldefs = 1 % everything in the txi-LL files needs to persist
\input txi-#1.tex \input txi-#1.tex
\fi \fi
\closein 1 \closein 1
\endgroup % end raw TeX \endgroup % end raw TeX
\endgroup} }
% %
% If they passed de_DE, and txi-de_DE.tex doesn't exist, % If they passed de_DE, and txi-de_DE.tex doesn't exist,
% try txi-de.tex. % try txi-de.tex.
......
...@@ -32,14 +32,6 @@ ...@@ -32,14 +32,6 @@
#include "intprops.h" #include "intprops.h"
/* The results of open() in this file are not used with fchdir,
and we do not leak fds to any single-threaded code that could use stdio,
therefore save some unnecessary work in fchdir.c.
FIXME - if the kernel ever adds support for multi-thread safety for
avoiding standard fds, then we should use open_safer. */
#undef open
#undef close
#define PROC_SELF_FD_FORMAT "/proc/self/fd/%d/%s" #define PROC_SELF_FD_FORMAT "/proc/self/fd/%d/%s"
#define PROC_SELF_FD_NAME_SIZE_BOUND(len) \ #define PROC_SELF_FD_NAME_SIZE_BOUND(len) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment