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

* stdio-common/tmpfile.c: Moved to ... 

* sysdeps/generic/tmpfile.c: ... here.
	* sysdeps/mach/hurd/tmpfile.c: New file.

	* hurd/fopenport.c (__fopenport): Renamed from fopenport.
	[USE_IN_LIBIO] (fopencookie): #define as _IO_fopencookie.
	(fopenport): Define as weak alias.

	* libio/iofopncook.c (_IO_fopencookie): Move forward declaration ...
	* libio/libioP.h: ... to here.
This commit is contained in:
Roland McGrath 2001-11-13 10:07:33 +00:00
parent c9fc9559ff
commit 27114e2046
4 changed files with 87 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2001-11-13 Roland McGrath <roland@frob.com>
* stdio-common/tmpfile.c: Moved to ...
* sysdeps/generic/tmpfile.c: ... here.
* sysdeps/mach/hurd/tmpfile.c: New file.
* hurd/fopenport.c (__fopenport): Renamed from fopenport.
[USE_IN_LIBIO] (fopencookie): #define as _IO_fopencookie.
(fopenport): Define as weak alias.
* libio/iofopncook.c (_IO_fopencookie): Move forward declaration ...
* libio/libioP.h: ... to here.
2001-11-12 Ulrich Drepper <drepper@redhat.com>
* elf/dl-reloc.c (_dl_relocate_object): Avoid iterating over

8
hurd/fopenport.c
View File

@ -101,7 +101,10 @@ closeio (void *cookie)
return 0;
}
#ifndef USE_IN_LIBIO
#ifdef USE_IN_LIBIO
#include "../libio/libioP.h"
#define fopencookie _IO_fopencookie
#else
#define cookie_io_functions_t __io_functions
#endif
static const cookie_io_functions_t funcsio =
@ -111,7 +114,7 @@ static const cookie_io_functions_t funcsio =
/* Open a stream on PORT. MODE is as for fopen. */
FILE *
fopenport (mach_port_t port, const char *mode)
__fopenport (mach_port_t port, const char *mode)
{
int pflags;
int needflags;
@ -150,3 +153,4 @@ fopenport (mach_port_t port, const char *mode)
return fopencookie ((void *) port, mode, funcsio);
}
weak_alias (__fopenport, fopenport)

3
stdio-common/tmpfile.c → sysdeps/generic/tmpfile.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1991,93,96,97,98,99,2000 Free Software Foundation, Inc.
/* Open a stdio stream on an anonymous temporary file. Generic/POSIX version.
Copyright (C) 1991,93,96,97,98,99,2000 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

66
sysdeps/mach/hurd/tmpfile.c Normal file
View File

@ -0,0 +1,66 @@
/* Open a stdio stream on an anonymous temporary file. Hurd version.
Copyright (C) 2001 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 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <stdio.h>
#include <hurd.h>
#include <hurd/fs.h>
#include <fcntl.h>
#ifdef USE_IN_LIBIO
# include <iolibio.h>
# define __fdopen _IO_fdopen
# define tmpfile __new_tmpfile
#endif
/* This returns a new stream opened on a temporary file (generated
by tmpnam). The file is opened with mode "w+b" (binary read/write).
If we couldn't generate a unique filename or the file couldn't
be opened, NULL is returned. */
FILE *
tmpfile (void)
{
error_t err;
file_t file;
FILE *f;
/* Get a port to the directory that will contain the file. */
const char *dirname = __secure_getenv ("TMPDIR") ?: P_tmpdir;
file_t dir = __file_name_lookup (dirname, 0, 0);
if (dir == MACH_PORT_NULL)
return NULL;
/* Create an unnamed file in the temporary directory. */
err = __dir_mkfile (dir, O_RDWR, S_IRUSR | S_IWUSR, &file);
__mach_port_deallocate (__mach_task_self (), dir);
if (err)
return __hurd_fail (err), NULL;
/* Open a stream on the port to the unnamed file.
It will cease to exist when this stream is closed. */
if ((f = __fopenport (file, "w+b")) == NULL)
__mach_port_deallocate (__mach_task_self (), file);
return f;
}
#ifdef USE_IN_LIBIO
# undef tmpfile
# include <shlib-compat.h>
versioned_symbol (libc, __new_tmpfile, tmpfile, GLIBC_2_1);
#endif