am 82f4cc5d: am 58b997c8: am f5f906c1: Merge "libc: create sys/capability.h"

* commit '82f4cc5de495c6cc3d3736ab075ccd05285beabc':
  libc: create sys/capability.h
This commit is contained in:
Nick Kralevich 2013-02-26 21:55:28 +00:00 committed by Android Git Automerger
commit 30f1622a34
2 changed files with 43 additions and 3 deletions

View File

@ -0,0 +1,42 @@
/*
* Copyright (C) 2013 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _BIONIC_SYS_CAPABILITY_H
#define _BIONIC_SYS_CAPABILITY_H
#include <sys/cdefs.h>
#include <linux/capability.h>
__BEGIN_DECLS
extern int capget(cap_user_header_t hdrp, cap_user_data_t datap);
extern int capset(cap_user_header_t hdrp, const cap_user_data_t datap);
__END_DECLS
#endif /* _BIONIC_SYS_CAPABILITY_H */

View File

@ -33,7 +33,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/select.h> #include <sys/select.h>
#include <sys/sysconf.h> #include <sys/sysconf.h>
#include <linux/capability.h> #include <sys/capability.h> /* TODO: Remove this include */
#include <pathconf.h> #include <pathconf.h>
__BEGIN_DECLS __BEGIN_DECLS
@ -69,8 +69,6 @@ extern int execve(const char *, char * const *, char * const *);
extern int execl(const char *, const char *, ...); extern int execl(const char *, const char *, ...);
extern int execlp(const char *, const char *, ...); extern int execlp(const char *, const char *, ...);
extern int execle(const char *, const char *, ...); extern int execle(const char *, const char *, ...);
extern int capget(cap_user_header_t hdrp, cap_user_data_t datap);
extern int capset(cap_user_header_t hdrp, const cap_user_data_t datap);
/* IMPORTANT: See comment under <sys/prctl.h> about this declaration */ /* IMPORTANT: See comment under <sys/prctl.h> about this declaration */
extern int prctl(int option, ...); extern int prctl(int option, ...);