* sysdeps/posix/posix_fallocate64.c: Undefine
__posix_fallocate64_l64 before alias handling. * sysdeps/unix/sysv/linux/posix_fallocate.c: New file. * sysdeps/unix/sysv/linux/posix_fallocate64.c: New file. * sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c: New file. * sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c: New file. * io/tst-posix_fallocate.c: Include <fcntl.h>. 2007-07-23 Jakub Jelinek <jakub@redhat.com> * locale/programs/ld-collate.c (atwc): New variable. (add_to_tablewc): New toplevel function, moved from collate_output. (collate_output): Remove add_to_tablewc nested function. * iconv/iconvconfig.c (hash_table, hash_size): New toplevel vars. (name_insert): New function. (write_output): Remove hash_table and hash_size vars and name_insert nested function.
This commit is contained in:
Ulrich Drepper
parent
429849d03d
commit
a95a608f1b
22
ChangeLog
22
ChangeLog
@ -1,3 +1,25 @@
|
||||
2007-07-28 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sysdeps/posix/posix_fallocate64.c: Undefine
|
||||
__posix_fallocate64_l64 before alias handling.
|
||||
* sysdeps/unix/sysv/linux/posix_fallocate.c: New file.
|
||||
* sysdeps/unix/sysv/linux/posix_fallocate64.c: New file.
|
||||
* sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c: New file.
|
||||
* sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c: New file.
|
||||
|
||||
* io/tst-posix_fallocate.c: Include <fcntl.h>.
|
||||
|
||||
2007-07-23 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* locale/programs/ld-collate.c (atwc): New variable.
|
||||
(add_to_tablewc): New toplevel function, moved from collate_output.
|
||||
(collate_output): Remove add_to_tablewc nested function.
|
||||
|
||||
* iconv/iconvconfig.c (hash_table, hash_size): New toplevel vars.
|
||||
(name_insert): New function.
|
||||
(write_output): Remove hash_table and hash_size vars and name_insert
|
||||
nested function.
|
||||
|
||||
2007-07-24 Roland McGrath <roland@redhat.com>
|
||||
|
||||
* Makerules (install-others-programs-nosubdir): New target.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 2000, 2003, 2004, 2005, 2007 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
|
||||
@ -93,6 +93,7 @@ __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#undef __posix_fallocate64_l64
|
||||
#include <shlib-compat.h>
|
||||
#include <bits/wordsize.h>
|
||||
|
||||
|
||||
60
sysdeps/unix/sysv/linux/posix_fallocate.c
Normal file
60
sysdeps/unix/sysv/linux/posix_fallocate.c
Normal file
@ -0,0 +1,60 @@
|
||||
/* Copyright (C) 2007 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 <fcntl.h>
|
||||
#include <kernel-features.h>
|
||||
#include <sysdep.h>
|
||||
|
||||
#define posix_fallocate static internal_fallocate
|
||||
#include <sysdeps/posix/posix_fallocate.c>
|
||||
#undef posix_fallocate
|
||||
|
||||
#if !defined __ASSUME_FALLOCATE && defined __NR_fallocate
|
||||
int __have_fallocate attribute_hidden;
|
||||
#endif
|
||||
|
||||
|
||||
/* Reserve storage for the data of the file associated with FD. */
|
||||
int
|
||||
posix_fallocate (int fd, __off_t offset, __off_t len)
|
||||
{
|
||||
#ifdef __NR_fallocate
|
||||
# ifndef __ASSUME_FALLOCATE
|
||||
if (__builtin_expect (__have_fallocate >= 0, 1))
|
||||
# endif
|
||||
{
|
||||
INTERNAL_SYSCALL_DECL (err);
|
||||
int res = INTERNAL_SYSCALL (fallocate, err, 4, fd, 0,
|
||||
__LONG_LONG_PAIR (offset >> 31, offset),
|
||||
__LONG_LONG_PAIR (len >> 31, len));
|
||||
|
||||
if (! INTERNAL_SYSCALL_ERROR_P (res, err))
|
||||
return 0;
|
||||
|
||||
# ifndef __ASSUME_FALLOCATE
|
||||
if (__builtin_expect (INTERNAL_SYSCALL_ERRNO (res, err) == ENOSYS, 0))
|
||||
__have_fallocate = -1;
|
||||
else
|
||||
# endif
|
||||
if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP)
|
||||
return INTERNAL_SYSCALL_ERRNO (res, err);
|
||||
}
|
||||
#endif
|
||||
|
||||
return internal_fallocate (fd, offset, len);
|
||||
}
|
||||
64
sysdeps/unix/sysv/linux/posix_fallocate64.c
Normal file
64
sysdeps/unix/sysv/linux/posix_fallocate64.c
Normal file
@ -0,0 +1,64 @@
|
||||
/* Copyright (C) 2007 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 <fcntl.h>
|
||||
#include <kernel-features.h>
|
||||
#include <sysdep.h>
|
||||
|
||||
extern int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len);
|
||||
#define __posix_fallocate64_l64 static internal_fallocate64
|
||||
#include <sysdeps/posix/posix_fallocate64.c>
|
||||
#undef __posix_fallocate64_l64
|
||||
|
||||
#if !defined __ASSUME_FALLOCATE && defined __NR_fallocate
|
||||
/* Defined in posix_fallocate.c. */
|
||||
extern int __have_fallocate attribute_hidden;
|
||||
#endif
|
||||
|
||||
|
||||
/* Reserve storage for the data of the file associated with FD. */
|
||||
int
|
||||
__posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len)
|
||||
{
|
||||
#ifdef __NR_fallocate
|
||||
# ifndef __ASSUME_FALLOCATE
|
||||
if (__builtin_expect (__have_fallocate >= 0, 1))
|
||||
# endif
|
||||
{
|
||||
INTERNAL_SYSCALL_DECL (err);
|
||||
int res = INTERNAL_SYSCALL (fallocate, err, 6, fd, 0,
|
||||
__LONG_LONG_PAIR ((long int) (offset >> 32),
|
||||
(long int) offset),
|
||||
__LONG_LONG_PAIR ((long int) (len >> 32),
|
||||
(long int) len));
|
||||
|
||||
if (! INTERNAL_SYSCALL_ERROR_P (res, err))
|
||||
return 0;
|
||||
|
||||
# ifndef __ASSUME_FALLOCATE
|
||||
if (__builtin_expect (INTERNAL_SYSCALL_ERRNO (res, err) == ENOSYS, 0))
|
||||
__have_fallocate = -1;
|
||||
else
|
||||
# endif
|
||||
if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP)
|
||||
return INTERNAL_SYSCALL_ERRNO (res, err);
|
||||
}
|
||||
#endif
|
||||
|
||||
return internal_fallocate64 (fd, offset, len);
|
||||
}
|
||||
59
sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c
Normal file
59
sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c
Normal file
@ -0,0 +1,59 @@
|
||||
/* Copyright (C) 2007 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 <fcntl.h>
|
||||
#include <kernel-features.h>
|
||||
#include <sysdep.h>
|
||||
|
||||
#define posix_fallocate static internal_fallocate
|
||||
#include <sysdeps/posix/posix_fallocate.c>
|
||||
#undef posix_fallocate
|
||||
|
||||
#if !defined __ASSUME_FALLOCATE && defined __NR_fallocate
|
||||
static int __have_fallocate;
|
||||
#endif
|
||||
|
||||
|
||||
/* Reserve storage for the data of the file associated with FD. */
|
||||
int
|
||||
posix_fallocate (int fd, __off_t offset, __off_t len)
|
||||
{
|
||||
#ifdef __NR_fallocate
|
||||
# ifndef __ASSUME_FALLOCATE
|
||||
if (__builtin_expect (__have_fallocate >= 0, 1))
|
||||
# endif
|
||||
{
|
||||
INTERNAL_SYSCALL_DECL (err);
|
||||
int res = INTERNAL_SYSCALL (fallocate, err, 4, fd, 0, offset, len);
|
||||
|
||||
if (! INTERNAL_SYSCALL_ERROR_P (res, err))
|
||||
return 0;
|
||||
|
||||
# ifndef __ASSUME_FALLOCATE
|
||||
if (__builtin_expect (INTERNAL_SYSCALL_ERRNO (res, err) == ENOSYS, 0))
|
||||
__have_fallocate = -1;
|
||||
else
|
||||
# endif
|
||||
if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP)
|
||||
return INTERNAL_SYSCALL_ERRNO (res, err);
|
||||
}
|
||||
#endif
|
||||
|
||||
return internal_fallocate (fd, offset, len);
|
||||
}
|
||||
strong_alias (posix_fallocate, posix_fallocate64)
|
||||
1
sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c
Normal file
1
sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c
Normal file
@ -0,0 +1 @@
|
||||
/* posix_fallocate64 is in posix_fallocate.c */
|
||||
Loading…
Reference in New Issue
Block a user