summaryrefslogtreecommitdiff
path: root/recipes/uclibc/uclibc-0.9.30.1/o_cloexec.patch
blob: 021ca95d831148b7ca04c3c88eb5786ba82330b3 (plain)
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
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
From b8f1f91cc6d7b579fdb2370ab046565f9930aa09 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 08 Oct 2009 02:51:55 +0000
Subject: clean up O_CLOEXEC handling

Drop the "#ifndef O_CLOEXEC" cruft, enable O_CLOEXEC in most fcntl.h
headers, and import __ASSUME_O_CLOEXEC from glibc.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
Index: uClibc-0.9.30.1/libc/pwd_grp/lckpwdf.c
===================================================================
--- uClibc-0.9.30.1.orig/libc/pwd_grp/lckpwdf.c	2008-05-20 00:57:34.000000000 +0200
+++ uClibc-0.9.30.1/libc/pwd_grp/lckpwdf.c	2009-11-26 13:44:11.935757716 +0100
@@ -75,7 +75,7 @@
   /* Prevent problems caused by multiple threads.  */
   __UCLIBC_MUTEX_LOCK(mylock);
 
-  lock_fd = open (_PATH_PASSWD, O_WRONLY);
+  lock_fd = open (_PATH_PASSWD, O_WRONLY | O_CLOEXEC);
   if (lock_fd == -1) {
     /* Cannot create lock file.  */
 	goto DONE;
@@ -97,6 +97,12 @@
 	goto DONE;
   }
 
+#ifndef __ASSUME_O_CLOEXEC
+    /* Make sure file gets correctly closed when process finished.  */
+   fcntl (lock_fd, F_SETFD, FD_CLOEXEC);
+#endif
+
+
   /* Now we have to get exclusive write access.  Since multiple
      process could try this we won't stop when it first fails.
      Instead we set a timeout for the system call.  Once the timer
Index: uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/alpha/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/alpha/bits/fcntl.h	2009-11-26 13:35:06.744980002 +0100
@@ -50,9 +50,7 @@
 # define O_NOFOLLOW	0200000	/* Do not follow links.  */
 # define O_DIRECT	02000000 /* Direct disk access.  */
 # define O_NOATIME	04000000 /* Do not set atime.  */
-# if 0
 # define O_CLOEXEC      010000000 /* Set close_on_exec.  */
-# endif
 #endif
 
 #ifdef __USE_LARGEFILE64
Index: uClibc-0.9.30.1/libc/sysdeps/linux/arm/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/arm/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/arm/bits/fcntl.h	2009-11-26 13:35:06.744980002 +0100
@@ -50,9 +50,7 @@
 # define O_NOFOLLOW	0100000	/* Do not follow links.	 */
 # define O_DIRECT	0200000	/* Direct disk access.	*/
 # define O_NOATIME     01000000 /* Do not set atime.  */
-# if 0
 # define O_CLOEXEC     02000000 /* Set close_on_exec.  */
-# endif
 #endif
 
 /* For now Linux has synchronisity options for data and read operations.
Index: uClibc-0.9.30.1/libc/sysdeps/linux/avr32/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/avr32/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/avr32/bits/fcntl.h	2009-11-26 13:35:06.748316654 +0100
@@ -30,6 +30,7 @@
 # define O_DIRECTORY	00200000	/* direct disk access */
 # define O_NOFOLLOW	00400000	/* don't follow links */
 # define O_NOATIME	01000000	/* don't set atime */
+# define O_CLOEXEC	02000000	/* set close_on_exec */
 #endif
 
 #ifdef __USE_LARGEFILE64
Index: uClibc-0.9.30.1/libc/sysdeps/linux/bfin/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/bfin/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/bfin/bits/fcntl.h	2009-11-26 13:37:03.357878847 +0100
@@ -49,6 +49,8 @@
 # define O_NOFOLLOW	0100000	/* Do not follow links.	 */
 # define O_DIRECT	0200000	/* Direct disk access.	*/
 # define O_STREAMING	04000000/* streaming access */
+# define O_NOATIME	01000000/* don't set atime */
+# define O_CLOEXEC	02000000/* set close_on_exec *
 #endif
 
 /* For now Linux has synchronisity options for data and read operations.
Index: uClibc-0.9.30.1/libc/sysdeps/linux/cris/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/cris/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/cris/bits/fcntl.h	2009-11-26 13:35:06.748316654 +0100
@@ -50,6 +50,7 @@
 # define O_DIRECTORY	0200000	/* Must be a directory.	 */
 # define O_NOFOLLOW	0400000	/* Do not follow links.	 */
 # define O_NOATIME	01000000 /* Do not set atime.  */
+# define O_CLOEXEC	02000000 /* set close_on_exec */
 #endif
 
 /* For now Linux has synchronisity options for data and read operations.
Index: uClibc-0.9.30.1/libc/sysdeps/linux/frv/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/frv/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/frv/bits/fcntl.h	2009-11-26 13:38:32.785785660 +0100
@@ -46,6 +46,8 @@
 # define O_DIRECTORY	0200000	/* Must be a directory.  */
 # define O_NOFOLLOW	0400000	/* Do not follow links.  */
 # define O_STREAMING	04000000/* streaming access */
+# define O_NOATIME	01000000/* don't set atime */
+# define O_CLOEXEC	02000000/* set close_on_exec */
 #endif
 
 /* For now Linux has synchronisity options for data and read operations.
Index: uClibc-0.9.30.1/libc/sysdeps/linux/hppa/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/hppa/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/hppa/bits/fcntl.h	2009-11-26 13:35:06.748316654 +0100
@@ -50,6 +50,7 @@
 # define O_DIRECTORY	00010000 /* Must be a directory. */
 # define O_NOFOLLOW	00000200 /* Do not follow links. */
 # define O_NOATIME	04000000 /* Do not set atime. */
+# define O_CLOEXEC	010000000 /* set close_on_exec */
 #endif
 
 #ifdef __USE_LARGEFILE64
Index: uClibc-0.9.30.1/libc/sysdeps/linux/i386/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/i386/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/i386/bits/fcntl.h	2009-11-26 13:35:06.748316654 +0100
@@ -50,9 +50,7 @@
 # define O_DIRECTORY	0200000	/* Must be a directory.	 */
 # define O_NOFOLLOW	0400000	/* Do not follow links.	 */
 # define O_NOATIME     01000000 /* Do not set atime.  */
-# if 0
 # define O_CLOEXEC     02000000 /* Set close_on_exec.  */
-# endif
 #endif
 
 /* For now Linux has synchronisity options for data and read operations.
Index: uClibc-0.9.30.1/libc/sysdeps/linux/ia64/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/ia64/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/ia64/bits/fcntl.h	2009-11-26 13:35:06.748316654 +0100
@@ -49,9 +49,7 @@
 # define O_DIRECTORY	0200000	/* must be a directory */
 # define O_NOFOLLOW	0400000 /* don't follow links */
 # define O_NOATIME	01000000 /* Do not set atime.  */
-# if 0
 # define O_CLOEXEC	02000000 /* Set close_on_exec.  */
-# endif
 #endif
 
 #ifdef __USE_LARGEFILE64
Index: uClibc-0.9.30.1/libc/sysdeps/linux/m68k/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/m68k/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/m68k/bits/fcntl.h	2009-11-26 13:35:06.748316654 +0100
@@ -49,6 +49,7 @@
 # define O_NOFOLLOW	0100000	/* Do not follow links.	 */
 # define O_DIRECT	0200000	/* Direct disk access.	*/
 # define O_NOATIME	01000000 /* Do not set atime.  */
+# define O_CLOEXEC	02000000 /* set close_on_exec */
 #endif
 
 /* For now Linux has synchronisity options for data and read operations.
Index: uClibc-0.9.30.1/libc/sysdeps/linux/microblaze/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/microblaze/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/microblaze/bits/fcntl.h	2009-11-26 13:39:20.148703335 +0100
@@ -46,6 +46,8 @@
 # define O_NOFOLLOW	0100000	/* Do not follow links.	 */
 # define O_DIRECT	0200000	/* Direct disk access.	*/
 # define O_STREAMING	04000000/* streaming access */
+# define O_NOATIME	01000000/* Do not set atime.  */
+# define O_CLOEXEC	02000000/* set close_on_exec */
 #endif
 
 /* For now Linux has synchronisity options for data and read operations.
Index: uClibc-0.9.30.1/libc/sysdeps/linux/mips/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/mips/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/mips/bits/fcntl.h	2009-11-26 13:35:06.748316654 +0100
@@ -51,6 +51,7 @@
 # define O_DIRECT	0x8000	/* Direct disk access hint.  */
 # define O_DIRECTORY	0x10000	/* Must be a directory.	 */
 # define O_NOATIME	0x40000	/* Do not set atime.  */
+# define O_CLOEXEC	02000000 /* set close_on_exec */
 #endif
 
 /* For now Linux has no synchronisity options for data and read operations.
Index: uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/powerpc/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/powerpc/bits/fcntl.h	2009-11-26 13:35:06.748316654 +0100
@@ -50,9 +50,7 @@
 # define O_DIRECTORY	 040000	/* Must be a directory.	 */
 # define O_NOFOLLOW	0100000	/* Do not follow links.	 */
 # define O_NOATIME	01000000 /* Do not set atime.  */
-# if 0
 # define O_CLOEXEC	02000000 /* Set close_on_exec.  */
-# endif
 #endif
 
 #ifdef __USE_LARGEFILE64
Index: uClibc-0.9.30.1/libc/sysdeps/linux/sh/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/sh/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/sh/bits/fcntl.h	2009-11-26 13:35:06.748316654 +0100
@@ -50,9 +50,7 @@
 # define O_DIRECTORY	0200000	/* Must be a directory.	 */
 # define O_NOFOLLOW	0400000	/* Do not follow links.	 */
 # define O_NOATIME     01000000 /* Do not set atime.  */
-# if 0
 # define O_CLOEXEC     02000000 /* Set close_on_exec.  */
-# endif
 #endif
 
 /* For now Linux has synchronisity options for data and read operations.
Index: uClibc-0.9.30.1/libc/sysdeps/linux/sh64/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/sh64/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/sh64/bits/fcntl.h	2009-11-26 13:37:47.554540700 +0100
@@ -46,6 +46,8 @@
 # define O_DIRECTORY	0200000	/* Must be a directory.  */
 # define O_NOFOLLOW	0400000	/* Do not follow links.  */
 # define O_STREAMING	04000000/* streaming access */
+# define O_NOATIME	01000000/* Do not set atime.  */
+# define O_CLOEXEC	02000000/* set close_on_exec */
 #endif
 
 /* For now Linux has synchronisity options for data and read operations.
Index: uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/sparc/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/sparc/bits/fcntl.h	2009-11-26 13:35:06.751656343 +0100
@@ -49,9 +49,7 @@
 # define O_NOFOLLOW	0x20000 /* don't follow links */
 # define O_DIRECT	0x100000 /* direct disk access hint */
 # define O_NOATIME	0x200000 /* Do not set atime.  */
-# if 0
 # define O_CLOEXEC	0x400000 /* Set close_on_exit.  */
-# endif
 #endif
 
 #ifdef __USE_LARGEFILE64
Index: uClibc-0.9.30.1/libc/sysdeps/linux/x86_64/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/x86_64/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/x86_64/bits/fcntl.h	2009-11-26 13:35:06.751656343 +0100
@@ -50,9 +50,7 @@
 # define O_DIRECTORY	0200000	/* Must be a directory.	 */
 # define O_NOFOLLOW	0400000	/* Do not follow links.	 */
 # define O_NOATIME     01000000 /* Do not set atime.  */
-# if 0
 # define O_CLOEXEC     02000000 /* Set close_on_exec.  */
-# endif
 #endif
 
 /* For now Linux has synchronisity options for data and read operations.
Index: uClibc-0.9.30.1/libc/sysdeps/linux/xtensa/bits/fcntl.h
===================================================================
--- uClibc-0.9.30.1.orig/libc/sysdeps/linux/xtensa/bits/fcntl.h	2008-11-15 16:55:31.000000000 +0100
+++ uClibc-0.9.30.1/libc/sysdeps/linux/xtensa/bits/fcntl.h	2009-11-26 13:35:06.751656343 +0100
@@ -50,6 +50,7 @@
 # define O_DIRECTORY	0200000	/* Must be a directory.	 */
 # define O_NOFOLLOW	0400000	/* Do not follow links.	 */
 # define O_NOATIME     01000000 /* Do not set atime.  */
+# define O_CLOEXEC     02000000 /* set close_on_exec */
 #endif
 
 /* For now Linux has synchronisity options for data and read operations.