[commits] r11140 - in /fsf/trunk/libc: ChangeLog sysdeps/mach/hurd/ttyname.c sysdeps/mach/hurd/ttyname_r.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Aug  4 00:03:52 2010
New Revision: 11140

Log:
Import glibc-mainline for 2010-08-04

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/mach/hurd/ttyname.c
    fsf/trunk/libc/sysdeps/mach/hurd/ttyname_r.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Aug  4 00:03:52 2010
@@ -2,6 +2,13 @@
 
 	* hurd/hurdselect.c (_hurd_select): Round timeout up instead of down
 	when converting to ms.
+
+2010-06-06  Samuel Thibault  <samuel.thibault@xxxxxxxxxxxx>
+
+	* 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.
 
 2010-07-31  Ulrich Drepper  <drepper@xxxxxxxxxx>
 

Modified: fsf/trunk/libc/sysdeps/mach/hurd/ttyname.c
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/hurd/ttyname.c (original)
+++ fsf/trunk/libc/sysdeps/mach/hurd/ttyname.c Wed Aug  4 00:03:52 2010
@@ -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 @@
 
   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;
 }

Modified: fsf/trunk/libc/sysdeps/mach/hurd/ttyname_r.c
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/hurd/ttyname_r.c (original)
+++ fsf/trunk/libc/sysdeps/mach/hurd/ttyname_r.c Wed Aug  4 00:03:52 2010
@@ -34,7 +34,11 @@
 
   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)