Author: sthibault
Date: 2010-08-22 14:01:07 +0000 (Sun, 22 Aug 2010)
New Revision: 4383
Added:
glibc-package/trunk/debian/patches/hurd-i386/cvs-ttyname.diff
Removed:
glibc-package/trunk/debian/patches/hurd-i386/submitted-ttyname.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
mv patches/hurd-i386/{submitted,cvs}-ttyname.diff.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-08-22 13:59:00 UTC (rev
4382)
+++ glibc-package/trunk/debian/changelog 2010-08-22 14:01:07 UTC (rev
4383)
@@ -6,6 +6,7 @@
value.
* patches/hurd-i386/local-locarchive.diff: Extend to permit generating
several
locales.
+ * mv patches/hurd-i386/{submitted,cvs}-ttyname.diff.
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 3156 (from glibc-bsd).
Copied: glibc-package/trunk/debian/patches/hurd-i386/cvs-ttyname.diff (from rev
4381, glibc-package/trunk/debian/patches/hurd-i386/submitted-ttyname.diff)
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-ttyname.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-ttyname.diff
2010-08-22 14:01:07 UTC (rev 4383)
@@ -0,0 +1,54 @@
+http://www.cygwin.com/ml/libc-alpha/2010-06/msg00005.html
+
+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)
Deleted: glibc-package/trunk/debian/patches/hurd-i386/submitted-ttyname.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-ttyname.diff
2010-08-22 13:59:00 UTC (rev 4382)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-ttyname.diff
2010-08-22 14:01:07 UTC (rev 4383)
@@ -1,54 +0,0 @@
-http://www.cygwin.com/ml/libc-alpha/2010-06/msg00005.html
-
-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-08-22 13:59:00 UTC (rev
4382)
+++ glibc-package/trunk/debian/patches/series 2010-08-22 14:01:07 UTC (rev
4383)
@@ -124,7 +124,7 @@
hurd-i386/local-locarchive.diff
hurd-i386/submitted-regex_internal.diff
hurd-i386/cvs-linkat.diff
-hurd-i386/submitted-ttyname.diff
+hurd-i386/cvs-ttyname.diff
hurd-i386/submitted-getnprocs.diff
hurd-i386/local-mkdir_root.diff
hurd-i386/cvs-select.diff
--
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/e1onb6s-0001lz...@alioth.debian.org
