[Glibc-bsd-commits] r2824 - in trunk/glibc-ports/kfreebsd: . bits
Aurelien Jarno
aurel32 at alioth.debian.org
Fri Nov 13 10:17:23 UTC 2009
Author: aurel32
Date: 2009-11-13 10:17:22 +0000 (Fri, 13 Nov 2009)
New Revision: 2824
Removed:
trunk/glibc-ports/kfreebsd/fcntl.h
Modified:
trunk/glibc-ports/kfreebsd/bits/fcntl.h
Log:
AT* #defines should be in bits/fcntl.h so that they are used by the
testsuite. A patch should be committed in our eglibc package to allow that.
Modified: trunk/glibc-ports/kfreebsd/bits/fcntl.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/fcntl.h 2009-11-13 08:18:11 UTC (rev 2823)
+++ trunk/glibc-ports/kfreebsd/bits/fcntl.h 2009-11-13 10:17:22 UTC (rev 2824)
@@ -77,6 +77,18 @@
#define FWRITE 2
#endif
+#ifdef __USE_ATFILE
+# define AT_FDCWD -100 /* Special value used to indicate
+ the *at functions should use the
+ current working directory. */
+# define AT_EACCESS 0x100 /* Test access permitted for
+ effective IDs, not real IDs. */
+# define AT_SYMLINK_NOFOLLOW 0x200 /* Do not follow symbolic links. */
+# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */
+# define AT_REMOVEDIR 0x800 /* Remove directory instead of
+ unlinking file. */
+#endif
+
/*
* We are out of bits in f_flag (which is a short). However,
* the flag bits not set in FMASK are only meaningful in the
Deleted: trunk/glibc-ports/kfreebsd/fcntl.h
===================================================================
--- trunk/glibc-ports/kfreebsd/fcntl.h 2009-11-13 08:18:11 UTC (rev 2823)
+++ trunk/glibc-ports/kfreebsd/fcntl.h 2009-11-13 10:17:22 UTC (rev 2824)
@@ -1,222 +0,0 @@
-/* Copyright (C) 1991,1992,1994-2001,2003,2004,2005,2006,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. */
-
-/*
- * POSIX Standard: 6.5 File Control Operations <fcntl.h>
- */
-
-#ifndef _FCNTL_H
-#define _FCNTL_H 1
-
-#include <features.h>
-
-/* This must be early so <bits/fcntl.h> can define types winningly. */
-__BEGIN_DECLS
-
-/* Get the definitions of O_*, F_*, FD_*: all the
- numbers and flag bits for `open', `fcntl', et al. */
-#include <bits/fcntl.h>
-
-/* For XPG all symbols from <sys/stat.h> should also be available. */
-#ifdef __USE_XOPEN
-# include <sys/stat.h>
-#endif
-
-#ifdef __USE_MISC
-# ifndef R_OK /* Verbatim from <unistd.h>. Ugh. */
-/* Values for the second argument to access.
- These may be OR'd together. */
-# define R_OK 4 /* Test for read permission. */
-# define W_OK 2 /* Test for write permission. */
-# define X_OK 1 /* Test for execute permission. */
-# define F_OK 0 /* Test for existence. */
-# endif
-#endif /* Use misc. */
-
-/* XPG wants the following symbols. */
-#ifdef __USE_XOPEN /* <stdio.h> has the same definitions. */
-# define SEEK_SET 0 /* Seek from beginning of file. */
-# define SEEK_CUR 1 /* Seek from current position. */
-# define SEEK_END 2 /* Seek from end of file. */
-#endif /* XPG */
-
-#ifdef __USE_ATFILE
-# define AT_FDCWD -100 /* Special value used to indicate
- the *at functions should use the
- current working directory. */
-# define AT_EACCESS 0x100 /* Test access permitted for
- effective IDs, not real IDs. */
-# define AT_SYMLINK_NOFOLLOW 0x200 /* Do not follow symbolic links. */
-# define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */
-# define AT_REMOVEDIR 0x800 /* Remove directory instead of
- unlinking file. */
-#endif
-
-/* Do the file control operation described by CMD on FD.
- The remaining arguments are interpreted depending on CMD.
-
- This function is a cancellation point and therefore not marked with
- __THROW. */
-extern int fcntl (int __fd, int __cmd, ...);
-
-/* Open FILE and return a new file descriptor for it, or -1 on error.
- OFLAG determines the type of access used. If O_CREAT is on OFLAG,
- the third argument is taken as a `mode_t', the mode of the created file.
-
- This function is a cancellation point and therefore not marked with
- __THROW. */
-#ifndef __USE_FILE_OFFSET64
-extern int open (__const char *__file, int __oflag, ...) __nonnull ((1));
-#else
-# ifdef __REDIRECT
-extern int __REDIRECT (open, (__const char *__file, int __oflag, ...), open64)
- __nonnull ((1));
-# else
-# define open open64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern int open64 (__const char *__file, int __oflag, ...) __nonnull ((1));
-#endif
-
-#ifdef __USE_ATFILE
-/* Similar to `open' but a relative path name is interpreted relative to
- the directory for which FD is a descriptor.
-
- NOTE: some other `openat' implementation support additional functionality
- through this interface, especially using the O_XATTR flag. This is not
- yet supported here.
-
- This function is a cancellation point and therefore not marked with
- __THROW. */
-# ifndef __USE_FILE_OFFSET64
-extern int openat (int __fd, __const char *__file, int __oflag, ...)
- __nonnull ((2));
-# else
-# ifdef __REDIRECT
-extern int __REDIRECT (openat, (int __fd, __const char *__file, int __oflag,
- ...), openat64) __nonnull ((2));
-# else
-# define openat openat64
-# endif
-# endif
-
-extern int openat64 (int __fd, __const char *__file, int __oflag, ...)
- __nonnull ((2));
-#endif
-
-/* Create and open FILE, with mode MODE. This takes an `int' MODE
- argument because that is what `mode_t' will be widened to.
-
- This function is a cancellation point and therefore not marked with
- __THROW. */
-#ifndef __USE_FILE_OFFSET64
-extern int creat (__const char *__file, __mode_t __mode) __nonnull ((1));
-#else
-# ifdef __REDIRECT
-extern int __REDIRECT (creat, (__const char *__file, __mode_t __mode),
- creat64) __nonnull ((1));
-# else
-# define creat creat64
-# endif
-#endif
-#ifdef __USE_LARGEFILE64
-extern int creat64 (__const char *__file, __mode_t __mode) __nonnull ((1));
-#endif
-
-#if !defined F_LOCK && (defined __USE_MISC || (defined __USE_XOPEN_EXTENDED \
- && !defined __USE_POSIX))
-/* NOTE: These declarations also appear in <unistd.h>; be sure to keep both
- files consistent. Some systems have them there and some here, and some
- software depends on the macros being defined without including both. */
-
-/* `lockf' is a simpler interface to the locking facilities of `fcntl'.
- LEN is always relative to the current file position.
- The CMD argument is one of the following. */
-
-# define F_ULOCK 0 /* Unlock a previously locked region. */
-# define F_LOCK 1 /* Lock a region for exclusive use. */
-# define F_TLOCK 2 /* Test and lock a region for exclusive use. */
-# define F_TEST 3 /* Test a region for other processes locks. */
-
-# ifndef __USE_FILE_OFFSET64
-extern int lockf (int __fd, int __cmd, __off_t __len);
-# else
-# ifdef __REDIRECT
-extern int __REDIRECT (lockf, (int __fd, int __cmd, __off64_t __len), lockf64);
-# else
-# define lockf lockf64
-# endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int lockf64 (int __fd, int __cmd, __off64_t __len);
-# endif
-#endif
-
-#ifdef __USE_XOPEN2K
-/* Advice the system about the expected behaviour of the application with
- respect to the file associated with FD. */
-# ifndef __USE_FILE_OFFSET64
-extern int posix_fadvise (int __fd, __off_t __offset, __off_t __len,
- int __advise) __THROW;
-# else
- # ifdef __REDIRECT_NTH
-extern int __REDIRECT_NTH (posix_fadvise, (int __fd, __off64_t __offset,
- __off64_t __len, int __advise),
- posix_fadvise64);
-# else
-# define posix_fadvise posix_fadvise64
-# endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int posix_fadvise64 (int __fd, __off64_t __offset, __off64_t __len,
- int __advise) __THROW;
-# endif
-
-
-/* Reserve storage for the data of the file associated with FD.
-
- This function is a possible cancellation points and therefore not
- marked with __THROW. */
-# ifndef __USE_FILE_OFFSET64
-extern int posix_fallocate (int __fd, __off_t __offset, __off_t __len);
-# else
- # ifdef __REDIRECT
-extern int __REDIRECT (posix_fallocate, (int __fd, __off64_t __offset,
- __off64_t __len),
- posix_fallocate64);
-# else
-# define posix_fallocate posix_fallocate64
-# endif
-# endif
-# ifdef __USE_LARGEFILE64
-extern int posix_fallocate64 (int __fd, __off64_t __offset, __off64_t __len);
-# endif
-#endif
-
-
-/* Define some inlines helping to catch common problems. */
-#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline \
- && defined __va_arg_pack_len
-# include <bits/fcntl2.h>
-#endif
-
-__END_DECLS
-
-#endif /* fcntl.h */
More information about the Glibc-bsd-commits
mailing list