]> git.ipfire.org Git - thirdparty/bash.git/commitdiff
commit bash-20050421 snapshot
authorChet Ramey <chet.ramey@case.edu>
Sat, 3 Dec 2011 18:46:00 +0000 (13:46 -0500)
committerChet Ramey <chet.ramey@case.edu>
Sat, 3 Dec 2011 18:46:00 +0000 (13:46 -0500)
CWRU/CWRU.chlog
autom4te.cache/requests
redir.c

index aaf010dd93ed53d0e1c85d83ec2e7b5a6b62f1fb..7e1be40f5bdb960c7befe2e1e717575f0947f4cd 100644 (file)
@@ -11327,3 +11327,8 @@ builtins/read.def
        - make sure the ^As added for internal quoting are not counted as
          characters read when -n is supplied
 
+                                  4/20
+                                  ----
+redir.c
+       - fix redir_open so that the repeat open on failure that AFS support
+         adds restores the correct value of errno for any error message
index 94f88994869a09c6d5fc8ff04870aaf5a560b491..11fedd29913161803dbac16413f34ebdc97c91d4 100644 (file)
                         'configure.in'
                       ],
                       {
-                        'm4_pattern_allow' => 1,
+                        'AC_PROG_RANLIB' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AC_PROG_GCC_TRADITIONAL' => 1,
+                        'AC_HEADER_DIRENT' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AC_PROG_YACC' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_SUBST' => 1,
+                        'AC_FUNC_MALLOC' => 1,
+                        'AC_C_INLINE' => 1,
                         'm4_pattern_forbid' => 1,
+                        'AC_FUNC_WAIT3' => 1,
                         'AC_FUNC_ALLOCA' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_TYPE_SIZE_T' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AC_REPLACE_FNMATCH' => 1,
+                        'AC_FUNC_CHOWN' => 1,
+                        'AC_PROG_MAKE_SET' => 1,
+                        'AC_INIT' => 1,
+                        'AC_PROG_CXX' => 1,
+                        'AC_CHECK_FUNCS' => 1,
+                        'AC_PROG_LEX' => 1,
+                        'AC_FUNC_MBRTOWC' => 1,
+                        'AC_FUNC_FSEEKO' => 1,
                         'AC_TYPE_SIGNAL' => 1,
-                        'AC_STRUCT_TM' => 1,
-                        'AC_STRUCT_TIMEZONE' => 1,
-                        'AC_FUNC_SELECT_ARGTYPES' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_PROG_CC' => 1,
+                        'AC_FUNC_STRTOD' => 1,
+                        'AC_TYPE_PID_T' => 1,
+                        'AC_FUNC_CLOSEDIR_VOID' => 1,
+                        'm4_pattern_allow' => 1,
                         'AC_FUNC_GETLOADAVG' => 1,
-                        'AC_FUNC_WAIT3' => 1,
-                        'AC_FUNC_STRERROR_R' => 1,
-                        'AC_FUNC_MBRTOWC' => 1,
-                        'AC_CHECK_FUNCS' => 1,
-                        'AC_HEADER_TIME' => 1,
-                        'AC_PROG_CPP' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'm4_include' => 1,
-                        '_m4_warn' => 1,
-                        'AC_C_VOLATILE' => 1,
-                        'AC_FUNC_CHOWN' => 1,
-                        'AC_CHECK_TYPES' => 1,
-                        'AC_HEADER_DIRENT' => 1,
-                        'm4_sinclude' => 1,
+                        'AC_CHECK_MEMBERS' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
                         'AC_FUNC_SETVBUF_REVERSED' => 1,
-                        'AC_FUNC_STRCOLL' => 1,
-                        'AC_CHECK_LIB' => 1,
-                        'AH_OUTPUT' => 1,
-                        'AC_FUNC_VPRINTF' => 1,
-                        'AC_TYPE_PID_T' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'AC_FUNC_UTIME_NULL' => 1,
-                        'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
-                        'AC_FUNC_SETPGRP' => 1,
-                        'AC_PROG_GCC_TRADITIONAL' => 1,
-                        'AC_HEADER_SYS_WAIT' => 1,
-                        'AC_HEADER_STAT' => 1,
-                        'AC_C_CONST' => 1,
-                        'AM_PROG_CC_C_O' => 1,
+                        'AC_HEADER_STDC' => 1,
+                        'AC_PROG_INSTALL' => 1,
+                        'AC_TYPE_UID_T' => 1,
                         'AC_FUNC_GETGROUPS' => 1,
-                        'AC_FUNC_FSEEKO' => 1,
-                        'AC_DECL_SYS_SIGLIST' => 1,
-                        'AC_FUNC_CLOSEDIR_VOID' => 1,
-                        'AC_REPLACE_FNMATCH' => 1,
-                        'AC_CONFIG_LINKS' => 1,
+                        'AC_FUNC_STRCOLL' => 1,
+                        'AC_PROG_CPP' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AC_PATH_X' => 1,
-                        'AC_FUNC_STRTOD' => 1,
-                        'AC_CHECK_MEMBERS' => 1,
-                        'AC_TYPE_UID_T' => 1,
+                        'AC_FUNC_GETMNTENT' => 1,
                         'AC_FUNC_MEMCMP' => 1,
-                        'AC_TYPE_OFF_T' => 1,
-                        'AC_STRUCT_ST_BLOCKS' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AC_HEADER_STAT' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AC_FUNC_STRNLEN' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'm4_sinclude' => 1,
+                        'AC_FUNC_SELECT_ARGTYPES' => 1,
                         'AC_FUNC_MKTIME' => 1,
-                        'AC_HEADER_STDC' => 1,
-                        'AC_PROG_RANLIB' => 1,
-                        'AC_PROG_LEX' => 1,
-                        'sinclude' => 1,
-                        'AC_FUNC_FORK' => 1,
+                        'AC_LIBSOURCE' => 1,
                         'AC_CONFIG_HEADERS' => 1,
-                        'AC_PROG_INSTALL' => 1,
-                        'AC_FUNC_STRNLEN' => 1,
-                        'AC_SUBST' => 1,
-                        'AC_FUNC_STAT' => 1,
-                        'AC_FUNC_GETPGRP' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
+                        'include' => 1,
                         'AC_FUNC_LSTAT' => 1,
-                        'AC_C_INLINE' => 1,
+                        'AC_HEADER_MAJOR' => 1,
                         'AC_FUNC_ERROR_AT_LINE' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AC_FUNC_STRFTIME' => 1,
+                        'sinclude' => 1,
+                        'AC_TYPE_MODE_T' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AC_FUNC_VPRINTF' => 1,
+                        'AC_STRUCT_TIMEZONE' => 1,
+                        'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
                         'AC_CONFIG_FILES' => 1,
+                        'AC_FUNC_MMAP' => 1,
+                        'AC_STRUCT_TM' => 1,
+                        'AC_TYPE_SIZE_T' => 1,
+                        'AC_CHECK_HEADERS' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AC_CHECK_TYPES' => 1,
+                        'AC_FUNC_STAT' => 1,
+                        'AC_FUNC_STRERROR_R' => 1,
+                        'm4_include' => 1,
+                        'AC_DECL_SYS_SIGLIST' => 1,
+                        'AC_C_CONST' => 1,
+                        'AC_CHECK_LIB' => 1,
                         'AM_GNU_GETTEXT' => 1,
-                        'AC_PROG_LN_S' => 1,
-                        'AC_PROG_AWK' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_PROG_MAKE_SET' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AC_PROG_YACC' => 1,
-                        'AC_PROG_CC' => 1,
-                        'AC_PROG_CXX' => 1,
-                        'AC_FUNC_STRFTIME' => 1,
-                        'AC_INIT' => 1,
+                        'AC_FUNC_UTIME_NULL' => 1,
                         'AC_FUNC_REALLOC' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AC_FUNC_GETPGRP' => 1,
+                        'AC_HEADER_SYS_WAIT' => 1,
+                        'AC_TYPE_OFF_T' => 1,
                         'AC_FUNC_OBSTACK' => 1,
-                        'AC_FUNC_MALLOC' => 1,
-                        'AC_FUNC_MMAP' => 1,
-                        'AC_FUNC_GETMNTENT' => 1,
-                        'AC_TYPE_MODE_T' => 1,
-                        'include' => 1,
-                        'AC_HEADER_MAJOR' => 1,
-                        'AC_CHECK_HEADERS' => 1
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_FUNC_FORK' => 1,
+                        'AC_PROG_AWK' => 1,
+                        'AC_STRUCT_ST_BLOCKS' => 1,
+                        '_m4_warn' => 1,
+                        'AC_FUNC_SETPGRP' => 1,
+                        'AC_PROG_LN_S' => 1,
+                        'AC_C_VOLATILE' => 1,
+                        'AC_HEADER_TIME' => 1
                       }
                     ], 'Autom4te::Request' )
            );
diff --git a/redir.c b/redir.c
index 6c755ab18ac92df8fa7730d3669339a4dfdf7522..61e4d86e7067f3d5747ed5f4f75d8fa1d085591d 100644 (file)
--- a/redir.c
+++ b/redir.c
@@ -596,7 +596,10 @@ redir_open (filename, flags, mode, ri)
       fd = open (filename, flags, mode);
 #if defined (AFS)
       if ((fd < 0) && (errno == EACCES))
-       fd = open (filename, flags & ~O_CREAT, mode);
+       {
+         fd = open (filename, flags & ~O_CREAT, mode);
+         errno = EACCES;       /* restore errno */
+       }
 #endif /* AFS */
     }