Re: [PATCH] _BSD_SOURCE for unistd.h, take 2

[Isaac Dunham <idunham@lavabit.com>]

[-- Attachment #1: Type: text/plain, Size: 829 bytes --]

On Fri, 6 Apr 2012 10:48:29 -0400
Rich Felker <dalias@aerifal.cx> wrote:
> Looking at this again, it looks to me like almost all of the functions
> under _GNU_SOURCE are also present on BSD. That is to say, just
> replacing #ifdef _GNU_SOURCE with
> 
> #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
> 
> would give a closer approximation to what _BSD_SOURCE is supposed to
> do. I'm not saying this is the best solution, but before I go
> committing patches to support _BSD_SOURCE, 
Yep, looks like I missed some.
get_current_dir_name, setresuid and setresgid (as well as forkall...)
are the only ones that aren't defined with _BSD_SOURCE.

Still, I tend to prefer having some respect for even unofficial
namespaces.

Attached is a patch (3rd revision) that has all the _BSD_SOURCE
functions properly classified.

Isaac Dunham

[-- Attachment #2: unistd.diff --]
[-- Type: text/x-patch, Size: 973 bytes --]

diff --git a/include/unistd.h b/include/unistd.h
index 7662e51..5381eea 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -16,6 +16,12 @@ extern "C" {
 #define SEEK_CUR 1
 #define SEEK_END 2
 
+#if defined(_BSD_SOURCE) && !defined(L_SET)
+#define L_SET	SEEK_SET
+#define L_INCR	SEEK_CUR
+#define L_XTND	SEEK_END
+#endif
+
 #undef NULL
 #ifdef __cplusplus
 #define NULL 0
@@ -144,10 +150,9 @@ void sync(void);
 int getdtablesize(void);
 #endif
 
-#ifdef _GNU_SOURCE
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 int brk(void *);
 void *sbrk(intptr_t);
-pid_t forkall(void);
 pid_t vfork(void);
 int vhangup(void);
 int chroot(const char *);
@@ -156,6 +161,10 @@ int sethostname(const char *, size_t);
 int usleep(unsigned);
 unsigned ualarm(unsigned, unsigned);
 int setgroups(size_t, const gid_t []);
+#endif
+
+#ifdef _GNU_SOURCE
+pid_t forkall(void);
 int setresuid(uid_t, uid_t, uid_t);
 int setresgid(gid_t, gid_t, gid_t);
 char *get_current_dir_name(void);