From cc4603df216a34688ab2dbd26231fcc18d36925a Mon Sep 17 00:00:00 2001 From: David Schultz Date: Sat, 14 Mar 2009 19:11:08 +0000 Subject: [PATCH] Various namespace cleanups, including exposing fchmod() and fchmodat() in the POSIX namespace, and hiding eaccess() and setproctitle(). Also move mknodat() from unistd.h to sys/stat.h where it belongs. The *at() syscalls are only in CURRENT, so this shouldn't cause problems. --- include/unistd.h | 9 ++++----- sys/sys/stat.h | 7 +++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/unistd.h b/include/unistd.h index 704d93554832..4b567b830752 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -328,7 +328,6 @@ int chown(const char *, uid_t, gid_t); int close(int); int dup(int); int dup2(int, int); -int eaccess(const char *, int); int execl(const char *, const char *, ...); int execle(const char *, const char *, ...); int execlp(const char *, const char *, ...); @@ -360,7 +359,6 @@ ssize_t read(int, void *, size_t); int rmdir(const char *); int setgid(gid_t); int setpgid(pid_t, pid_t); -void setproctitle(const char *_fmt, ...) __printf0like(1, 2); pid_t setsid(void); int setuid(uid_t); unsigned int sleep(unsigned int); @@ -431,7 +429,6 @@ int truncate(const char *, off_t); #if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE int faccessat(int, const char *, int, int); -int fchmodat(int, const char *, mode_t, int); int fchownat(int, const char *, uid_t, gid_t, int); int fexecve(int, char *const [], char *const []); int linkat(int, const char *, int, const char *, int); @@ -470,7 +467,7 @@ void sync(void); #endif /* __XSI_VISIBLE */ -#if __XSI_VISIBLE <= 500 || __BSD_VISIBLE +#if (__XSI_VISIBLE && __XSI_VISIBLE <= 500) || __BSD_VISIBLE int brk(const void *); int chroot(const char *); int getdtablesize(void); @@ -479,7 +476,7 @@ char *getpass(const char *); void *sbrk(intptr_t); #endif -#if __XSI_VISIBLE <= 600 || __BSD_VISIBLE +#if (__XSI_VISIBLE && __XSI_VISIBLE <= 600) || __BSD_VISIBLE char *getwd(char *); /* obsoleted by getcwd() */ useconds_t ualarm(useconds_t, useconds_t); @@ -497,6 +494,7 @@ const char * int crypt_set_format(const char *); int des_cipher(const char *, char *, long, int); int des_setkey(const char *key); +int eaccess(const char *, int); void endusershell(void); int exect(const char *, char * const *, char * const *); int execvP(const char *, const char *, char * const *); @@ -563,6 +561,7 @@ int setkey(const char *); #endif int setlogin(const char *); void *setmode(const char *); +void setproctitle(const char *_fmt, ...) __printf0like(1, 2); int setresgid(gid_t, gid_t, gid_t); int setresuid(uid_t, uid_t, uid_t); int setrgid(gid_t); diff --git a/sys/sys/stat.h b/sys/sys/stat.h index b31064130b0d..856d674046d7 100644 --- a/sys/sys/stat.h +++ b/sys/sys/stat.h @@ -312,8 +312,13 @@ int chflags(const char *, unsigned long); int chmod(const char *, mode_t); #if __BSD_VISIBLE int fchflags(int, unsigned long); +#endif +#if __POSIX_VISIBLE >= 200112 int fchmod(int, mode_t); #endif +#if __POSIX_VISIBLE >= 200809 +int fchmodat(int, const char *, mode_t, int); +#endif int fstat(int, struct stat *); #if __BSD_VISIBLE int lchflags(const char *, int); @@ -334,6 +339,8 @@ mode_t umask(mode_t); int fstatat(int, const char *, struct stat *, int); int mkdirat(int, const char *, mode_t); int mkfifoat(int, const char *, mode_t); +#endif +#if __BSD_VISIBLE || __XSI_VISIBLE >= 700 int mknodat(int, const char *, mode_t, dev_t); #endif __END_DECLS