OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hurd: fix symlink/symlinkat error case not to do an extraneous __mach_port_deallocate.

This commit is contained in:
Roland McGrath 2012-04-24 13:12:12 -07:00
parent f23f459dd3
commit 87ef29ca94
3 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2012-04-24 Roland McGrath <roland@hack.frob.com>
* sysdeps/mach/hurd/symlink.c: Don't call __mach_port_deallocate on
NODE when __dir_mkfile failed.
* sysdeps/mach/hurd/symlinkat.c: Likewise.
Reported by Ludovic Courtès <ludo@gnu.org>.
2012-04-24 Andreas Jaeger <aj@suse.de>
* Makerules (common-clean): Also remove gen-as-const-headers

25
sysdeps/mach/hurd/symlink.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
/* Copyright (C) 1991-2012 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
@ -46,19 +46,22 @@ __symlink (from, to)
err = __dir_mkfile (dir, O_WRITE, 0777 & ~_hurd_umask, &node);
if (! err)
/* Set the node's translator to make it a symlink. */
err = __file_set_translator (node,
FS_TRANS_EXCL|FS_TRANS_SET,
FS_TRANS_EXCL|FS_TRANS_SET, 0,
buf, sizeof (_HURD_SYMLINK) + len,
MACH_PORT_NULL, MACH_MSG_TYPE_COPY_SEND);
{
/* Set the node's translator to make it a symlink. */
err = __file_set_translator (node,
FS_TRANS_EXCL|FS_TRANS_SET,
FS_TRANS_EXCL|FS_TRANS_SET, 0,
buf, sizeof (_HURD_SYMLINK) + len,
MACH_PORT_NULL, MACH_MSG_TYPE_COPY_SEND);
if (! err)
/* Link the node, now a valid symlink, into the target directory. */
err = __dir_link (dir, node, name, 1);
if (! err)
/* Link the node, now a valid symlink, into the target directory. */
err = __dir_link (dir, node, name, 1);
__mach_port_deallocate (__mach_task_self (), node);
}
__mach_port_deallocate (__mach_task_self (), dir);
__mach_port_deallocate (__mach_task_self (), node);
if (err)
return __hurd_fail (err);

26
sysdeps/mach/hurd/symlinkat.c
View File

@ -1,6 +1,5 @@
/* Create a symbolic link named relative to an open directory. Hurd version.
Copyright (C) 1991,1992,1993,1994,1995,1996,1997,2006
Free Software Foundation, Inc.
Copyright (C) 1991-2012 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
@ -53,19 +52,22 @@ symlinkat (from, fd, to)
err = __dir_mkfile (dir, O_WRITE, 0777 & ~_hurd_umask, &node);
if (! err)
/* Set the node's translator to make it a symlink. */
err = __file_set_translator (node,
FS_TRANS_EXCL|FS_TRANS_SET,
FS_TRANS_EXCL|FS_TRANS_SET, 0,
buf, sizeof (_HURD_SYMLINK) + len,
MACH_PORT_NULL, MACH_MSG_TYPE_COPY_SEND);
{
/* Set the node's translator to make it a symlink. */
err = __file_set_translator (node,
FS_TRANS_EXCL|FS_TRANS_SET,
FS_TRANS_EXCL|FS_TRANS_SET, 0,
buf, sizeof (_HURD_SYMLINK) + len,
MACH_PORT_NULL, MACH_MSG_TYPE_COPY_SEND);
if (! err)
/* Link the node, now a valid symlink, into the target directory. */
err = __dir_link (dir, node, name, 1);
if (! err)
/* Link the node, now a valid symlink, into the target directory. */
err = __dir_link (dir, node, name, 1);
__mach_port_deallocate (__mach_task_self (), node);
}
__mach_port_deallocate (__mach_task_self (), dir);
__mach_port_deallocate (__mach_task_self (), node);
if (err)
return __hurd_fail (err);