1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
Index: util-vserver-0.30.210/lib_internal/sys_clone.h
===================================================================
--- util-vserver-0.30.210.orig/lib_internal/sys_clone.h
+++ util-vserver-0.30.210/lib_internal/sys_clone.h
@@ -19,33 +19,54 @@
#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
-#ifdef ENSC_SYSCALL_TRADITIONAL
-#include <unistd.h>
+#ifndef ENSC_SYSCALL_TRADITIONAL
+# include <errno.h>
+# if defined(__s390__)
inline static UNUSED ALWAYSINLINE
-int sys_clone(int flags, void *stack)
+_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 *child_stack)
{
-#if defined __dietlibc__
+ int ret;
+#ifdef __sparc__
+ int parent = getpid();
+#endif
+#if defined(__dietlibc__) && defined(ENSC_SYSCALL_TRADITIONAL)
extern long int syscall (long int __sysno, ...);
#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
|
GitWeb
