merge with 0.30.213

[util-vserver.git] / lib_internal / sys_clone.h

diff --git a/lib_internal/sys_clone.h b/lib_internal/sys_clone.h
index e31b8da..59066e6 100644 (file)
--- a/lib_internal/sys_clone.h
+++ b/lib_internal/sys_clone.h
@@ -1,4 +1,4 @@
-// $Id: sys_clone.h,v 1.3 2005/04/28 18:01:37 ensc Exp $    --*- c -*--
+// $Id: sys_clone.h 2446 2007-01-09 13:22:11Z dhozac $    --*- c -*--
 
 // Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 //  
@@ -19,33 +19,47 @@
 #ifndef H_UTIL_VSERVER_SRC_SYS_CLONE_H
 #define H_UTIL_VSERVER_SRC_SYS_CLONE_H
 
+#include <unistd.h>
 #include "lib/syscall-wrap.h"
-#define __NR_sys_clone         __NR_clone
+#define __NR__sys_clone                __NR_clone
 
-#ifndef CLONE_NEWNS
-#  define CLONE_NEWNS 0x00020000
-#endif
+#ifndef ENSC_SYSCALL_TRADITIONAL
+#  include <errno.h>
 
-#ifdef ENSC_SYSCALL_TRADITIONAL
-#include <unistd.h>
+#  if defined(__s390__)
+inline static UNUSED ALWAYSINLINE
+_syscall2(int, _sys_clone, void *, child_stack, int, flags)
+#  else
+inline static UNUSED ALWAYSINLINE
+_syscall2(int, _sys_clone, int, flags, void *, child_stack)
+#  endif
+#endif
 
 inline static UNUSED ALWAYSINLINE
-int sys_clone(int flags, void *stack)
+int sys_clone(int flags, void *child_stack)
 {
-#if defined __dietlibc__
-  extern long int syscall (long int __sysno, ...);
+  int ret;
+#ifdef __sparc__
+  int parent = getpid();
 #endif
- 
-  return syscall(__NR_sys_clone, flags, stack);
-}
-#else
-#include <errno.h>
 
-inline static UNUSED ALWAYSINLINE
-_syscall2(int, sys_clone, int, flags, void *, child_stack)
+#if   defined(__s390__) && defined(ENSC_SYSCALL_TRADITIONAL)
+  ret = syscall(__NR__sys_clone, child_stack, flags);
+#elif defined(__s390__)
+  ret = _sys_clone(child_stack, flags);
+#elif defined(ENSC_SYSCALL_TRADITIONAL)
+  ret = syscall(__NR__sys_clone, flags, child_stack);
+#else
+  ret = _sys_clone(flags, child_stack);
+#endif
+#ifdef __sparc__
+  if (ret == parent)
+    ret = 0;
 #endif
+  return ret;
+}
 
-#undef __NR_sys_clone
+#undef __NR__sys_clone
 
 #define ENSC_HAVE_SYSCLONE             1