Mercurial > vanilla
annotate core/lvm2/musl.patch @ 460:b43b5c35f273
vanilla: turn off gtk-update-icon-cache output
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sat, 06 Apr 2019 09:37:16 +0200 |
parents | 11b453a08c70 |
children |
rev | line source |
---|---|
98
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
1 --- libdaemon/server/daemon-server.c 2014-11-29 00:07:42.000000000 +0100 |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
2 +++ libdaemon/server/daemon-server.c 2014-12-28 08:22:40.985928408 +0100 |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
3 @@ -14,6 +14,7 @@ |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
4 #include "daemon-server.h" |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
5 #include "daemon-log.h" |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
6 |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
7 +#include <fcntl.h> |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
8 #include <dlfcn.h> |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
9 #include <errno.h> |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
10 #include <pthread.h> |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
11 |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
12 --- lib/mm/memlock.c.orig 2016-06-07 08:00:46.557058318 +0200 |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
13 +++ lib/mm/memlock.c 2016-06-07 08:01:25.453505793 +0200 |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
14 @@ -150,7 +150,7 @@ static void _touch_memory(void *mem, siz |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
15 |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
16 static void _allocate_memory(void) |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
17 { |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
18 -#ifndef VALGRIND_POOL |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
19 +#if !defined(VALGRIND_POOL) && defined(__GLIBC__) |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
20 void *stack_mem; |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
21 struct rlimit limit; |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
22 int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
23 --- tools/lvmcmdline.c |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
24 +++ tools/lvmcmdline.c |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
25 @@ -1252,7 +1252,7 @@ |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
26 int err = is_valid_fd(STDERR_FILENO); |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
27 |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
28 if (!is_valid_fd(STDIN_FILENO) && |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
29 - !(stdin = fopen(_PATH_DEVNULL, "r"))) { |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
30 + !freopen(_PATH_DEVNULL, "r", stdin)) { |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
31 if (err) |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
32 perror("stdin stream open"); |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
33 else |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
34 @@ -1262,7 +1262,7 @@ |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
35 } |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
36 |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
37 if (!is_valid_fd(STDOUT_FILENO) && |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
38 - !(stdout = fopen(_PATH_DEVNULL, "w"))) { |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
39 + !freopen(_PATH_DEVNULL, "w", stdout)) { |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
40 if (err) |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
41 perror("stdout stream open"); |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
42 /* else no stdout */ |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
43 @@ -1270,7 +1270,7 @@ |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
44 } |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
45 |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
46 if (!is_valid_fd(STDERR_FILENO) && |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
47 - !(stderr = fopen(_PATH_DEVNULL, "w"))) { |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
48 + !freopen(_PATH_DEVNULL, "w", stderr)) { |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
49 printf("stderr stream open: %s\n", |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
50 strerror(errno)); |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
51 return 0; |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
52 --- lib/commands/toolcontext.c.orig |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
53 +++ lib/commands/toolcontext.c |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
54 @@ -1860,7 +1860,7 @@ |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
55 /* FIXME Make this configurable? */ |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
56 reset_lvm_errno(1); |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
57 |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
58 -#ifndef VALGRIND_POOL |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
59 +#if !defined(VALGRIND_POOL) && defined(__GLIBC__) |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
60 /* Set in/out stream buffering before glibc */ |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
61 if (set_buffering) { |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
62 /* Allocate 2 buffers */ |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
63 @@ -2241,7 +2241,7 @@ |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
64 if (cmd->libmem) |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
65 dm_pool_destroy(cmd->libmem); |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
66 |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
67 -#ifndef VALGRIND_POOL |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
68 +#if !defined(VALGRIND_POOL) && defined(__GLIBC__) |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
69 if (cmd->linebuffer) { |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
70 /* Reset stream buffering to defaults */ |
11b453a08c70
core/lvm2: initial import, closes #1034
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
71 if (is_valid_fd(STDIN_FILENO) && |