mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2000-08-12  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_FCNTL64):
	Define for 2.4.1 on x86.
	* sysdeps/unix/sysv/linux/i386/fcntl.c: New file.
	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Fill in correct values
	for F_GETLK64, F_SETLK64, and F_SETLKW64.

	* dirent/dirent.h: Define DT_WHT.

	* sysdeps/unix/sysv/linux/arm/alphasort64.c: New file.
	* sysdeps/unix/sysv/linux/arm/getdents64.c: New file.
	* sysdeps/unix/sysv/linux/arm/readdir64.c: New file.
	* sysdeps/unix/sysv/linux/arm/readdir64_r.c: New file.
	* sysdeps/unix/sysv/linux/arm/scandir64.c: New file.
	* sysdeps/unix/sysv/linux/arm/versionsort64.c: New file.
This commit is contained in:
Ulrich Drepper 2000-08-12 08:22:14 +00:00
parent 11a9c0ce08
commit 21f6a10036
11 changed files with 100 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2000-08-12 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_FCNTL64):
Define for 2.4.1 on x86.
* sysdeps/unix/sysv/linux/i386/fcntl.c: New file.
* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Fill in correct values
for F_GETLK64, F_SETLK64, and F_SETLKW64.
* dirent/dirent.h: Define DT_WHT.
* sysdeps/unix/sysv/linux/arm/alphasort64.c: New file.
* sysdeps/unix/sysv/linux/arm/getdents64.c: New file.
* sysdeps/unix/sysv/linux/arm/readdir64.c: New file.
* sysdeps/unix/sysv/linux/arm/readdir64_r.c: New file.
* sysdeps/unix/sysv/linux/arm/scandir64.c: New file.
* sysdeps/unix/sysv/linux/arm/versionsort64.c: New file.
2000-08-11 Ulrich Drepper <drepper@redhat.com>
* nss/digits_dots.c: Don't pass NULL in h_aliases for successful

4
dirent/dirent.h
View File

@ -111,8 +111,10 @@ enum
# define DT_REG DT_REG
DT_LNK = 10,
# define DT_LNK DT_LNK
DT_SOCK = 12
DT_SOCK = 12,
# define DT_SOCK DT_SOCK
DT_WHT = 14
# define DT_WHT DT_WHT
};
/* Convert between stat structure types and directory types. */

1
sysdeps/unix/sysv/linux/arm/alphasort64.c Normal file
View File

@ -0,0 +1 @@
#include <sysdeps/unix/sysv/linux/i386/alphasort64.c>

1
sysdeps/unix/sysv/linux/arm/getdents64.c Normal file
View File

@ -0,0 +1 @@
#include <sysdeps/unix/sysv/linux/i386/getdents64.c>

1
sysdeps/unix/sysv/linux/arm/readdir64.c Normal file
View File

@ -0,0 +1 @@
#include <sysdeps/unix/sysv/linux/i386/readdir64.c>

1
sysdeps/unix/sysv/linux/arm/readdir64_r.c Normal file
View File

@ -0,0 +1 @@
#include <sysdeps/unix/sysv/linux/i386/readdir64_r.c>

1
sysdeps/unix/sysv/linux/arm/scandir64.c Normal file
View File

@ -0,0 +1 @@
#include <sysdeps/unix/sysv/linux/i386/scandir64.c>

1
sysdeps/unix/sysv/linux/arm/versionsort64.c Normal file
View File

@ -0,0 +1 @@
#include <sysdeps/unix/sysv/linux/i386/versionsort64.c>

12
sysdeps/unix/sysv/linux/i386/bits/fcntl.h
View File

@ -68,11 +68,9 @@
#define F_GETLK 5 /* Get record locking info. */
#define F_SETLK 6 /* Set record locking info (non-blocking). */
#define F_SETLKW 7 /* Set record locking info (blocking). */
/* XXX missing */
#define F_GETLK64 5 /* Get record locking info. */
#define F_SETLK64 6 /* Set record locking info (non-blocking). */
#define F_SETLKW64 7 /* Set record locking info (blocking). */
#define F_GETLK64 12 /* Get record locking info. */
#define F_SETLK64 13 /* Set record locking info (non-blocking). */
#define F_SETLKW64 14 /* Set record locking info (blocking). */
#if defined __USE_BSD || defined __USE_XOPEN2K
# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */
@ -92,12 +90,12 @@
#define F_WRLCK 1 /* Write lock. */
#define F_UNLCK 2 /* Remove lock. */
/* for old implementation of bsd flock () */
/* For old implementation of bsd flock(). */
#define F_EXLCK 4 /* or 3 */
#define F_SHLCK 8 /* or 4 */
#ifdef __USE_BSD
/* operations for bsd flock(), also used by the kernel implementation */
/* Operations for bsd flock(), also used by the kernel implementation. */
# define LOCK_SH 1 /* shared lock */
# define LOCK_EX 2 /* exclusive lock */
# define LOCK_NB 4 /* or'd with one of the above to prevent

62
sysdeps/unix/sysv/linux/i386/fcntl.c Normal file
View File

@ -0,0 +1,62 @@
/* Copyright (C) 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
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 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
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. 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 <stdarg.h>
#include <sysdep.h>
#include <sys/syscall.h>
#include "../kernel-features.h"
int
__libc_fcntl (int fd, int cmd, ...)
{
va_list ap;
#if __NR_fcntl64
int result;
#endif
void *arg;
va_start (ap, cmd);
arg = va_arg (ap, void *);
va_end (ap);
#if __NR_fcntl64
result = INLINE_SYSCALL (fcntl64, 3, fd, cmd, arg);
# if __ASSUME_FCNTL64 == 0
if (result != -1 || errno != ENOSYS)
# endif
return result;
#endif
#if __ASSUME_FCNTL64 == 0
if (cmd == F_GETLK64 || cmd == F_SETLK64 || cmd == F_SETLKW64)
{
__set_errno (EINVAL);
return -1;
}
return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
#endif
}
weak_alias (__libc_fcntl, __fcntl)
weak_alias (__libc_fcntl, fcntl)

7
sysdeps/unix/sysv/linux/kernel-features.h
View File

@ -129,3 +129,10 @@
#if __LINUX_KERNEL_VERSION >= 132097
# define __ASSUME_ST_INO_64_BIT 1
#endif
/* To support locking of large files a new fcntl() syscall was introduced
in 2.4.0-test7. We test for 2.4.1 for the earliest version we know
the syscall is available. */
#if __LINUX_KERNEL_VERSION >= 132097 && defined __i386__
# define __ASSUME_FCNTL64 1
#endif