This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-188-g5c43483
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 20 Aug 2011 13:22:43 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-188-g5c43483
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 5c43483f0c868a29161979a783b7a728d665f06e (commit)
via a101b025af141e956feb04042ee75e28997c0011 (commit)
via fd708658c35f9fae6b03ab89014bb19ba6f90952 (commit)
from 0276a718c0fa58916a6e7c54bad22b4e58bb39b4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5c43483f0c868a29161979a783b7a728d665f06e
commit 5c43483f0c868a29161979a783b7a728d665f06e
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Aug 20 09:22:16 2011 -0400
Add test for BZ 13114
diff --git a/ChangeLog b/ChangeLog
index ab0f3e3..679dd69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-20 Ulrich Drepper <drepper@gmail.com>
+
+ [BZ #13114]
+ * stdio-common/Makefile (tests): Add bug24.
+ * stdio-common/bug24.c: New file.
+
2011-08-19 Andreas Jaeger <aj@suse.de>
[BZ #13114]
diff --git a/NEWS b/NEWS
index 78810a9..89049c8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes. 2011-8-8
+GNU C Library NEWS -- history of user-visible changes. 2011-8-20
Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
See the end for copying conditions.
@@ -9,7 +9,7 @@ Version 2.15
* The following bugs are resolved with this release:
- 9696, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007, 13021
+ 9696, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007, 13021, 13114
* New program pldd to list loaded object of a process
Implemented by Ulrich Drepper.
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 6c71f1c..006f546 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -60,7 +60,7 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
- scanf16 scanf17 tst-setvbuf1 tst-grouping bug23
+ scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24
test-srcs = tst-unbputc tst-printf
diff --git a/stdio-common/bug24.c b/stdio-common/bug24.c
new file mode 100644
index 0000000..4e6ffcc
--- /dev/null
+++ b/stdio-common/bug24.c
@@ -0,0 +1,26 @@
+#include <stdio.h>
+#include <errno.h>
+
+static int
+do_test (void)
+{
+ FILE *fp = fopen ("/foobar_does_no_exit", "re");
+ if (fp != NULL)
+ {
+ /* A joker created this file. Ignore the test. */
+ fclose (fp);
+ return 0;
+ }
+
+ if (errno == ENOENT)
+ {
+ printf ("no bug\n");
+ return 0;
+ }
+
+ printf ("bug : expected ENOENT, got: %m\n");
+ return 1;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a101b025af141e956feb04042ee75e28997c0011
commit a101b025af141e956feb04042ee75e28997c0011
Author: Andreas Jaeger <aj@suse.de>
Date: Sat Aug 20 09:12:49 2011 -0400
Fix fopen (non-existing-file, "re") errno
diff --git a/ChangeLog b/ChangeLog
index 206765b..ab0f3e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-19 Andreas Jaeger <aj@suse.de>
+
+ [BZ #13114]
+ * libio/fileops.c (_IO_new_file_fopen): Fix handling of
+ non-existant file when using close-on-exec mode.
+
2011-08-20 Ulrich Drepper <drepper@gmail.com>
* sysdeps/x86_64/dl-trampoline.S (_dl_runtime_resolve): Fix CFI for
diff --git a/libio/fileops.c b/libio/fileops.c
index 30de460..a6f7cba 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -345,23 +345,22 @@ _IO_new_file_fopen (fp, filename, mode, is32not64)
result = _IO_file_open (fp, filename, omode|oflags, oprot, read_write,
is32not64);
-#ifndef __ASSUME_O_CLOEXEC
- if ((fp->_flags2 & _IO_FLAGS2_CLOEXEC) != 0 && __have_o_cloexec <= 0)
+ if (result != NULL)
{
- int fd = _IO_fileno (fp);
- if (__have_o_cloexec == 0)
+#ifndef __ASSUME_O_CLOEXEC
+ if ((fp->_flags2 & _IO_FLAGS2_CLOEXEC) != 0 && __have_o_cloexec <= 0)
{
- int flags = __fcntl (fd, F_GETFD);
- __have_o_cloexec = (flags & FD_CLOEXEC) == 0 ? -1 : 1;
+ int fd = _IO_fileno (fp);
+ if (__have_o_cloexec == 0)
+ {
+ int flags = __fcntl (fd, F_GETFD);
+ __have_o_cloexec = (flags & FD_CLOEXEC) == 0 ? -1 : 1;
+ }
+ if (__have_o_cloexec < 0)
+ __fcntl (fd, F_SETFD, FD_CLOEXEC);
}
- if (__have_o_cloexec < 0)
- __fcntl (fd, F_SETFD, FD_CLOEXEC);
- }
#endif
-#ifdef _LIBC
- if (result != NULL)
- {
/* Test whether the mode string specifies the conversion. */
cs = strstr (last_recognized + 1, ",ccs=");
if (cs != NULL)
@@ -432,7 +431,6 @@ _IO_new_file_fopen (fp, filename, mode, is32not64)
result->_mode = 1;
}
}
-#endif /* GNU libc */
return result;
}
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fd708658c35f9fae6b03ab89014bb19ba6f90952
commit fd708658c35f9fae6b03ab89014bb19ba6f90952
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat Aug 20 09:01:33 2011 -0400
Fix CL entry
diff --git a/ChangeLog b/ChangeLog
index b1c0946..206765b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,7 +17,7 @@
* sysdeps/unix/sysv/linux/powerpc/powerpc32/scandir64.c: Renamed
from sysdeps/unix/sysv/linux/powerpc/scandir64.c.
-2011-08-14 David S. Miller <davem@firepit.lan>
+2011-08-14 David S. Miller <davem@davemloft.net>
* sysdeps/unix/sysv/linux/Makefile (CFLAGS-tst-writev.c): The
artificual limit depends upon the system page size.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 14 +++++++++++++-
NEWS | 4 ++--
libio/fileops.c | 24 +++++++++++-------------
stdio-common/Makefile | 2 +-
stdio-common/bug24.c | 26 ++++++++++++++++++++++++++
5 files changed, 53 insertions(+), 17 deletions(-)
create mode 100644 stdio-common/bug24.c
hooks/post-receive
--
GNU C Library master sources