Author: sthibault
Date: 2010-06-06 22:21:17 +0000 (Sun, 06 Jun 2010)
New Revision: 4326
Added:
glibc-package/trunk/debian/patches/hurd-i386/submitted-ttyname.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc
Log:
* Add patches/hurd-i386/submitted-ttyname.diff to fix io/tst-ttyname_r,
marked as such in testsuite-checking/expected-results-i486-gnu-libc.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-06-05 22:55:29 UTC (rev
4325)
+++ glibc-package/trunk/debian/changelog 2010-06-06 22:21:17 UTC (rev
4326)
@@ -2,6 +2,8 @@
[ Samuel Thibault ]
* Add patches/hurd-i386/cvs-linkat.diff to fix new coreutils' ln.
+ * Add patches/hurd-i386/submitted-ttyname.diff to fix io/tst-ttyname_r,
+ marked as such in testsuite-checking/expected-results-i486-gnu-libc.
-- Samuel Thibault <sthiba...@debian.org> Wed, 02 Jun 2010 23:54:34 +0200
Added: glibc-package/trunk/debian/patches/hurd-i386/submitted-ttyname.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-ttyname.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-ttyname.diff
2010-06-06 22:21:17 UTC (rev 4326)
@@ -0,0 +1,52 @@
+2010-06-06 Samuel Thibault <samuel.thiba...@ens-lyon.org>
+
+ * sysdeps/mach/hurd/ttyname.c (ttyname): Replace MIG_BAD_ID and
+ EOPNOTSUPP errors with ENOTTY.
+ * sysdeps/mach/hurd/ttyname_r.c (__ttyname_r): Replace MIG_BAD_ID and
+ EOPNOTSUPP errors with ENOTTY.
+
+---
+ ttyname.c | 8 ++++++--
+ ttyname_r.c | 8 ++++++--
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/sysdeps/mach/hurd/ttyname.c b/sysdeps/mach/hurd/ttyname.c
+index 927851e..6e2e5bf 100644
+--- a/sysdeps/mach/hurd/ttyname.c
++++ b/sysdeps/mach/hurd/ttyname.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1994, 1997 Free Software Foundation, Inc.
++/* Copyright (C) 1994, 1997, 2010 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
+@@ -32,7 +32,11 @@ ttyname (int fd)
+
+ nodename[0] = '\0';
+ if (err = HURD_DPORT_USE (fd, __term_get_nodename (port, nodename)))
+- return __hurd_dfail (fd, err), NULL;
++ {
++ if (err == MIG_BAD_ID || err == EOPNOTSUPP)
++ err = ENOTTY;
++ return __hurd_dfail (fd, err), NULL;
++ }
+
+ return nodename;
+ }
+diff --git a/sysdeps/mach/hurd/ttyname_r.c b/sysdeps/mach/hurd/ttyname_r.c
+index 8896252..5f6c9c3 100644
+--- a/sysdeps/mach/hurd/ttyname_r.c
++++ b/sysdeps/mach/hurd/ttyname_r.c
+@@ -34,7 +34,11 @@ __ttyname_r (int fd, char *buf, size_t buflen)
+
+ nodename[0] = '\0';
+ if (err = HURD_DPORT_USE (fd, __term_get_nodename (port, nodename)))
+- return __hurd_dfail (fd, err), errno;
++ {
++ if (err == MIG_BAD_ID || err == EOPNOTSUPP)
++ err = ENOTTY;
++ return __hurd_dfail (fd, err), errno;
++ }
+
+ len = strlen (nodename) + 1;
+ if (len > buflen)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2010-06-05 22:55:29 UTC (rev
4325)
+++ glibc-package/trunk/debian/patches/series 2010-06-06 22:21:17 UTC (rev
4326)
@@ -122,6 +122,7 @@
hurd-i386/local-locarchive.diff
hurd-i386/submitted-regex_internal.diff
hurd-i386/cvs-linkat.diff
+hurd-i386/submitted-ttyname.diff
ia64/local-dlfptr.diff
ia64/submitted-sysconf.diff
Modified:
glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc
===================================================================
---
glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc
2010-06-05 22:55:29 UTC (rev 4325)
+++
glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc
2010-06-06 22:21:17 UTC (rev 4326)
@@ -70,7 +70,6 @@
tst-timer.out, Error 1
tst-tls18.out, Error 1
tst-tls9-static.out, Error 1
-tst-ttyname_r.out, Error 1
tst-vfork3-mem, Error 1
tststatic.out, Error 139
tststatic2.out, Error 139
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1olodd-0004ei...@alioth.debian.org
