generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 1217d9a3: am c80eb091: Merge "Clean up paths.h."

Browse Source 
* commit '1217d9a3d13222f16978282d4488588bfe420233':
  Clean up paths.h.
This commit is contained in:
Yabin Cui
2015-01-10 05:29:04 +00:00
committed by Android Git Automerger
parent 7d327dcefb 1217d9a3d1
commit 5631f47eb6
2 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libc/include/paths.h
View File

@@ -33,42 +33,18 @@
#define _PATHS_H_ #define _PATHS_H_
/* Default search path. */ /* Default search path. */
#define _PATH_DEFPATH "/usr/bin:/bin" #define _PATH_DEFPATH "/system/bin:/system/xbin"
/* All standard utilities path. */
#define _PATH_STDPATH \
"/usr/bin:/bin:/usr/sbin:/sbin"
#define _PATH_BSHELL "/system/bin/sh" #define _PATH_BSHELL "/system/bin/sh"
#define _PATH_CONSOLE "/dev/console" #define _PATH_CONSOLE "/dev/console"
#define _PATH_CSHELL "/bin/csh"
#define _PATH_DEVDB "/var/run/dev.db"
#define _PATH_DEVNULL "/dev/null" #define _PATH_DEVNULL "/dev/null"
#define _PATH_DRUM "/dev/drum"
#define _PATH_KLOG "/proc/kmsg" #define _PATH_KLOG "/proc/kmsg"
#define _PATH_KMEM "/dev/kmem"
#define _PATH_LASTLOG "/var/log/lastlog"
#define _PATH_MAILDIR "/var/mail"
#define _PATH_MAN "/usr/share/man"
#define _PATH_MEM "/dev/mem" #define _PATH_MEM "/dev/mem"
#define _PATH_MNTTAB "/etc/fstab"
#define _PATH_MOUNTED "/etc/mtab" #define _PATH_MOUNTED "/proc/mounts"
#define _PATH_NOLOGIN "/etc/nologin"
#define _PATH_PRESERVE "/var/lib"
#define _PATH_RWHODIR "/var/spool/rwho"
#define _PATH_SENDMAIL "/usr/sbin/sendmail"
#define _PATH_SHADOW "/etc/shadow"
#define _PATH_SHELLS "/etc/shells"
#define _PATH_TTY "/dev/tty" #define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "/boot/vmlinux"
#define _PATH_UTMP "/var/run/utmp"
#define _PATH_VI "/bin/vi"
#define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */ /* Provide trailing slash, since mostly used for building pathnames. */
#define _PATH_DEV "/dev/" #define _PATH_DEV "/dev/"
#define _PATH_TMP "/tmp/"
#define _PATH_VARDB "/var/db/"
#define _PATH_VARRUN "/var/run/"
#define _PATH_VARTMP "/var/tmp/"
#endif /* !_PATHS_H_ */ #endif /* !_PATHS_H_ */

5
libc/upstream-openbsd/android/include/openbsd-compat.h
View File

@@ -59,6 +59,11 @@
#define ALIGNBYTES (sizeof(uintptr_t) - 1) #define ALIGNBYTES (sizeof(uintptr_t) - 1)
#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES) #define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES)
/* OpenBSD has this in paths.h. But this directory doesn't normally exist.
* Even when it does exist, only the 'shell' user has permissions.
*/
#define _PATH_TMP "/data/local/tmp/"
/* We have OpenBSD's getentropy_linux.c, but we don't mention getentropy in any header. */ /* We have OpenBSD's getentropy_linux.c, but we don't mention getentropy in any header. */
__LIBC_HIDDEN__ extern int getentropy(void*, size_t); __LIBC_HIDDEN__ extern int getentropy(void*, size_t);