Introduce __set_errno() throughout libroot.

* add errno_private.h, which defines the __set_errno() macro with
  and without tracing
* instead of setting errno manually, all libroot's code now invokes
  __set_errno(), which makes it much easier to trace changes to errno
* redirect glibc's use of __set_errno() to our own version

headers/private/libroot/errno_private.h

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2011, Oliver Tappe, [email protected].
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _ERRNO_PRIVATE_H
+#define _ERRNO_PRIVATE_H
+
+
+#include <errno.h>
+
+//#define TRACE_ERRNO
+
+#if defined(TRACE_ERRNO) && !defined(_KERNEL_MODE)
+#	include <OS.h>
+#	define __set_errno(x) 													  \
+		do { 																  \
+			int error = (x);												  \
+			debug_printf("%s:%d - setting errno to %x\n", __FILE__, __LINE__, \
+				error);														  \
+			errno = error;													  \
+		} while (0)
+#else
+#	define __set_errno(x) \
+		do { errno = (x); } while (0)
+#endif
+
+
+#endif	// _ERRNO_PRIVATE_H

src/libs/stdc++/legacy/Jamfile

@@ -25,6 +25,8 @@ SYSHDRS =
 	[ FDirName $(HAIKU_TOP) headers os support ] 
 	$(TARGET_GCC_HEADERS_DIR) ; 		# such that include_next will work
 
+UsePrivateHeaders libroot ;
+
 # some source-files generate several different objects, depending on
 # the defines that are used during the compilation call.
 # So we explicitly state each of these (with their respective defines):

src/system/libroot/os/arch/x86/compatibility.c

@@ -10,6 +10,7 @@
 #include <sys/stat.h>
 
 #include <SupportDefs.h>
+#include <errno_private.h>
 #include <fs_info.h>
 #include <fs_volume.h>
 
@@ -116,13 +117,13 @@ mount(const char *filesystem, const char *where, const char *device, ulong flags
 
 	// we don't support passing (binary) parameters
 	if (parms != NULL || len != 0 || flags & ~1) {
-		errno = B_BAD_VALUE;
+		__set_errno(B_BAD_VALUE);
 		return -1;
 	}
 
 	err = fs_mount_volume(where, device, filesystem, mountFlags, NULL);
 	if (err < B_OK) {
-		errno = err;
+		__set_errno(err);
 		return -1;
 	}
 	return 0;
@@ -136,7 +137,7 @@ unmount(const char *path)
 
 	err = fs_unmount_volume(path, 0);
 	if (err < B_OK) {
-		errno = err;
+		__set_errno(err);
 		return -1;
 	}
 	return 0;

src/system/libroot/os/find_directory.cpp

@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <errno_private.h>
 #include <user_group.h>
 
 /* use pwents to find home */
@@ -129,7 +130,7 @@ create_path(const char *path, mode_t mode)
 
 		strlcpy(buffer, path, i + 1);
 		if (stat(buffer, &st) < 0) {
-			errno = 0;
+			__set_errno(0);
 			if (mkdir(buffer, mode) < 0)
 				return errno;
 		}

src/system/libroot/os/fs_attr.cpp

@@ -12,6 +12,7 @@
 #include <stdlib.h>
 
 #include <dirent_private.h>
+#include <errno_private.h>
 #include <syscalls.h>
 #include <syscall_utils.h>
 
@@ -27,7 +28,7 @@ open_attr_dir(int file, const char *path, bool traverse)
 
 	int fd = _kern_open_attr_dir(file, path, traverse);
 	if (fd < 0) {
-		errno = fd;
+		__set_errno(fd);
 		return NULL;
 	}
 

src/system/libroot/os/fs_index.c

@@ -12,6 +12,7 @@
 #include <stdlib.h>
 
 #include <dirent_private.h>
+#include <errno_private.h>
 #include <syscalls.h>
 #include <syscall_utils.h>
 
@@ -60,7 +61,7 @@ fs_open_index_dir(dev_t device)
 
 	int fd = _kern_open_index_dir(device);
 	if (fd < 0) {
-		errno = fd;
+		__set_errno(fd);
 		return NULL;
 	}
 

src/system/libroot/os/fs_info.c

@@ -1,4 +1,4 @@
-/* 
+/*
 ** Copyright 2004, Axel Dörfler, [email protected]. All rights reserved.
 ** Distributed under the terms of the Haiku License.
 */
@@ -10,13 +10,14 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 
 
 #define RETURN_AND_SET_ERRNO(status) \
 	{ \
 		if (status < 0) { \
-			errno = status; \
+			__set_errno(status); \
 			return -1; \
 		} \
 		return status; \

src/system/libroot/os/fs_query.cpp

@@ -13,6 +13,7 @@
 #include <string.h>
 
 #include <dirent_private.h>
+#include <errno_private.h>
 #include <syscalls.h>
 #include <syscall_utils.h>
 
@@ -22,14 +23,14 @@ open_query_etc(dev_t device, const char *query,
 	uint32 flags, port_id port, int32 token)
 {
 	if (device < 0 || query == NULL || query[0] == '\0') {
-		errno = B_BAD_VALUE;
+		__set_errno(B_BAD_VALUE);
 		return NULL;
 	}
 
 	// open
 	int fd = _kern_open_query(device, query, strlen(query), flags, port, token);
 	if (fd < 0) {
-		errno = fd;
+		__set_errno(fd);
 		return NULL;
 	}
 
@@ -57,7 +58,7 @@ fs_open_live_query(dev_t device, const char *query,
 {
 	// check parameters
 	if (port < 0) {
-		errno = B_BAD_VALUE;
+		__set_errno(B_BAD_VALUE);
 		return NULL;
 	}
 

src/system/libroot/os/time.cpp

@@ -13,6 +13,7 @@
 #include <OS.h>
 
 #include <commpage_defs.h>
+#include <errno_private.h>
 #include <libroot_private.h>
 #include <real_time_data.h>
 #include <user_timer_defs.h>

src/system/libroot/posix/dirent.c

@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 #include <syscall_utils.h>
 
@@ -41,7 +42,7 @@ do_seek_dir(DIR* dir)
 	if (dir->seek_position < dir->current_position) {
 		status_t status = _kern_rewind_dir(dir->fd);
 		if (status < 0) {
-			errno = status;
+			__set_errno(status);
 			return -1;
 		}
 
@@ -81,7 +82,7 @@ do_seek_dir(DIR* dir)
 			(char*)dir + DIR_BUFFER_SIZE - (char*)&dir->first_entry, USHRT_MAX);
 		if (count <= 0) {
 			if (count < 0)
-				errno = count;
+				__set_errno(count);
 
 			// end of directory
 			return -1;
@@ -105,7 +106,7 @@ __create_dir_struct(int fd)
 
 	DIR* dir = (DIR*)malloc(DIR_BUFFER_SIZE);
 	if (dir == NULL) {
-		errno = B_NO_MEMORY;
+		__set_errno(B_NO_MEMORY);
 		return NULL;
 	}
 
@@ -130,7 +131,7 @@ fdopendir(int fd)
 	// descriptors, we have to open a fresh one explicitly.
 	int dirFD = _kern_open_dir(fd, NULL);
 	if (dirFD < 0) {
-		errno = dirFD;
+		__set_errno(dirFD);
 		return NULL;
 	}
 
@@ -164,7 +165,7 @@ opendir(const char* path)
 
 	int fd = _kern_open_dir(-1, path);
 	if (fd < 0) {
-		errno = fd;
+		__set_errno(fd);
 		return NULL;
 	}
 
@@ -184,7 +185,7 @@ closedir(DIR* dir)
 	int status;
 
 	if (dir == NULL) {
-		errno = B_BAD_VALUE;
+		__set_errno(B_BAD_VALUE);
 		return -1;
 	}
 
@@ -224,7 +225,7 @@ readdir(DIR* dir)
 		(char*)dir + DIR_BUFFER_SIZE - (char*)&dir->first_entry, USHRT_MAX);
 	if (count <= 0) {
 		if (count < 0)
-			errno = count;
+			__set_errno(count);
 
 		// end of directory
 		return NULL;

src/system/libroot/posix/fcntl.cpp

@@ -13,6 +13,7 @@
 #include <stdarg.h>
 #include <unistd.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 #include <syscall_utils.h>
 #include <umask.h>

src/system/libroot/posix/glibc/arch/m68k/Jamfile

@@ -12,6 +12,8 @@ SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ;
 
 SubDirHdrs $(HAIKU_TOP) src system libroot posix glibc arch generic ;
 
+UsePrivateHeaders libroot ;
+
 
 if $(OPTIM) = -O0 {
 	OPTIM = -O ;

src/system/libroot/posix/glibc/arch/ppc/Jamfile

@@ -11,6 +11,8 @@ SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ;
 
 SubDirHdrs $(HAIKU_TOP) src system libroot posix glibc arch generic ;
 
+UsePrivateHeaders libroot ;
+
 
 if $(OPTIM) = -O0 {
 	OPTIM = -O ;

src/system/libroot/posix/glibc/arch/x86/Jamfile

@@ -10,6 +10,8 @@ SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ;
 
 SubDirHdrs $(HAIKU_TOP) src system libroot posix glibc arch generic ;
 
+UsePrivateHeaders libroot ;
+
 if $(OPTIM) = -O0 {
 	OPTIM = -O ;
 }

src/system/libroot/posix/glibc/iconv/Jamfile

@@ -10,6 +10,9 @@ SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc iconv ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc locale ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ;
 
+UsePrivateHeaders libroot ;
+
+
 SubDirCcFlags -D_GNU_SOURCE -DUSE_IN_LIBIO ;
 
 MergeObject posix_gnu_iconv.o :

src/system/libroot/posix/glibc/include/bits/errno.h

@@ -17,4 +17,4 @@
    02111-1307 USA.  */
 #include_next <errno.h>
 
-#define __set_errno(val) errno = (val)
+#include <errno_private.h>

src/system/libroot/posix/glibc/libio/Jamfile

@@ -11,6 +11,8 @@ SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc locale ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc iconv ;
 
+UsePrivateHeaders libroot ;
+
 # For now, all wide character functions are disabled,
 # obprintf() is also disabled, because we don't have
 # obstack functionality

src/system/libroot/posix/glibc/libio/fileops.c

@@ -50,12 +50,6 @@
 # include <shlib-compat.h>
 #endif
 #endif
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(Val) errno = (Val)
-#endif
 
 #ifdef _LIBC
 /*# define open(Name, Flags, Prot) __open (Name, Flags, Prot)

src/system/libroot/posix/glibc/libio/ioseekoff.c

@@ -28,12 +28,6 @@
 #include <libioP.h>
 #include <stdlib.h>
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(Val) errno = (Val)
-#endif
 
 _IO_off64_t
 _IO_seekoff_unlocked (fp, offset, dir, mode)

src/system/libroot/posix/glibc/libio/libioP.h

@@ -29,9 +29,6 @@
 #define _LIBIO_P_H_
 
 #include <errno.h>
-#ifndef __set_errno
-# define __set_errno(Val) errno = (Val)
-#endif
 #if defined __GLIBC__ && __GLIBC__ >= 2
 # include <bits/libc-lock.h>
 #else

src/system/libroot/posix/glibc/libio/oldfileops.c

@@ -44,12 +44,6 @@
 #ifdef __STDC__
 #include <stdlib.h>
 #endif
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(Val) errno = (Val)
-#endif
 
 
 #ifdef _LIBC

src/system/libroot/posix/glibc/misc/Jamfile

@@ -10,6 +10,9 @@ SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc misc ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc locale ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ;
 
+UsePrivateHeaders libroot ;
+
+
 SubDirCcFlags -D_GNU_SOURCE -DUSE_IN_LIBIO ;
 
 MergeObject posix_gnu_misc.o :

src/system/libroot/posix/glibc/stdio-common/Jamfile

@@ -11,7 +11,8 @@ SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc stdio-common ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc locale ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ;
 
-# ToDo: for now, all wide character functions are disabled
+UsePrivateHeaders libroot ;
+
 
 MergeObject posix_gnu_stdio.o : #_common.o :
 	_itoa.c

src/system/libroot/posix/glibc/stdio-common/tempname.c

@@ -24,9 +24,6 @@
 #include <assert.h>
 
 #include <errno.h>
-#ifndef __set_errno
-# define __set_errno(Val) errno = (Val)
-#endif
 
 #include <stdio.h>
 #ifndef P_tmpdir

src/system/libroot/posix/glibc/stdio-common/vfscanf.c

@@ -605,12 +605,12 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
 	{
 	  /* Eat whitespace.  */
 	  int save_errno = errno;
-	  errno = 0;
+	  __set_errno(0);
 	  do
 	    if (inchar () == EOF && errno == EINTR)
 	      input_error ();
 	  while (ISSPACE (c));
-	  errno = save_errno;
+	  __set_errno(save_errno);
 	  ungetc (c, s);
 	  skip_space = 0;
 	}

src/system/libroot/posix/glibc/stdlib/Jamfile

@@ -7,6 +7,8 @@ SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc locale ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc stdlib ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ;
 
+UsePrivateHeaders libroot ;
+
 SubDirCcFlags -D_GNU_SOURCE -DUSE_IN_LIBIO ;
 
 MergeObject posix_gnu_stdlib.o :

src/system/libroot/posix/glibc/stdlib/strtol.c

@@ -29,12 +29,6 @@
 
 #include <ctype.h>
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(Val) errno = (Val)
-#endif
 
 #ifdef HAVE_LIMITS_H
 # include <limits.h>
@@ -532,7 +526,7 @@ noconv:
 
   return 0L;
 }
-
+
 /* External user entry point.  */
 
 #if _LIBC - 0 == 0

src/system/libroot/posix/glibc/wcsmbs/Jamfile

@@ -12,6 +12,9 @@ SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc stdlib ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ctype ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ;
 
+UsePrivateHeaders libroot ;
+
+
 SubDirCcFlags -D_GNU_SOURCE -DUSE_IN_LIBIO ;
 
 MergeObject posix_gnu_wcsmbs.o :

src/system/libroot/posix/glob.c

@@ -87,6 +87,8 @@ static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
 #include <unistd.h>
 #include <wchar.h>
 
+#include <errno_private.h>
+
 #ifndef __HAIKU__
 #	include "collate.h"
 #endif
@@ -155,7 +157,7 @@ static int	 glob1(Char *, glob_t *, size_t *);
 static int	 glob2(Char *, Char *, Char *, Char *, glob_t *, size_t *);
 static int	 glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, size_t *);
 static int	 globextend(const Char *, glob_t *, size_t *);
-static const Char *	
+static const Char *
 		 globtilde(const Char *, Char *, size_t, glob_t *);
 static int	 globexp1(const Char *, glob_t *, size_t *);
 static int	 globexp2(const Char *, const Char *, glob_t *, int *, size_t *);
@@ -378,8 +380,8 @@ globtilde(const Char *pattern, Char *patbuf, size_t patbuf_len, glob_t *pglob)
 	if (*pattern != TILDE || !(pglob->gl_flags & GLOB_TILDE))
 		return pattern;
 
-	/* 
+	/*
-	 * Copy up to the end of the string or / 
+	 * Copy up to the end of the string or /
 	 */
 	eb = &patbuf[patbuf_len - 1];
 	for (p = pattern + 1, h = (char *) patbuf;
@@ -625,7 +627,7 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_last,
 	if (pathend > pathend_last)
 		return (GLOB_ABORTED);
 	*pathend = EOS;
-	errno = 0;
+	__set_errno(0);
 
 	if ((dirp = g_opendir(pathbuf, pglob)) == NULL) {
 		/* TODO: don't call for ENOENT or ENOTDIR? */
@@ -711,7 +713,7 @@ globextend(const Char *path, glob_t *pglob, size_t *limit)
 	const Char *p;
 
 	if (*limit && pglob->gl_pathc > *limit) {
-		errno = 0;
+		__set_errno(0);
 		return (GLOB_NOSPACE);
 	}
 
@@ -850,7 +852,7 @@ g_lstat(Char *fn, struct stat *sb, glob_t *pglob)
 	char buf[MAXPATHLEN];
 
 	if (g_Ctoc(fn, buf, sizeof(buf))) {
-		errno = ENAMETOOLONG;
+		__set_errno(ENAMETOOLONG);
 		return (-1);
 	}
 	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
@@ -864,7 +866,7 @@ g_stat(Char *fn, struct stat *sb, glob_t *pglob)
 	char buf[MAXPATHLEN];
 
 	if (g_Ctoc(fn, buf, sizeof(buf))) {
-		errno = ENAMETOOLONG;
+		__set_errno(ENAMETOOLONG);
 		return (-1);
 	}
 	if (pglob->gl_flags & GLOB_ALTDIRFUNC)

src/system/libroot/posix/grp.cpp

@@ -13,6 +13,7 @@
 
 #include <OS.h>
 
+#include <errno_private.h>
 #include <libroot_private.h>
 #include <RegistrarDefs.h>
 #include <user_group.h>
@@ -130,7 +131,7 @@ getgrent(void)
 	int status = getgrent_r(&sGroupBuffer, sGroupStringBuffer,
 		sizeof(sGroupStringBuffer), &result);
 	if (status != 0)
-		errno = status;
+		__set_errno(status);
 	return result;
 }
 
@@ -190,7 +191,7 @@ getgrnam(const char *name)
 	int status = getgrnam_r(name, &sGroupBuffer, sGroupStringBuffer,
 		sizeof(sGroupStringBuffer), &result);
 	if (status != 0)
-		errno = status;
+		__set_errno(status);
 	return result;
 }
 
@@ -210,7 +211,7 @@ getgrgid(gid_t gid)
 	int status = getgrgid_r(gid, &sGroupBuffer, sGroupStringBuffer,
 		sizeof(sGroupStringBuffer), &result);
 	if (status != 0)
-		errno = status;
+		__set_errno(status);
 	return result;
 }
 

src/system/libroot/posix/locale/Jamfile

@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src system libroot posix locale ;
 
 UsePrivateHeaders
+	[ FDirName libroot ]
 	[ FDirName libroot locale ]
 	[ FDirName libroot time ]
 ;

src/system/libroot/posix/locale/wctype.cpp

@@ -8,6 +8,8 @@
 #include <string.h>
 #include <wctype.h>
 
+#include <errno_private.h>
+
 #include "LocaleBackend.h"
 
 
@@ -187,7 +189,7 @@ towctrans(wint_t wc, wctrans_t transition)
 	status_t status = gLocaleBackend->ToWCTrans(wc, transition, result);
 
 	if (status != B_OK)
-		errno = EINVAL;
+		__set_errno(EINVAL);
 
 	return result;
 }
@@ -204,7 +206,7 @@ wctrans(const char *charClass)
 			return _ISupper;
 	}
 
-	errno = EINVAL;
+	__set_errno(EINVAL);
 	return 0;
 }
 

src/system/libroot/posix/malloc/wrapper.cpp

@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <string.h>
 
+#include <errno_private.h>
 #include <user_thread.h>
 
 #include "tracing_config.h"
@@ -154,7 +155,7 @@ add_address(void* address, size_t size)
 	};
 
 	stack_frame* frame = (stack_frame*)get_stack_frame();
-	
+
 	for (int i = 0; i < HEAP_CALL_STACK_SIZE; i++) {
 		if (frame != NULL) {
 			b->setCallStack(i, frame->return_address);
@@ -272,7 +273,7 @@ malloc(size_t size)
 	void *addr = pHeap->getHeap(pHeap->getHeapIndex()).malloc(size);
 	if (addr == NULL) {
 		undefer_signals();
-		errno = B_NO_MEMORY;
+		__set_errno(B_NO_MEMORY);
 		KTRACE("malloc(%lu) -> NULL", size);
 		return NULL;
 	}
@@ -308,7 +309,7 @@ calloc(size_t nelem, size_t elsize)
 	void *ptr = pHeap->getHeap(pHeap->getHeapIndex()).malloc(size);
 	if (ptr == NULL) {
 		undefer_signals();
-		errno = B_NO_MEMORY;
+		__set_errno(B_NO_MEMORY);
 		KTRACE("calloc(%lu, %lu) -> NULL", nelem, elsize);
 		return NULL;
 	}
@@ -373,7 +374,7 @@ memalign(size_t alignment, size_t size)
 		size);
 	if (addr == NULL) {
 		undefer_signals();
-		errno = B_NO_MEMORY;
+		__set_errno(B_NO_MEMORY);
 		KTRACE("memalign(%lu, %lu) -> NULL", alignment, size);
 		return NULL;
 	}
@@ -469,7 +470,7 @@ realloc(void *ptr, size_t size)
 	void *buffer = malloc(size);
 	if (buffer == NULL) {
 		// Allocation failed, leave old block and return
-		errno = B_NO_MEMORY;
+		__set_errno(B_NO_MEMORY);
 		KTRACE("realloc(%p, %lu) -> NULL", ptr, size);
 		return NULL;
 	}

src/system/libroot/posix/malloc_debug/Jamfile

@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src system libroot posix malloc_debug ;
 
 UsePrivateSystemHeaders ;
-UsePrivateHeaders shared ;
+UsePrivateHeaders libroot shared ;
 
 MergeObject posix_malloc_debug.o :
 	heap.cpp

src/system/libroot/posix/malloc_debug/heap.cpp

@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <sys/mman.h>
 
+#include <errno_private.h>
 #include <locks.h>
 #include <syscalls.h>
 

src/system/libroot/posix/poll.c

@@ -11,6 +11,7 @@
 
 #include <syscall_utils.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 
 

src/system/libroot/posix/pwd.cpp

@@ -13,6 +13,7 @@
 
 #include <OS.h>
 
+#include <errno_private.h>
 #include <libroot_private.h>
 #include <RegistrarDefs.h>
 #include <user_group.h>
@@ -128,7 +129,7 @@ getpwent(void)
 	int status = getpwent_r(&sPasswdBuffer, sPasswdStringBuffer,
 		sizeof(sPasswdStringBuffer), &result);
 	if (status != 0)
-		errno = status;
+		__set_errno(status);
 	return result;
 }
 
@@ -188,7 +189,7 @@ getpwnam(const char *name)
 	int status = getpwnam_r(name, &sPasswdBuffer, sPasswdStringBuffer,
 		sizeof(sPasswdStringBuffer), &result);
 	if (status != 0)
-		errno = status;
+		__set_errno(status);
 	return result;
 }
 
@@ -208,7 +209,7 @@ getpwuid(uid_t uid)
 	int status = getpwuid_r(uid, &sPasswdBuffer, sPasswdStringBuffer,
 		sizeof(sPasswdStringBuffer), &result);
 	if (status != 0)
-		errno = status;
+		__set_errno(status);
 	return result;
 }
 

src/system/libroot/posix/pwd_query.c

@@ -20,7 +20,9 @@
 #include <Debug.h>
 #include <TypeConstants.h>
 
-/* 
+#include <errno_private.h>
+
+/*
  * Some notes.
  * Users are stored in an fs node (not necessarily a regular file,
  * that could be a dir, even the user's home dir,
@@ -78,16 +80,16 @@ static int32 pw_tls_id;
 typedef struct pw_tls {
 	DIR *grent_query;
 	DIR *pwent_query;
-	
+
 	int gridx;
 	int pwidx;
-	
+
 	char grfile[B_PATH_NAME_LENGTH+1]; /* current group's cached file path */
 	char pwfile[B_PATH_NAME_LENGTH+1]; /* current user's cached file path */
-	
+
 	struct group grent;
 	char grbuff[GRBUFFSZ]; /* XXX: merge with pwbuff ? */
-	
+
 	struct passwd pwent;
 	char pwbuff[PWBUFFSZ];
 } pw_tls_t;
@@ -96,7 +98,7 @@ struct pw_tls *get_pw_tls(void)
 {
 	pw_tls_t *p = (pw_tls_t *)tls_get(pw_tls_id);
 	PRINT(("%s()\n", __FUNCTION__));
-	
+
 	if (!p) {
 		p = (pw_tls_t *)malloc(sizeof(pw_tls_t));
 		if (!p)
@@ -117,7 +119,7 @@ int dentopen(struct dirent *dent, char *path)
 	dent->d_dev = boot_device;
 	err = get_path_for_dirent(dent, path, B_PATH_NAME_LENGTH);
 	if ((err < 0) || (path[0] != '/')) {
-		errno = err;
+		__set_errno(err);
 		return -1;
 	}
 	PRINT(("%s: open(%s)\n", __FUNCTION__, path));
@@ -178,7 +180,7 @@ void endgrent(void)
 	pw_tls_t *p;
 	PRINT(("%s()\n", __FUNCTION__));
 	p = get_pw_tls();
-	
+
 	if (p->grent_query)
 		fs_close_query(p->grent_query);
 	p->grent_query = NULL;
@@ -203,7 +205,7 @@ PRINT(("getgrent_r: grq = %p, idx = %d\n", p->grent_query, p->gridx));
 		setgrent(); /* y0u clumsy app! */
 	if (!p->grent_query)
 		return EIO; /* something happened... */
-	errno = 0;
+	__set_errno(0);
 	dent = fs_read_query(p->grent_query);
 	*gbufp = NULL;
 	if (!dent) {
@@ -238,12 +240,12 @@ struct group *getgrent(void)
 	p = get_pw_tls();
 	if (!p) {
 		/* we are really bork */
-		errno = ENOMEM;
+		__set_errno(ENOMEM);
 		return NULL;
 	}
 	err = getgrent_r(&p->grent, p->grbuff, GRBUFFSZ, &ent);
 	if (err < 0) {
-		errno = err;
+		__set_errno(err);
 		return NULL;
 	}
 	if (!ent)
@@ -265,17 +267,17 @@ struct group *getgrgid(gid_t gid)
 	p = get_pw_tls();
 	if (!p) {
 		/* we are really bork */
-		errno = ENOMEM;
+		__set_errno(ENOMEM);
 		return NULL;
 	}
-	
+
 	/* reusing path */
 	sprintf(p->grfile, QT_GR_GID, gid);
 	query = fs_open_query(boot_device, p->grfile, 0);
 	PRINT(("q: %p\n", query));
 	if (!query)
 		return NULL;
-	
+
 	dent = fs_read_query(query);
 	if (!dent) {
 		fs_close_query(query);
@@ -291,7 +293,7 @@ struct group *getgrgid(gid_t gid)
 	if (err)
 		return NULL;
 	return &p->grent;
-	
+
 }
 
 /* by name */
@@ -307,12 +309,12 @@ struct group *getgrnam(const char *name)
 	p = get_pw_tls();
 	if (!p) {
 		/* we are really bork */
-		errno = ENOMEM;
+		__set_errno(ENOMEM);
 		return NULL;
 	}
-	
+
 	if (!name || strlen(name) > GR_MAX_NAME) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return NULL;
 	}
 	/* reusing path */
@@ -321,7 +323,7 @@ struct group *getgrnam(const char *name)
 	PRINT(("q: %p\n", query));
 	if (!query)
 		return NULL;
-	
+
 	dent = fs_read_query(query);
 	if (!dent) {
 		fs_close_query(query);
@@ -337,7 +339,7 @@ struct group *getgrnam(const char *name)
 	if (err)
 		return NULL;
 	return &p->grent;
-	
+
 }
 
 
@@ -455,7 +457,7 @@ void endpwent(void)
 	pw_tls_t *p;
 	PRINT(("%s()\n", __FUNCTION__));
 	p = get_pw_tls();
-	
+
 	if (p->pwent_query)
 		fs_close_query(p->pwent_query);
 	p->pwent_query = NULL;
@@ -480,7 +482,7 @@ PRINT(("getpwent_r: pwq = %p, idx = %d\n", p->pwent_query, p->pwidx));
 		setpwent(); /* y0u clumsy app! */
 	if (!p->pwent_query)
 		return EIO; /* something happened... */
-	errno = 0;
+	__set_errno(0);
 	dent = fs_read_query(p->pwent_query);
 	*pwbufp = NULL;
 	if (!dent) {
@@ -515,12 +517,12 @@ struct passwd *getpwent(void)
 	p = get_pw_tls();
 	if (!p) {
 		/* we are really bork */
-		errno = ENOMEM;
+		__set_errno(ENOMEM);
 		return NULL;
 	}
 	err = getpwent_r(&p->pwent, p->pwbuff, PWBUFFSZ, &ent);
 	if (err < 0) {
-		errno = err;
+		__set_errno(err);
 		return NULL;
 	}
 	if (!ent)
@@ -542,10 +544,10 @@ struct passwd *getpwuid(uid_t uid)
 	p = get_pw_tls();
 	if (!p) {
 		/* we are really bork */
-		errno = ENOMEM;
+		__set_errno(ENOMEM);
 		return NULL;
 	}
-	
+
 	/* reusing path */
 	sprintf(p->pwfile, QT_PW_UID, uid);
 	PRINT(("%s: query(%s)\n", __FUNCTION__, p->pwfile));
@@ -553,7 +555,7 @@ struct passwd *getpwuid(uid_t uid)
 	PRINT(("q: %p\n", query));
 	if (!query)
 		return NULL;
-	
+
 	dent = fs_read_query(query);
 	if (!dent) {
 		fs_close_query(query);
@@ -569,7 +571,7 @@ struct passwd *getpwuid(uid_t uid)
 	if (err)
 		return NULL;
 	return &p->pwent;
-	
+
 }
 
 /* by name */
@@ -585,12 +587,12 @@ struct passwd *getpwnam(const char *name)
 	p = get_pw_tls();
 	if (!p) {
 		/* we are really bork */
-		errno = ENOMEM;
+		__set_errno(ENOMEM);
 		return NULL;
 	}
-	
+
 	if (!name || strlen(name) > PW_MAX_NAME) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return NULL;
 	}
 	/* reusing path */
@@ -600,7 +602,7 @@ struct passwd *getpwnam(const char *name)
 	PRINT(("q: %p\n", query));
 	if (!query)
 		return NULL;
-	
+
 	dent = fs_read_query(query);
 	if (!dent) {
 		fs_close_query(query);
@@ -617,7 +619,7 @@ struct passwd *getpwnam(const char *name)
 	if (err)
 		return NULL;
 	return &p->pwent;
-	
+
 }
 
 void __init_pwd_backend(void)
@@ -631,7 +633,7 @@ void __init_pwd_backend(void)
 /*
 void __fini_pwd_backend(void)
 {
-	
+
 }
 */
 

src/system/libroot/posix/scheduler.cpp

@@ -10,6 +10,7 @@
 
 #include <OS.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 
 
@@ -32,7 +33,7 @@ sched_get_priority_min(int policy)
 			return B_LOW_PRIORITY;
 
 		default:
-			errno = EINVAL;
+			__set_errno(EINVAL);
 			return -1;
 	}
 }
@@ -49,7 +50,7 @@ sched_get_priority_max(int policy)
 			return B_URGENT_DISPLAY_PRIORITY;
 
 		default:
-			errno = EINVAL;
+			__set_errno(EINVAL);
 			return -1;
 	}
 }

src/system/libroot/posix/semaphore.cpp

@@ -13,6 +13,7 @@
 #include <OS.h>
 
 #include <AutoDeleter.h>
+#include <errno_private.h>
 #include <posix/realtime_sem_defs.h>
 #include <syscall_utils.h>
 #include <syscalls.h>
@@ -22,7 +23,7 @@ sem_t*
 sem_open(const char* name, int openFlags,...)
 {
 	if (name == NULL) {
-		errno = B_BAD_VALUE;
+		__set_errno(B_BAD_VALUE);
 		return SEM_FAILED;
 	}
 
@@ -46,7 +47,7 @@ sem_open(const char* name, int openFlags,...)
 	// structure, otherwise we will delete it later.
 	sem_t* sem = (sem_t*)malloc(sizeof(sem_t));
 	if (sem == NULL) {
-		errno = B_NO_MEMORY;
+		__set_errno(B_NO_MEMORY);
 		return SEM_FAILED;
 	}
 	MemoryDeleter semDeleter(sem);
@@ -56,7 +57,7 @@ sem_open(const char* name, int openFlags,...)
 	status_t error = _kern_realtime_sem_open(name, openFlags, mode, semCount,
 		sem, &usedSem);
 	if (error != B_OK) {
-		errno = error;
+		__set_errno(error);
 		return SEM_FAILED;
 	}
 

src/system/libroot/posix/shadow.cpp

@@ -14,6 +14,7 @@
 #include <OS.h>
 
 #include <AutoDeleter.h>
+#include <errno_private.h>
 #include <libroot_private.h>
 #include <RegistrarDefs.h>
 #include <user_group.h>
@@ -82,7 +83,7 @@ getspent(void)
 	int status = getspent_r(&sShadowPwdBuffer, sShadowPwdStringBuffer,
 		sizeof(sShadowPwdStringBuffer), &result);
 	if (status != 0)
-		errno = status;
+		__set_errno(status);
 	return result;
 }
 
@@ -142,7 +143,7 @@ getspnam(const char *name)
 	int status = getspnam_r(name, &sShadowPwdBuffer, sShadowPwdStringBuffer,
 		sizeof(sShadowPwdStringBuffer), &result);
 	if (status != 0)
-		errno = status;
+		__set_errno(status);
 	return result;
 }
 
@@ -200,7 +201,7 @@ sgetspent(const char* line)
 	int status = sgetspent_r(line, &sShadowPwdBuffer, sShadowPwdStringBuffer,
 		sizeof(sShadowPwdStringBuffer), &result);
 	if (status != 0)
-		errno = status;
+		__set_errno(status);
 	return result;
 }
 
@@ -252,7 +253,7 @@ fgetspent(FILE* file)
 	int status = fgetspent_r(file, &sShadowPwdBuffer, sShadowPwdStringBuffer,
 		sizeof(sShadowPwdStringBuffer), &result);
 	if (status != 0)
-		errno = status;
+		__set_errno(status);
 	return result;
 }
 
@@ -265,7 +266,7 @@ fgetspent_r(FILE* file, struct spwd* spwd, char* buffer, size_t bufferSize,
 
 	// read a line
 	char lineBuffer[LINE_MAX + 1];
-	errno = 0;
+	__set_errno(0);
 	char* line = fgets(lineBuffer, sizeof(lineBuffer), file);
 	if (line == NULL) {
 		if (errno != 0)

src/system/libroot/posix/signal/kill.c

@@ -9,6 +9,7 @@
 
 #include <OS.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 
 
@@ -18,7 +19,7 @@ kill(pid_t pid, int sig)
 	status_t status;
 
 	if (sig < 0) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return -1;
 	}
 
@@ -28,7 +29,7 @@ kill(pid_t pid, int sig)
 		if (status == B_BAD_THREAD_ID || status == B_BAD_TEAM_ID)
 			status = ESRCH;
 
-		errno = status;
+		__set_errno(status);
 		return -1;
 	}
 

src/system/libroot/posix/signal/killpg.cpp

@@ -7,6 +7,8 @@
 #include <errno.h>
 #include <signal.h>
 
+#include <errno_private.h>
+
 
 int
 killpg(pid_t processGroupID, int signal)
@@ -14,7 +16,7 @@ killpg(pid_t processGroupID, int signal)
 	if (processGroupID > 1)
 		return kill(-processGroupID, signal);
 	else {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return -1;
 	}
 }

src/system/libroot/posix/signal/set_signal_mask.cpp

@@ -15,6 +15,7 @@
 #include <symbol_versioning.h>
 #include <syscalls.h>
 
+#include <errno_private.h>
 #include <signal_private.h>
 
 

src/system/libroot/posix/signal/set_signal_stack.c

@@ -8,6 +8,7 @@
 
 #include <errno.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 
 
@@ -23,7 +24,7 @@ set_signal_stack(void *ptr, size_t size)
 
 	status = _kern_set_signal_stack(&alternateStack, NULL);
 	if (status < B_OK)
-		errno = status;
+		__set_errno(status);
 }
 
 

src/system/libroot/posix/signal/sigaction.cpp

@@ -17,6 +17,7 @@
 #include <symbol_versioning.h>
 #include <syscalls.h>
 
+#include <errno_private.h>
 #include <signal_private.h>
 
 

src/system/libroot/posix/signal/sigaltstack.c

@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <signal.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 
 
@@ -15,7 +16,7 @@ sigaltstack(const stack_t *alternateStack, stack_t *oldAlternateStack)
 {
 	status_t status =_kern_set_signal_stack(alternateStack, oldAlternateStack);
 	if (status < B_OK) {
-		errno = status;
+		__set_errno(status);
 		return -1;
 	}
 

src/system/libroot/posix/signal/signal.cpp

@@ -15,6 +15,7 @@
 
 #include <symbol_versioning.h>
 
+#include <errno_private.h>
 #include <signal_private.h>
 
 
@@ -41,7 +42,7 @@ __signal_beos(int signal, __sighandler_t signalHandler)
 {
 	// check signal range
 	if (signal < 0 || signal > MAX_SIGNAL_NUMBER_BEOS) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return SIG_ERR;
 	}
 

src/system/libroot/posix/signal/sigpending.cpp

@@ -14,6 +14,7 @@
 
 #include <syscall_utils.h>
 
+#include <errno_private.h>
 #include <symbol_versioning.h>
 #include <syscalls.h>
 

src/system/libroot/posix/signal/sigqueue.cpp

@@ -10,6 +10,7 @@
 
 #include <syscall_utils.h>
 
+#include <errno_private.h>
 #include <signal_defs.h>
 #include <syscalls.h>
 

src/system/libroot/posix/signal/sigset_accessors.cpp

@@ -17,6 +17,7 @@
 
 #include <symbol_versioning.h>
 
+#include <errno_private.h>
 #include <signal_private.h>
 
 
@@ -43,7 +44,7 @@ int
 __sigismember_beos(const sigset_t_beos* set, int signal)
 {
 	if (signal <= 0 || signal > MAX_SIGNAL_NUMBER_BEOS) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return -1;
 	}
 
@@ -55,7 +56,7 @@ int
 __sigaddset_beos(sigset_t_beos* set, int signal)
 {
 	if (signal <= 0 || signal > MAX_SIGNAL_NUMBER_BEOS) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return -1;
 	}
 
@@ -68,7 +69,7 @@ int
 __sigdelset_beos(sigset_t_beos* set, int signal)
 {
 	if (signal <= 0 || signal > MAX_SIGNAL_NUMBER_BEOS) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return -1;
 	}
 
@@ -100,7 +101,7 @@ int
 __sigismember(const sigset_t* set, int signal)
 {
 	if (signal <= 0 || signal > MAX_SIGNAL_NUMBER) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return -1;
 	}
 
@@ -112,7 +113,7 @@ int
 __sigaddset(sigset_t* set, int signal)
 {
 	if (signal <= 0 || signal > MAX_SIGNAL_NUMBER) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return -1;
 	}
 
@@ -125,7 +126,7 @@ int
 __sigdelset(sigset_t* set, int signal)
 {
 	if (signal <= 0 || signal > MAX_SIGNAL_NUMBER) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return -1;
 	}
 

src/system/libroot/posix/signal/sigsuspend.cpp

@@ -18,6 +18,7 @@
 #include <symbol_versioning.h>
 #include <syscalls.h>
 
+#include <errno_private.h>
 #include <signal_private.h>
 
 
@@ -32,7 +33,7 @@ __sigsuspend_beos(const sigset_t_beos* beosMask)
 int
 __sigsuspend(const sigset_t* mask)
 {
-	errno = _kern_sigsuspend(mask);
+	__set_errno(_kern_sigsuspend(mask));
 
 	pthread_testcancel();
 

src/system/libroot/posix/signal/sigtimedwait.cpp

@@ -11,6 +11,7 @@
 
 #include <syscall_utils.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 
 

src/system/libroot/posix/signal/strsignal.cpp

@@ -14,6 +14,7 @@
 #include <signal.h>
 #include <stdio.h>
 
+#include <errno_private.h>
 #include <signal_defs.h>
 
 

src/system/libroot/posix/stdio/fclose.c

@@ -41,6 +41,9 @@ static char rcsid[] = "$OpenBSD: fclose.c,v 1.2 1996/08/19 08:32:19 tholo Exp $"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+
+#include <errno_private.h>
+
 #include "local.h"
 
 int
@@ -50,7 +53,7 @@ fclose(fp)
 	register int r;
 
 	if (fp->_flags == 0) {	/* not open! */
-		errno = EBADF;
+		__set_errno(EBADF);
 		return (EOF);
 	}
 	r = fp->_flags & __SWR ? __sflush(fp) : 0;

src/system/libroot/posix/stdio/fflush.c

@@ -40,6 +40,9 @@ static char rcsid[] = "$OpenBSD: fflush.c,v 1.2 1996/08/19 08:32:26 tholo Exp $"
 
 #include <errno.h>
 #include <stdio.h>
+
+#include <errno_private.h>
+
 #include "local.h"
 
 /* Flush a single file, or (if fp is NULL) all files.  */
@@ -50,7 +53,7 @@ fflush(fp)
 	if (fp == NULL)
 		return (_fwalk(__sflush));
 	if ((fp->_flags & (__SWR | __SRW)) == 0) {
-		errno = EBADF;
+		__set_errno(EBADF);
 		return (EOF);
 	}
 	return (__sflush(fp));

src/system/libroot/posix/stdio/findfp.c

@@ -41,6 +41,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <errno_private.h>
+
 #include "local.h"
 #include "glue.h"
 
@@ -55,7 +57,7 @@ int	__sdidinit;
  * must be cast to any desired pointer type.
  */
 #define ALIGNBYTES      (sizeof(int) - 1)
-#define ALIGN(p)        (((u_int)(p) + ALIGNBYTES) &~ ALIGNBYTES) 
+#define ALIGN(p)        (((u_int)(p) + ALIGNBYTES) &~ ALIGNBYTES)
 
 #define	NDYNAMIC 10		/* add ten more whenever necessary */
 

src/system/libroot/posix/stdio/flags.c

@@ -39,9 +39,10 @@
 //#include <sys/file.h>
 #include <stdio.h>
 #include <errno.h>
-
 #include <fcntl.h>
 
+#include <errno_private.h>
+
 #include "local.h"
 
 /*
@@ -77,7 +78,7 @@ __sflags(mode, optr)
 		break;
 
 	default:	/* illegal mode */
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return (0);
 	}
 

src/system/libroot/posix/stdio/fopen.c

@@ -41,6 +41,8 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include <errno_private.h>
+
 #include "local.h"
 
 FILE *
@@ -63,7 +65,7 @@ fopen(file, mode)
 	if ((f = open(file, oflags, DEFFILEMODE)) < 0) {
 		fp->_flags = 0;			/* release */
 /* XXX - temporary hack */
-		errno = f;
+		__set_errno(f);
 		return (NULL);
 	}
 	fp->_file = f;

src/system/libroot/posix/stdio/fputc.c

@@ -40,6 +40,9 @@ static char rcsid[] = "$OpenBSD: fputc.c,v 1.4 2001/07/09 06:57:44 deraadt Exp $
 
 #include <stdio.h>
 #include <errno.h>
+
+#include <errno_private.h>
+
 #include "local.h"
 
 int
@@ -48,7 +51,7 @@ fputc(c, fp)
 	register FILE *fp;
 {
 	if (cantwrite(fp)) {
-		errno = EBADF;
+		__set_errno(EBADF);
 		return (EOF);
 	}
 	return (putc(c, fp));

src/system/libroot/posix/stdio/fseek.c

@@ -40,6 +40,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
+
+#include <errno_private.h>
+
 #include "local.h"
 
 #define	POS_ERR	(-(fpos_t)1)
@@ -68,7 +71,7 @@ fseeko(fp, offset, whence)
 	 * Have to be able to seek.
 	 */
 	if ((seekfn = fp->_seek) == NULL) {
-		errno = ESPIPE;			/* historic practice */
+		__set_errno(ESPIPE);			/* historic practice */
 		return (EOF);
 	}
 
@@ -111,7 +114,7 @@ fseeko(fp, offset, whence)
 		break;
 
 	default:
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return (EOF);
 	}
 

src/system/libroot/posix/stdio/fvwrite.c

@@ -38,6 +38,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+
+#include <errno_private.h>
+
 #include "local.h"
 #include "fvwrite.h"
 
@@ -64,7 +67,7 @@ __sfvwrite(fp, uio)
 	}
 	/* make sure we can write */
 	if (cantwrite(fp)) {
-		errno = EBADF;
+		__set_errno(EBADF);
 		return (EOF);
 	}
 

src/system/libroot/posix/stdio/fwalk.c

@@ -40,6 +40,9 @@ static char rcsid[] = "$OpenBSD: fwalk.c,v 1.3 2001/07/09 06:57:44 deraadt Exp $
 
 #include <errno.h>
 #include <stdio.h>
+
+#include <errno_private.h>
+
 #include "local.h"
 #include "glue.h"
 

src/system/libroot/posix/stdio/putc.c

@@ -36,6 +36,9 @@
 
 #include <stdio.h>
 #include <errno.h>
+
+#include <errno_private.h>
+
 #include "local.h"
 
 /*
@@ -51,7 +54,7 @@ putc_unlocked(c, fp)
 	register FILE *fp;
 {
 	if (cantwrite(fp)) {
-		errno = EBADF;
+		__set_errno(EBADF);
 		return (EOF);
 	}
 	return (__sputc(c, fp));

src/system/libroot/posix/stdio/refill.c

@@ -38,6 +38,9 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+
+#include <errno_private.h>
+
 #include "local.h"
 
 static int
@@ -72,7 +75,7 @@ __srefill(fp)
 	/* if not already reading, have to be reading and writing */
 	if ((fp->_flags & __SRD) == 0) {
 		if ((fp->_flags & __SRW) == 0) {
-			errno = EBADF;
+			__set_errno(EBADF);
 			fp->_flags |= __SERR;
 			return (EOF);
 		}

src/system/libroot/posix/stdio/remove.c

@@ -8,6 +8,7 @@
 
 #include <errno.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 
 
@@ -20,7 +21,7 @@ remove(const char* path)
 		status = _kern_remove_dir(-1, path);
 
 	if (status != B_OK) {
-		errno = status;
+		__set_errno(status);
 		return -1;
 	}
 

src/system/libroot/posix/stdio/rename.c

@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <stdio.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 #include <syscall_utils.h>
 

src/system/libroot/posix/stdio/rewind.c

@@ -37,6 +37,8 @@
 #include <errno.h>
 #include <stdio.h>
 
+#include <errno_private.h>
+
 
 void
 rewind(fp)
@@ -44,5 +46,5 @@ rewind(fp)
 {
 	(void) fseek(fp, 0L, SEEK_SET);
 	//clearerr(fp);
-	errno = 0;      /* not required, but seems reasonable */
+	__set_errno(0);      /* not required, but seems reasonable */
 }

src/system/libroot/posix/stdio/vfprintf.c

@@ -53,8 +53,10 @@
 #	include <varargs.h>
 #endif
 
-#include "local.h"  
+#include <errno_private.h>
-#include "fvwrite.h"  
+
+#include "local.h"
+#include "fvwrite.h"
 
 static void __find_arguments (const char *fmt0, va_list ap,
 	va_list **argtable);
@@ -254,7 +256,7 @@ vfprintf(FILE *fp, const char *fmt0, va_list ap)
 	    flags&LONGINT ? GETARG(u_long) : \
 	    flags&SHORTINT ? (u_long)(u_short)GETARG(int) : \
 	    (u_long)GETARG(u_int))
- 
+
          /*
           * Get * arguments, including the form *nn$.  Preserve the nextarg
           * that the argument can be gotten once the type is determined.
@@ -289,10 +291,10 @@ vfprintf(FILE *fp, const char *fmt0, va_list ap)
 #define GETARG(type) \
 	(((argtable != NULL) ? (void)(ap = argtable[nextarg]) : (void)0), \
 	 nextarg++, va_arg(ap, type))
- 
+
 	/* sorry, fprintf(read_only_file, "") returns EOF, not 0 */
 	if (cantwrite(fp)) {
-		errno = EBADF;
+		__set_errno(EBADF);
 		return (EOF);
 	}
 
@@ -412,7 +414,7 @@ reswitch:	switch (ch) {
 			   		__find_arguments(fmt0, orgap,
 					    &argtable);
 			  	}
-				goto rflag; 
+				goto rflag;
 			}
 			width = n;
 			goto reswitch;
@@ -494,7 +496,7 @@ reswitch:	switch (ch) {
 					ch = (ch == 'g') ? 'e' : 'E';
 				else
 					ch = 'g';
-			} 
+			}
 			if (ch <= 'e') {	/* 'e' or 'E' fmt */
 				--expt;
 				expsize = exponent(expstr, expt, ch);
@@ -792,7 +794,7 @@ error:
  * table, indexed by argument number, of pointers to each arguments.  The
  * initial argument table should be an array of STATIC_ARG_TBL_SIZE entries.
  * It will be replaces with a malloc-ed on if it overflows.
- */ 
+ */
 
 static void
 __find_arguments(const char *fmt0, va_list ap, va_list **argtable)
@@ -847,7 +849,7 @@ __find_arguments(const char *fmt0, va_list ap, va_list **argtable)
 	fmt = (char *)fmt0;
 	typetable = stattypetable;
 	tablesize = STATIC_ARG_TBL_SIZE;
-	tablemax = 0; 
+	tablemax = 0;
 	nextarg = 1;
 	memset(typetable, T_UNUSED, STATIC_ARG_TBL_SIZE);
 
@@ -1092,7 +1094,7 @@ __grow_type_table(unsigned char **typetable, int *tablesize)
 	return(0);
 }
 
-  
+
 #ifdef FLOATING_POINT
 
 extern char *__dtoa __P((double, int, int, int *, int *, char **));
@@ -1106,8 +1108,8 @@ cvt(double value, int ndigits, int flags, char *sign, int *decpt, int ch, int *l
 	if (ch == 'f') {
 		mode = 3;		/* ndigits after the decimal point */
 	} else {
-		/* To obtain ndigits after the decimal point for the 'e' 
+		/* To obtain ndigits after the decimal point for the 'e'
-		 * and 'E' formats, round to ndigits + 1 significant 
+		 * and 'E' formats, round to ndigits + 1 significant
 		 * figures.
 		 */
 		if (ch == 'e' || ch == 'E') {

src/system/libroot/posix/stdio/wbuf.c

@@ -36,6 +36,9 @@
 
 #include <stdio.h>
 #include <errno.h>
+
+#include <errno_private.h>
+
 #include "local.h"
 
 /*
@@ -59,7 +62,7 @@ __swbuf(c, fp)
 	 */
 	fp->_w = fp->_lbfsize;
 	if (cantwrite(fp)) {
-		errno = EBADF;
+		__set_errno(EBADF);
 		return (EOF);
 	}
 	c = (unsigned char)c;

src/system/libroot/posix/stdlib/atfork.c

@@ -1,4 +1,4 @@
-/* 
+/*
 ** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
 ** Distributed under the terms of the Haiku License.
 */
@@ -9,6 +9,8 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#include <errno_private.h>
+
 
 /**	This is the BeOS compatible atfork() function; since it's not part of POSIX,
  *	it should probably go away over time.
@@ -20,7 +22,7 @@ atfork(void (*function)(void))
 {
 	status_t status = __register_atfork(NULL, NULL, function);
 	if (status < B_OK) {
-		errno = status;
+		__set_errno(status);
 		return -1;
 	}
 

src/system/libroot/posix/stdlib/env.cpp

@@ -11,6 +11,7 @@
 
 #include <OS.h>
 
+#include <errno_private.h>
 #include <libroot_private.h>
 #include <locks.h>
 #include <runtime_loader.h>
@@ -249,7 +250,7 @@ setenv(const char *name, const char *value, int overwrite)
 	status_t status;
 
 	if (name == NULL || name[0] == '\0' || strchr(name, '=') != NULL) {
-		errno = B_BAD_VALUE;
+		__set_errno(B_BAD_VALUE);
 		return -1;
 	}
 
@@ -268,7 +269,7 @@ unsetenv(const char *name)
 	char *env;
 
 	if (name == NULL || name[0] == '\0' || strchr(name, '=') != NULL) {
-		errno = B_BAD_VALUE;
+		__set_errno(B_BAD_VALUE);
 		return -1;
 	}
 
@@ -285,8 +286,8 @@ unsetenv(const char *name)
 		free(env);
 		memmove(environ + index, environ + index + 1,
 			sizeof(char *) * (count_variables() - index));
-			
+
-		// search possible another occurence, introduced via putenv() 
+		// search possible another occurence, introduced via putenv()
 		// and renamed since
 		env = find_variable(name, length, &index);
 	}
@@ -303,7 +304,7 @@ putenv(const char *string)
 	status_t status;
 
 	if (value == NULL) {
-		errno = B_BAD_VALUE;
+		__set_errno(B_BAD_VALUE);
 		return -1;
 	}
 

src/system/libroot/posix/stdlib/heapsort.c

@@ -41,6 +41,8 @@ static char sccsid[] = "@(#)heapsort.c	8.1 (Berkeley) 6/4/93";
 #include <errno.h>
 #include <stdlib.h>
 
+#include <errno_private.h>
+
 /*
  * Swap two areas of size number of bytes.  Although qsort(3) permits random
  * blocks of memory to be sorted, sorting pointers is almost certainly the
@@ -156,7 +158,7 @@ heapsort(void *vbase, size_t nmemb, size_t size, int (*compar)(void const *, voi
 	}
 
 	if (!size) {
-//		errno = EINVAL;
+//		__set_errno(EINVAL);
 		return (-1);
 	}
 

src/system/libroot/posix/stdlib/merge.c

@@ -58,6 +58,8 @@ static char sccsid[] = "@(#)merge.c	8.2 (Berkeley) 2/14/94";
 #include <stdlib.h>
 #include <string.h>
 
+#include <errno_private.h>
+
 static void setup(u_char *, u_char *, size_t, size_t, int (*)());
 static void insertionsort(u_char *, size_t, size_t, int (*)());
 
@@ -116,7 +118,7 @@ mergesort(void *base, size_t nmemb, size_t size, int (*cmp)(void const *, void c
 	u_char **p1;
 
 	if (size < PSIZE / 2) {		/* Pointers must fit into 2 * size. */
-//		errno = EINVAL;
+//		__set_errno(EINVAL);
 		return (-1);
 	}
 

src/system/libroot/posix/stdlib/mktemp.c

@@ -42,6 +42,8 @@
 #include <unistd.h>
 #include <stdint.h>
 
+#include <errno_private.h>
+
 
 static int _gettemp(char *, int *, int, int);
 
@@ -96,7 +98,7 @@ _gettemp(char *path, int *doopen, int domkdir, int slen)
 	int rval;
 
 	if (doopen != NULL && domkdir) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return 0;
 	}
 
@@ -107,7 +109,7 @@ _gettemp(char *path, int *doopen, int domkdir, int slen)
 	suffp = trv;
 	--trv;
 	if (trv < path) {
-		errno = EINVAL;
+		__set_errno(EINVAL);
 		return 0;
 	}
 
@@ -130,7 +132,7 @@ _gettemp(char *path, int *doopen, int domkdir, int slen)
 				if (rval != 0)
 					return 0;
 				if (!S_ISDIR(sbuf.st_mode)) {
-					errno = ENOTDIR;
+					__set_errno(ENOTDIR);
 					return 0;
 				}
 				break;

src/system/libroot/posix/stdlib/radixsort.c

@@ -55,6 +55,8 @@ static char sccsid[] = "@(#)radixsort.c	8.2 (Berkeley) 4/28/95";
 #include <stdlib.h>
 #include <errno.h>
 
+#include <errno_private.h>
+
 typedef struct {
 	const u_char **sa;
 	int sn, si;
@@ -80,7 +82,7 @@ static void r_sort_b(u_char const **, u_char const **, int, int, u_char const *,
 		endch = tab[endch];					\
 		tr = tab;						\
 		if (endch != 0 && endch != 255) {			\
-			/* errno = EINVAL; */				\
+			/* __set_errno(EINVAL); */				\
 			return (-1);					\
 		}							\
 	}								\
@@ -299,7 +301,7 @@ void
 simplesort(u_char const **a, int n, int b, u_char const *tr, u_int endch)	/* insertion sort */
 {
 	u_char ch;
-	u_char const **ak; 
+	u_char const **ak;
 	u_char const **ai;
 	u_char const  *s;
 	u_char const  *t;

src/system/libroot/posix/stdlib/realpath.cpp

@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 
 
@@ -17,7 +18,7 @@ realpath(const char* path, char* resolved)
 {
 	status_t status = _kern_normalize_path(path, true, resolved);
 	if (status != B_OK) {
-		errno = status;
+		__set_errno(status);
 		return NULL;
 	}
 

src/system/libroot/posix/stdlib/strfmon.c

@@ -36,6 +36,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <errno_private.h>
+
 
 /* internal flags */
 #define	NEED_GROUPING		0x01	/* print digits grouped (default) */
@@ -384,11 +386,11 @@ strfmon(char *s, size_t maxsize, const char *format,
 	return dst - s - 1;	/* return size of put data except trailing '\0' */
 
 e2big_error:
-	errno = E2BIG;
+	__set_errno(E2BIG);
 	goto end_error;
 
 format_error:
-	errno = EINVAL;
+	__set_errno(EINVAL);
 
 end_error:
 	sverrno = errno;
@@ -396,7 +398,7 @@ end_error:
 		free(asciivalue);
 	if (currency_symbol != NULL)
 		free(currency_symbol);
-	errno = sverrno;
+	__set_errno(sverrno);
 	va_end(ap);
 	return -1;
 }

src/system/libroot/posix/stdlib/strtod.c

@@ -157,6 +157,8 @@ typedef	u_int32_t ULong;
 #include <errno.h>
 #include <ctype.h>
 
+#include <errno_private.h>
+
 #ifdef Bad_float_h
 #undef __STDC__
 #ifdef IEEE_BIG_ENDIAN
@@ -1306,7 +1308,7 @@ strtod(const char * __restrict s00, char ** __restrict se)
 		if ( (e1 &= ~15) ) {
 			if (e1 > DBL_MAX_10_EXP) {
  ovfl:
-				errno = ERANGE;
+				__set_errno(ERANGE);
 				rv = HUGE_VAL;
 				goto ret;
 			}
@@ -1348,7 +1350,7 @@ strtod(const char * __restrict s00, char ** __restrict se)
 				if (!rv) {
  undfl:
 					rv = 0.;
-					errno = ERANGE;
+					__set_errno(ERANGE);
 					goto ret;
 					}
 				word0(rv) = Tiny0;

src/system/libroot/posix/stdlib/strtol.c

@@ -37,6 +37,8 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#include <errno_private.h>
+
 
 /*
  * Convert a string to a long integer.
@@ -125,10 +127,10 @@ strtol(const char * __restrict nptr, char ** __restrict endptr, int base)
 	}
 	if (any < 0) {
 		acc = neg ? LONG_MIN : LONG_MAX;
-		errno = ERANGE;
+		__set_errno(ERANGE);
 	} else if (!any) {
 noconv:
-		errno = EINVAL;
+		__set_errno(EINVAL);
 	} else if (neg)
 		acc = -acc;
 	if (endptr != NULL)

src/system/libroot/posix/stdlib/strtoll.c

@@ -37,6 +37,8 @@
 #include <ctype.h>
 #include <stdlib.h>
 
+#include <errno_private.h>
+
 
 /*
  * Convert a string to a long long integer.
@@ -126,10 +128,10 @@ strtoll(const char * __restrict nptr, char ** __restrict endptr, int base)
 	}
 	if (any < 0) {
 		acc = neg ? LONGLONG_MIN : LONGLONG_MAX;
-		errno = ERANGE;
+		__set_errno(ERANGE);
 	} else if (!any) {
 noconv:
-		errno = EINVAL;
+		__set_errno(EINVAL);
 	} else if (neg)
 		acc = -acc;
 	if (endptr != NULL)

src/system/libroot/posix/stdlib/strtoq.c

@@ -38,6 +38,9 @@
 //#include <limits.h>
 #include <stdlib.h>
 
+#include <errno_private.h>
+
+
 #define QUAD_MIN   (-0x7fffffffffffffffLL - 1)
 #define QUAD_MAX   0x7fffffffffffffffLL
 /*
@@ -126,7 +129,7 @@ strtoq(nptr, endptr, base)
 			if (acc < cutoff || (acc == cutoff && c > cutlim)) {
 				any = -1;
 				acc = QUAD_MIN;
-				errno = ERANGE;
+				__set_errno(ERANGE);
 			} else {
 				any = 1;
 				acc *= base;
@@ -136,7 +139,7 @@ strtoq(nptr, endptr, base)
 			if (acc > cutoff || (acc == cutoff && c > cutlim)) {
 				any = -1;
 				acc = QUAD_MAX;
-				errno = ERANGE;
+				__set_errno(ERANGE);
 			} else {
 				any = 1;
 				acc *= base;

src/system/libroot/posix/stdlib/strtoul.c

@@ -37,6 +37,8 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#include <errno_private.h>
+
 
 /*
  * Convert a string to an unsigned long integer.
@@ -104,10 +106,10 @@ strtoul(const char * __restrict nptr, char ** __restrict endptr, int base)
 	}
 	if (any < 0) {
 		acc = ULONG_MAX;
-		errno = ERANGE;
+		__set_errno(ERANGE);
 	} else if (!any) {
 noconv:
-		errno = EINVAL;
+		__set_errno(EINVAL);
 	} else if (neg)
 		acc = -acc;
 	if (endptr != NULL)

src/system/libroot/posix/stdlib/strtoull.c

@@ -37,6 +37,8 @@
 #include <ctype.h>
 #include <stdlib.h>
 
+#include <errno_private.h>
+
 
 /*
  * Convert a string to an unsigned long long integer.
@@ -104,10 +106,10 @@ strtoull(const char * __restrict nptr, char ** __restrict endptr, int base)
 	}
 	if (any < 0) {
 		acc = ULONGLONG_MAX;
-		errno = ERANGE;
+		__set_errno(ERANGE);
 	} else if (!any) {
 noconv:
-		errno = EINVAL;
+		__set_errno(EINVAL);
 	} else if (neg)
 		acc = -acc;
 	if (endptr != NULL)

src/system/libroot/posix/stdlib/strtouq.c

@@ -38,6 +38,9 @@
 //#include <limits.h>
 #include <stdlib.h>
 
+#include <errno_private.h>
+
+
 #define UQUAD_MAX 0xffffffffffffffffULL
 /*
  * Convert a string to an unsigned quad integer.
@@ -66,7 +69,7 @@ strtouq(nptr, endptr, base)
 	if (c == '-') {
 		neg = 1;
 		c = *s++;
-	} else { 
+	} else {
 		neg = 0;
 		if (c == '+')
 			c = *s++;
@@ -96,7 +99,7 @@ strtouq(nptr, endptr, base)
 		if (acc > cutoff || (acc == cutoff && c > cutlim)) {
 			any = -1;
 			acc = UQUAD_MAX;
-			errno = ERANGE;
+			__set_errno(ERANGE);
 		} else {
 			any = 1;
 			acc *= (uint64)base;

src/system/libroot/posix/string/Jamfile

@@ -1,6 +1,9 @@
 SubDir HAIKU_TOP src system libroot posix string ;
 
-UsePrivateHeaders [ FDirName libroot locale ] ;
+UsePrivateHeaders 
+	[ FDirName libroot ] 
+	[ FDirName libroot locale ] 
+;
 
 MergeObject posix_string.o :
 	bcmp.c

src/system/libroot/posix/string/strcoll.cpp

@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <string.h>
 
+#include <errno_private.h>
 #include "LocaleBackend.h"
 
 
@@ -21,7 +22,7 @@ strcoll(const char *a, const char *b)
 		status_t status = gLocaleBackend->Strcoll(a, b, result);
 
 		if (status != B_OK)
-			errno = EINVAL;
+			__set_errno(EINVAL);
 
 		return result;
 	}

src/system/libroot/posix/string/strxfrm.cpp

@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <string.h>
 
+#include <errno_private.h>
 #include "LocaleBackend.h"
 
 
@@ -21,7 +22,7 @@ strxfrm(char *out, const char *in, size_t size)
 		status_t status =  gLocaleBackend->Strxfrm(out, in, size, outSize);
 
 		if (status != B_OK)
-			errno = EINVAL;
+			__set_errno(EINVAL);
 
 		return outSize;
 	}

src/system/libroot/posix/sys/chmod.c

@@ -9,6 +9,7 @@
 
 #include <NodeMonitor.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 #include <syscall_utils.h>
 

src/system/libroot/posix/sys/flock.c

@@ -9,6 +9,7 @@
 #include <errno.h>
 #include <pthread.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 
 
@@ -20,7 +21,7 @@ flock(int fd, int op)
 	pthread_testcancel();
 
 	if (status < B_OK) {
-		errno = status;
+		__set_errno(status);
 		return -1;
 	}
 

src/system/libroot/posix/sys/getrusage.c

@@ -8,6 +8,8 @@
 #include <sys/resource.h>
 #include <errno.h>
 
+#include <errno_private.h>
+
 
 int
 getrusage(int who, struct rusage *rusage)
@@ -15,7 +17,7 @@ getrusage(int who, struct rusage *rusage)
 	team_usage_info info;
 
 	if (get_team_usage_info(B_CURRENT_TEAM, who, &info) != B_OK) {
-		errno = B_BAD_VALUE;
+		__set_errno(B_BAD_VALUE);
 		return -1;
 	}
 

src/system/libroot/posix/sys/itimer.cpp

@@ -13,6 +13,7 @@
 
 #include <OS.h>
 
+#include <errno_private.h>
 #include <syscall_utils.h>
 
 #include <user_timer_defs.h>

src/system/libroot/posix/sys/mkdir.c

@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 #include <syscall_utils.h>
 #include <umask.h>

src/system/libroot/posix/sys/mkfifo.c

@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 #include <syscall_utils.h>
 

src/system/libroot/posix/sys/mman.cpp

@@ -12,6 +12,7 @@
 
 #include <OS.h>
 
+#include <errno_private.h>
 #include <syscall_utils.h>
 #include <syscalls.h>
 #include <vm_defs.h>
@@ -90,7 +91,7 @@ mmap(void* address, size_t length, int protection, int flags, int fd,
 {
 	// offset and length must be page-aligned
 	if (length == 0 || offset % B_PAGE_SIZE != 0) {
-		errno = B_BAD_VALUE;
+		__set_errno(B_BAD_VALUE);
 		return MAP_FAILED;
 	}
 
@@ -98,13 +99,13 @@ mmap(void* address, size_t length, int protection, int flags, int fd,
 	if ((flags & MAP_ANONYMOUS) != 0) {
 		fd = -1;
 	} else if (fd < 0) {
-		errno = EBADF;
+		__set_errno(EBADF);
 		return MAP_FAILED;
 	}
 
 	// either MAP_SHARED or MAP_PRIVATE must be specified
 	if (((flags & MAP_SHARED) != 0) == ((flags & MAP_PRIVATE) != 0)) {
-		errno = B_BAD_VALUE;
+		__set_errno(B_BAD_VALUE);
 		return MAP_FAILED;
 	}
 
@@ -128,7 +129,7 @@ mmap(void* address, size_t length, int protection, int flags, int fd,
 	area_id area = _kern_map_file("mmap area", &address, addressSpec,
 		length, areaProtection, mapping, true, fd, offset);
 	if (area < 0) {
-		errno = area;
+		__set_errno(area);
 		return MAP_FAILED;
 	}
 

src/system/libroot/posix/sys/rlimit.c

@@ -8,10 +8,12 @@
 #include <syscalls.h>
 #include <errno.h>
 
+#include <errno_private.h>
+
 
 #define RETURN_AND_SET_ERRNO(err) \
 	if (err < 0) { \
-		errno = err; \
+		__set_errno(err); \
 		return -1; \
 	} \
 	return err;

src/system/libroot/posix/sys/select.c

@@ -12,6 +12,7 @@
 
 #include <syscall_utils.h>
 
+#include <errno_private.h>
 #include <symbol_versioning.h>
 #include <syscalls.h>
 

src/system/libroot/posix/sys/stat.c

@@ -10,6 +10,7 @@
 
 #include <compat/sys/stat.h>
 
+#include <errno_private.h>
 #include <syscalls.h>
 #include <symbol_versioning.h>
 #include <syscall_utils.h>

src/system/libroot/posix/sys/times.cpp

@@ -12,6 +12,7 @@
 
 #include <symbol_versioning.h>
 
+#include <errno_private.h>
 #include <time_private.h>
 #include <times_private.h>
 
@@ -24,7 +25,7 @@ times_common(struct tms* buffer, bigtime_t microSecondsPerClock)
 
 	if ((err = get_team_usage_info(B_CURRENT_TEAM, RUSAGE_SELF, &info))
 			!= B_OK) {
-		errno = err;
+		__set_errno(err);
 		return -1;
 	}
 
@@ -33,7 +34,7 @@ times_common(struct tms* buffer, bigtime_t microSecondsPerClock)
 
 	if ((err = get_team_usage_info(B_CURRENT_TEAM, RUSAGE_CHILDREN, &info))
 			!= B_OK) {
-		errno = err;
+		__set_errno(err);
 		return -1;
 	}
 

src/system/libroot/posix/sys/uio.c

@@ -9,10 +9,12 @@
 #include <sys/uio.h>
 #include <errno.h>
 
+#include <errno_private.h>
+
 
 #define RETURN_AND_SET_ERRNO(err) \
 	if (err < 0) { \
-		errno = err; \
+		__set_errno(err); \
 		return -1; \
 	} \
 	return err;
@@ -32,7 +34,7 @@ readv_pos(int fd, off_t pos, const struct iovec *vecs, size_t count)
 {
 	ssize_t bytes;
 	if (pos < 0) {
-		errno = B_BAD_VALUE;
+		__set_errno(B_BAD_VALUE);
 		return -1;
 	}
 	bytes = _kern_readv(fd, pos, vecs, count);
@@ -55,7 +57,7 @@ writev_pos(int fd, off_t pos, const struct iovec *vecs, size_t count)
 {
 	ssize_t bytes;
 	if (pos < 0) {
-		errno = B_BAD_VALUE;
+		__set_errno(B_BAD_VALUE);
 		return -1;
 	}
 	bytes = _kern_writev(fd, pos, vecs, count);