r4877 - glibc-package/branches/glibc-branch-squeeze/debian/patches
Author: aurel32
Date: 2011-08-13 10:38:06 +0000 (Sat, 13 Aug 2011)
New Revision: 4877
Modified:
glibc-package/branches/glibc-branch-squeeze/debian/patches/svn-updates.diff
Log:
Remove one more broken patch
Modified: glibc-package/branches/glibc-branch-squeeze/debian/patches/svn-updates.diff
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/patches/svn-updates.diff 2011-08-12 20:40:02 UTC (rev 4876)
+++ glibc-package/branches/glibc-branch-squeeze/debian/patches/svn-updates.diff 2011-08-13 10:38:06 UTC (rev 4877)
@@ -191,175 +191,8 @@
if (mode[0] == 'a')
c->pos = c->maxpos;
---- a/libio/bug-fclose1.c (revision 0)
-+++ b/libio/bug-fclose1.c (revision 14920)
-@@ -0,0 +1,132 @@
-+// BZ #12724
-+
-+static void do_prepare (void);
-+#define PREPARE(argc, argv) do_prepare ()
-+static int do_test (void);
-+#define TEST_FUNCTION do_test()
-+#include "../test-skeleton.c"
-+
-+
-+static int fd;
-+
-+
-+static void
-+do_prepare (void)
-+{
-+ fd = create_temp_file ("bug-fclose1.", NULL);
-+ if (fd == -1)
-+ {
-+ printf ("cannot create temporary file: %m\n");
-+ exit (1);
-+ }
-+}
-+
-+
-+static int
-+do_test (void)
-+{
-+ static const char pattern[] = "hello world";
-+
-+ /* Prepare a seekable file. */
-+ if (write (fd, pattern, sizeof pattern) != sizeof pattern)
-+ {
-+ printf ("cannot write pattern: %m\n");
-+ return 1;
-+ }
-+ if (lseek (fd, 1, SEEK_SET) != 1)
-+ {
-+ printf ("cannot seek after write: %m\n");
-+ return 1;
-+ }
-+
-+ /* Create an output stream visiting the file; when it is closed, all
-+ other file descriptors visiting the file must see the new file
-+ position. */
-+ int fd2 = dup (fd);
-+ if (fd2 < 0)
-+ {
-+ printf ("cannot duplicate descriptor for writing: %m\n");
-+ return 1;
-+ }
-+ FILE *f = fdopen (fd2, "w");
-+ if (f == NULL)
-+ {
-+ printf ("first fdopen failed: %m\n");
-+ return 1;
-+ }
-+ if (fputc (pattern[1], f) != pattern[1])
-+ {
-+ printf ("fputc failed: %m\n");
-+ return 1;
-+ }
-+ if (fclose (f) != 0)
-+ {
-+ printf ("first fclose failed: %m\n");
-+ return 1;
-+ }
-+ errno = 0;
-+ if (lseek (fd2, 0, SEEK_CUR) != -1)
-+ {
-+ printf ("lseek after fclose after write did not fail\n");
-+ return 1;
-+ }
-+ if (errno != EBADF)
-+ {
-+ printf ("lseek after fclose after write did not fail with EBADF: %m\n");
-+ return 1;
-+ }
-+ off_t o = lseek (fd, 0, SEEK_CUR);
-+ if (o != 2)
-+ {
-+ printf ("\
-+lseek on original descriptor after first fclose returned %ld, expected 2\n",
-+ (long int) o);
-+ return 1;
-+ }
-+
-+ /* Likewise for an input stream. */
-+ fd2 = dup (fd);
-+ if (fd2 < 0)
-+ {
-+ printf ("cannot duplicate descriptor for reading: %m\n");
-+ return 1;
-+ }
-+ f = fdopen (fd2, "r");
-+ if (f == NULL)
-+ {
-+ printf ("second fdopen failed: %m\n");
-+ return 1;
-+ }
-+ char c = fgetc (f);
-+ if (c != pattern[2])
-+ {
-+ printf ("getc returned %c, expected %c\n", c, pattern[2]);
-+ return 1;
-+ }
-+ if (fclose (f) != 0)
-+ {
-+ printf ("second fclose failed: %m\n");
-+ return 1;
-+ }
-+ errno = 0;
-+ if (lseek (fd2, 0, SEEK_CUR) != -1)
-+ {
-+ printf ("lseek after fclose after read did not fail\n");
-+ return 1;
-+ }
-+ if (errno != EBADF)
-+ {
-+ printf ("lseek after fclose after read did not fail with EBADF: %m\n");
-+ return 1;
-+ }
-+ o = lseek (fd, 0, SEEK_CUR);
-+ if (o != 3)
-+ {
-+ printf ("\
-+lseek on original descriptor after second fclose returned %ld, expected 3\n",
-+ (long int) o);
-+ return 1;
-+ }
-+
-+ return 0;
-+}
--- a/libio/fileops.c (revision 12231)
+++ b/libio/fileops.c (revision 14920)
-@@ -161,19 +161,27 @@
- _IO_new_file_close_it (fp)
- _IO_FILE *fp;
- {
-- int write_status, close_status;
- if (!_IO_file_is_open (fp))
- return EOF;
-
-- if ((fp->_flags & _IO_NO_WRITES) == 0
-- && (fp->_flags & _IO_CURRENTLY_PUTTING) != 0)
-+ int write_status;
-+ if (_IO_in_put_mode (fp))
- write_status = _IO_do_flush (fp);
-+ else if (fp->_offset != _IO_pos_BAD && fp->_IO_read_base != NULL
-+ && !_IO_in_backup (fp))
-+ {
-+ off64_t o = _IO_SEEKOFF (fp, 0, _IO_seek_cur, 0);
-+ if (o == WEOF)
-+ write_status = EOF;
-+ else
-+ write_status = _IO_SYSSEEK (fp, o, SEEK_SET) < 0 ? EOF : 0;
-+ }
- else
- write_status = 0;
-
- INTUSE(_IO_unsave_markers) (fp);
-
-- close_status = _IO_SYSCLOSE (fp);
-+ int close_status = _IO_SYSCLOSE (fp);
-
- /* Free buffer. */
- #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
@@ -291,7 +299,7 @@
#ifdef _LIBC
last_recognized = mode;
@@ -423,23 +256,6 @@
/* Now write out the remainder. Normally, this will fit in the
buffer, but it's somewhat messier for line-buffered files,
---- a/libio/Makefile (revision 12231)
-+++ b/libio/Makefile (revision 14920)
-@@ -1,4 +1,4 @@
--# Copyright (C) 1995-2004,2006,2007,2008,2009 Free Software Foundation, Inc.
-+# Copyright (C) 1995-2004,2006-2009,2011 Free Software Foundation, Inc.
- # This file is part of the GNU C Library.
-
- # The GNU C Library is free software; you can redistribute it and/or
-@@ -67,7 +67,7 @@
- tst-mmap2-eofsync tst-mmap-offend bug-fopena+ \
- bug-ungetc2 bug-ungetc3 bug-ungetc4 \
- tst-memstream1 tst-memstream2 \
-- bug-memstream1 tst-popen1
-+ bug-memstream1 tst-popen1 bug-fclose1
- tests-$(OPTION_EGLIBC_LOCALE_CODE) \
- += tst-swscanf tst-fgetws tst-fopenloc tst-setvbuf1 \
- tst-ungetwc1 tst-ungetwc2 bug-ftell bug-ungetwc2 \
--- a/wcsmbs/bits/wchar2.h (revision 12231)
+++ b/wcsmbs/bits/wchar2.h (revision 14920)
@@ -1,5 +1,5 @@
@@ -637,7 +453,7 @@
Architectures must provide a few lowlevel macros (the compare
--- a/ChangeLog (revision 12231)
+++ b/ChangeLog (revision 14920)
-@@ -1,3 +1,369 @@
+@@ -1,3 +1,359 @@
+2011-05-17 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #12775]
@@ -662,20 +478,10 @@
+ * sysdeps/pthread/aio_misc.c (__aio_init): Compute optim.aio_num
+ correctly.
+
-+ * libio/fileops.c (_IO_new_file_close_it): Initialize write_status.
-+
+ * iconv/loop.c (SINGLE) [STORE_REST]: Add input bytes to bytebuf before
+ storing incomplete byte sequence in state object. Avoid testing for
+ guaranteed too small input if we know there is enough data available.
+
-+2011-05-13 Ulrich Drepper <drepper@gmail.com>
-+
-+ [BZ #12724]
-+ * libio/fileops.c (_IO_new_file_close_it): Always flush when
-+ currently writing and seek to current position when not.
-+ * libio/Makefile (tests): Add bug-fclose1.
-+ * libio/bug-fclose1.c: New file.
-+
+2011-05-12 Ulrich Drepper <drepper@gmail.com>
+
+ [BZ #12511]
Reply to: