Update copyright notices with scripts/update-copyrights

[platform/upstream/glibc.git] / hurd / privports.c

diff --git a/hurd/privports.c b/hurd/privports.c
index ef6388b..e48f4f0 100644 (file)
--- a/hurd/privports.c
+++ b/hurd/privports.c
@@ -1,20 +1,19 @@
-/* Copyright (C) 1993, 1994, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2014 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
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <hurd.h>
 
@@ -25,9 +24,11 @@ mach_port_t _hurd_host_priv, _hurd_device_master;
 
 
 kern_return_t
-get_privileged_ports (host_priv_t *host_priv_ptr, device_t *device_master_ptr)
+__get_privileged_ports (mach_port_t *host_priv_ptr,
+                       device_t *device_master_ptr)
 {
-  if (! _hurd_host_priv)
+  if ((host_priv_ptr && _hurd_host_priv == MACH_PORT_NULL)
+      || (device_master_ptr && _hurd_device_master == MACH_PORT_NULL))
     {
       error_t err;
 
@@ -46,15 +47,24 @@ get_privileged_ports (host_priv_t *host_priv_ptr, device_t *device_master_ptr)
 
   if (host_priv_ptr)
     {
-      mach_port_mod_refs (mach_task_self (),
-                         _hurd_host_priv, MACH_PORT_RIGHT_SEND, 1);
+      error_t err = _hurd_host_priv == MACH_PORT_NULL ? 0
+       : __mach_port_mod_refs (mach_task_self (),
+                               _hurd_host_priv, MACH_PORT_RIGHT_SEND, +1);
+      if (err)
+       return err;
       *host_priv_ptr = _hurd_host_priv;
     }
+
   if (device_master_ptr)
     {
-      mach_port_mod_refs (mach_task_self (),
-                         _hurd_device_master, MACH_PORT_RIGHT_SEND, 1);
+      error_t err = _hurd_device_master == MACH_PORT_NULL ? 0
+       : __mach_port_mod_refs (mach_task_self (),
+                               _hurd_device_master, MACH_PORT_RIGHT_SEND, +1);
+      if (err)
+       return err;
       *device_master_ptr = _hurd_device_master;
     }
+
   return KERN_SUCCESS;
 }
+weak_alias (__get_privileged_ports, get_privileged_ports)