Skip to content

Commit

Permalink
Implement mkostemps and mkostemps64.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ulrich Drepper committed Oct 30, 2009
1 parent b47525d commit 3a83202
Show file tree
Hide file tree
Showing 7 changed files with 117 additions and 3 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2009-10-30 Ulrich Drepper <drepper@redhat.com>

* misc/mkostemps.c: New file.
* misc/mkostemps64.c: New file.

2009-10-30 Andreas Schwab <schwab@redhat.com>

* locale/programs/locale-spec.c: Include <error.h> and
Expand Down
3 changes: 2 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ using `glibc' in the "product" field.

Version 2.11

* New interfaces: execvpe, pthread_sigqueue, mkstemps, mkstemps64
* New interfaces: execvpe, pthread_sigqueue, mkstemps, mkstemps64, mkostemps,
mkostemps64
Implemented by Ulrich Drepper.

* Checking version of longjmp added that fails if an uninitialized stack
Expand Down
2 changes: 1 addition & 1 deletion misc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ routines := brk sbrk sstk ioctl \
gethostid sethostid \
revoke vhangup \
swapon swapoff mktemp mkstemp mkstemp64 mkdtemp \
mkostemp mkostemp64 mkstemps mkstemps64 \
mkostemp mkostemp64 mkstemps mkstemps64 mkostemps mkostemps64 \
ualarm usleep \
gtty stty \
ptrace \
Expand Down
2 changes: 1 addition & 1 deletion misc/Versions
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,6 @@ libc {
preadv; preadv64; pwritev; pwritev64;
}
GLIBC_2.11 {
mkstemps; mkstemps64;
mkstemps; mkstemps64; mkostemps; mkostemps64;
}
}
44 changes: 44 additions & 0 deletions misc/mkostemps.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/* Copyright (C) 2009 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 <errno.h>
#include <stdio.h>
#include <stdlib.h>

#ifndef __GT_FILE
# define __GT_FILE 0
#endif

/* Generate a unique temporary file name from TEMPLATE. The last six
characters before a suffix of length SUFFIXLEN of TEMPLATE must be
"XXXXXX"; they are replaced with a string that makes the filename
unique. Then open the file and return a fd. */
int
mkostemps (template, suffixlen, flags)
char *template;
int suffixlen;
int flags;
{
if (suffixlen < 0)
{
__set_errno (EINVAL);
return -1;
}

return __gen_tempname (template, suffixlen, flags, __GT_FILE);
}
41 changes: 41 additions & 0 deletions misc/mkostemps64.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/* Copyright (C) 2000, 2007, 2009 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 <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>

/* Generate a unique temporary file name from TEMPLATE. The last six
characters before a suffix of length SUFFIXLEN of TEMPLATE must be
"XXXXXX"; they are replaced with a string that makes the filename
unique. Then open the file and return a fd. */
int
mkostemps64 (template, suffixlen, flags)
char *template;
int suffixlen;
int flags;
{
if (suffixlen < 0)
{
__set_errno (EINVAL);
return -1;
}

return __gen_tempname (template, suffixlen, flags | O_LARGEFILE, __GT_FILE);
}
23 changes: 23 additions & 0 deletions stdlib/stdlib.h
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,29 @@ extern int __REDIRECT (mkostemp, (char *__template, int __flags), mkostemp64)
# ifdef __USE_LARGEFILE64
extern int mkostemp64 (char *__template, int __flags) __nonnull ((1)) __wur;
# endif

/* Similar to mkostemp, but the template can have a suffix after the
XXXXXX. The length of the suffix is specified in the second
parameter.
This function is a possible cancellation point and therefore not
marked with __THROW. */
# ifndef __USE_FILE_OFFSET64
extern int mkostemps (char *__template, int __suffixlen, int __flags)
__nonnull ((1)) __wur;
# else
# ifdef __REDIRECT
extern int __REDIRECT (mkostemps, (char *__template, int __suffixlen,
int __flags), mkostemps64)
__nonnull ((1)) __wur;
# else
# define mkostemps mkostemps64
# endif
# endif
# ifdef __USE_LARGEFILE64
extern int mkostemps64 (char *__template, int __suffixlen, int __flags)
__nonnull ((1)) __wur;
# endif
#endif


Expand Down

0 comments on commit 3a83202

Please sign in to comment.