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

Clean up mkstemp64/mkostemp64 for O_LARGEFILE==0.

This commit is contained in:
Roland McGrath 2012-08-01 10:42:38 -07:00
parent 09c0ee5f8c
commit cd97c96688
13 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,5 +1,21 @@
2012-08-01 Roland McGrath <roland@hack.frob.com>
* misc/mkstemp.c [!defined O_LARGEFILE || O_LARGEFILE == 0]:
Define mkstemp64 as an alias.
* misc/mkostemp.c [!defined O_LARGEFILE || O_LARGEFILE == 0]:
Define mkostemp64 as an alias.
* misc/mkstemp64.c [defined O_LARGEFILE && O_LARGEFILE != 0]:
Conditionalize body on this.
* misc/mkostemp64.c: Likewise.
* sysdeps/wordsize-64/mkstemp64.c: File removed.
* sysdeps/wordsize-64/mkostemp64.c: File removed.
* sysdeps/wordsize-64/mkostemp.c: File removed.
* sysdeps/wordsize-64/mkstemp.c: File removed.
* sysdeps/unix/sysv/linux/x86_64/x32/mkstemp64.c: File removed.
* sysdeps/unix/sysv/linux/x86_64/x32/mkostemp64.c: File removed.
* sysdeps/unix/sysv/linux/x86_64/x32/mkostemp.c: File removed.
* sysdeps/unix/sysv/linux/x86_64/x32/mkstemp.c: File removed.
[BZ #14138]
* sysdeps/unix/sysv/linux/syscalls.list: Add getrlimit/ugetrlimit line.
* sysdeps/unix/sysv/linux/i386/getrlimit.c: File removed.

6
misc/mkostemp.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1998, 1999, 2001, 2007, 2009 Free Software Foundation, Inc.
/* Copyright (C) 1998-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
@ -33,3 +33,7 @@ mkostemp (template, flags)
{
return __gen_tempname (template, 0, flags, __GT_FILE);
}
#if !defined O_LARGEFILE || O_LARGEFILE == 0
weak_alias (mkostemp, mkostemp64)
#endif

7
misc/mkostemp64.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000, 2007, 2009 Free Software Foundation, Inc.
/* Copyright (C) 2000-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
@ -19,6 +19,9 @@
#include <stdio.h>
#include <stdlib.h>
/* If O_LARGEFILE is zero, mkostemp.c defines mkostemp64 as an alias. */
#if defined O_LARGEFILE && O_LARGEFILE != 0
/* Generate a unique temporary file name from TEMPLATE.
The last six characters of TEMPLATE must be "XXXXXX";
they are replaced with a string that makes the filename unique.
@ -30,3 +33,5 @@ mkostemp64 (template, flags)
{
return __gen_tempname (template, 0, flags | O_LARGEFILE, __GT_FILE);
}
#endif

6
misc/mkstemp.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1998, 1999, 2001, 2007, 2009 Free Software Foundation, Inc.
/* Copyright (C) 1998-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
@ -32,3 +32,7 @@ mkstemp (template)
{
return __gen_tempname (template, 0, 0, __GT_FILE);
}
#if !defined O_LARGEFILE || O_LARGEFILE == 0
weak_alias (mkstemp, mkstemp64)
#endif

7
misc/mkstemp64.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000, 2007, 2009 Free Software Foundation, Inc.
/* Copyright (C) 2000-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
@ -19,6 +19,9 @@
#include <stdio.h>
#include <stdlib.h>
/* If O_LARGEFILE is zero, mkstemp.c defines mkstemp64 as an alias. */
#if defined O_LARGEFILE && O_LARGEFILE != 0
/* Generate a unique temporary file name from TEMPLATE.
The last six characters of TEMPLATE must be "XXXXXX";
they are replaced with a string that makes the filename unique.
@ -29,3 +32,5 @@ mkstemp64 (template)
{
return __gen_tempname (template, 0, O_LARGEFILE, __GT_FILE);
}
#endif

1
sysdeps/unix/sysv/linux/x86_64/x32/mkostemp.c
View File

@ -1 +0,0 @@
#include <sysdeps/wordsize-64/mkostemp.c>

1
sysdeps/unix/sysv/linux/x86_64/x32/mkostemp64.c
View File

@ -1 +0,0 @@
#include <sysdeps/wordsize-64/mkostemp64.c>

1
sysdeps/unix/sysv/linux/x86_64/x32/mkstemp.c
View File

@ -1 +0,0 @@
#include <sysdeps/wordsize-64/mkstemp.c>

1
sysdeps/unix/sysv/linux/x86_64/x32/mkstemp64.c
View File

@ -1 +0,0 @@
#include <sysdeps/wordsize-64/mkstemp64.c>

3
sysdeps/wordsize-64/mkostemp.c
View File

@ -1,3 +0,0 @@
#include "../../misc/mkostemp.c"
weak_alias (mkostemp, mkostemp64)

1
sysdeps/wordsize-64/mkostemp64.c
View File

@ -1 +0,0 @@
/* Defined in mkostemp.c. */

3
sysdeps/wordsize-64/mkstemp.c
View File

@ -1,3 +0,0 @@
#include "../../misc/mkstemp.c"
weak_alias (mkstemp, mkstemp64)

1
sysdeps/wordsize-64/mkstemp64.c
View File

@ -1 +0,0 @@
/* Defined in mkstemp.c. */