]>
Commit | Line | Data |
---|---|---|
fe95eee9 AM |
1 | --- util-linux-ng-2.18/libmount/src/fs.c~ 2010-06-08 10:44:20.000000000 +0200 |
2 | +++ util-linux-ng-2.18/libmount/src/fs.c 2010-08-26 11:12:31.326572794 +0200 | |
f212f39a | 3 | @@ -17,6 +17,9 @@ |
4 | #include <errno.h> | |
5 | #include <blkid.h> | |
6 | #include <stddef.h> | |
7 | +#ifdef __dietlibc__ | |
8 | +#include <sys/stat.h> /* for major and minor macros */ | |
9 | +#endif | |
10 | ||
11 | #include "nls.h" | |
12 | #include "mountP.h" | |
fe95eee9 AM |
13 | --- util-linux-ng-2.18/libmount/src/tab_parse.c~ 2010-06-07 12:35:06.000000000 +0200 |
14 | +++ util-linux-ng-2.18/libmount/src/tab_parse.c 2010-08-26 11:16:35.762572782 +0200 | |
f212f39a | 15 | @@ -9,6 +9,9 @@ |
fe95eee9 | 16 | #include <limits.h> |
f212f39a | 17 | #include <dirent.h> |
18 | #include <fcntl.h> | |
f212f39a | 19 | +#ifdef __dietlibc__ |
20 | +#include <sys/stat.h> /* for makedev macro */ | |
21 | +#endif | |
22 | ||
fe95eee9 | 23 | #include "at.h" |
f212f39a | 24 | #include "mangle.h" |
f212f39a | 25 | --- util-linux-2.19/lib/strutils.c~ 2011-01-31 16:43:47.000000000 +0100 |
26 | +++ util-linux-2.19/lib/strutils.c 2011-02-10 12:49:12.221843465 +0100 | |
27 | @@ -12,6 +12,9 @@ | |
28 | #include <sys/stat.h> | |
29 | #include <locale.h> | |
30 | #include <string.h> | |
31 | +#ifdef __dietlibc__ | |
32 | +#include <stdint.h> | |
33 | +#endif | |
34 | ||
35 | static int do_scale_by_power (uintmax_t *x, int base, int power) | |
36 | { | |
fe95eee9 AM |
37 | --- util-linux-2.19/libmount/src/utils.c~ 2011-01-24 23:46:29.000000000 +0100 |
38 | +++ util-linux-2.19/libmount/src/utils.c 2011-02-10 20:12:00.499611392 +0100 | |
f212f39a | 39 | @@ -398,7 +398,11 @@ |
40 | int rc = -1; | |
41 | struct passwd pwd; | |
42 | struct passwd *pw; | |
43 | +#ifdef _SC_GETPW_R_SIZE_MAX | |
44 | size_t sz = sysconf(_SC_GETPW_R_SIZE_MAX); | |
45 | +#else | |
46 | + size_t sz = 0; | |
47 | +#endif | |
48 | char *buf; | |
49 | ||
50 | if (!username || !uid) | |
51 | @@ -427,7 +431,11 @@ | |
52 | int rc = -1; | |
53 | struct group grp; | |
54 | struct group *gr; | |
55 | +#ifdef _SC_GETGR_R_SIZE_MAX | |
56 | size_t sz = sysconf(_SC_GETGR_R_SIZE_MAX); | |
57 | +#else | |
58 | + size_t sz = 0; | |
59 | +#endif | |
60 | char *buf; | |
61 | ||
62 | if (!groupname || !gid) | |
f212f39a | 63 | --- util-linux-2.19/lib/at.c~ 2011-01-31 16:43:47.000000000 +0100 |
64 | +++ util-linux-2.19/lib/at.c 2011-02-10 20:30:37.336797058 +0100 | |
65 | @@ -7,6 +7,7 @@ | |
66 | #include <stdlib.h> | |
67 | #include <fcntl.h> | |
68 | #include <sys/stat.h> | |
69 | +#include <limits.h> | |
70 | ||
71 | #include "at.h" | |
72 | ||
f212f39a | 73 | --- util-linux-2.19/misc-utils/findmnt.c~ 2011-01-31 16:43:47.000000000 +0100 |
74 | +++ util-linux-2.19/misc-utils/findmnt.c 2011-02-10 20:54:23.100130391 +0100 | |
75 | @@ -30,6 +30,9 @@ | |
f212f39a | 76 | #endif |
77 | #include <assert.h> | |
fe95eee9 | 78 | #include <poll.h> |
f212f39a | 79 | +#ifdef __dietlibc__ |
80 | +#include <sys/stat.h> /* for major and minor macros */ | |
81 | +#endif | |
82 | ||
f212f39a | 83 | #include <libmount.h> |
fe95eee9 | 84 | |
f212f39a | 85 | --- util-linux-2.19/fsck/fsck.c~ 2011-02-07 16:19:29.000000000 +0100 |
86 | +++ util-linux-2.19/fsck/fsck.c 2011-02-10 21:09:27.024658725 +0100 | |
87 | @@ -270,7 +270,13 @@ | |
88 | if (verbose) | |
89 | printf(_("Locking disk %s ... "), diskname); | |
90 | ||
91 | - inst->lock = open(diskname, O_CLOEXEC | O_RDONLY); | |
92 | + inst->lock = open(diskname, | |
93 | +#ifdef O_CLOEXEC | |
94 | + O_CLOEXEC | O_RDONLY | |
95 | +#else | |
96 | + O_RDONLY | |
97 | +#endif | |
98 | + ); | |
99 | if (inst->lock >= 0) { | |
100 | int rc = -1; | |
101 | ||
102 | --- util-linux-2.19/configure.ac~ 2011-02-10 21:28:23.395401725 +0100 | |
103 | +++ util-linux-2.19/configure.ac 2011-02-10 22:12:29.997898392 +0100 | |
104 | @@ -188,6 +188,8 @@ | |
105 | lchown \ | |
106 | llseek \ | |
107 | lseek64 \ | |
108 | + mkostemp \ | |
109 | + versionsort \ | |
110 | strtoull \ | |
111 | sysconf \ | |
112 | getdtablesize \ | |
113 | --- util-linux-2.19/misc-utils/findfs.c~ 2011-01-31 16:43:47.000000000 +0100 | |
114 | +++ util-linux-2.19/misc-utils/findfs.c 2011-02-10 22:24:39.615735924 +0100 | |
115 | @@ -12,6 +12,7 @@ | |
116 | ||
117 | #include <blkid.h> | |
118 | ||
119 | +#include "c.h" | |
120 | #include "nls.h" | |
121 | ||
122 | static void __attribute__((__noreturn__)) usage(int rc) | |
fe95eee9 AM |
123 | --- util-linux-2.19/term-utils/scriptreplay.c~ 2011-01-31 16:43:47.000000000 +0100 |
124 | +++ util-linux-2.19/term-utils/scriptreplay.c 2011-02-10 22:26:22.019069258 +0100 | |
f212f39a | 125 | @@ -28,6 +28,7 @@ |
126 | #include <unistd.h> | |
127 | #include <err.h> | |
128 | ||
129 | +#include "c.h" | |
130 | #include "nls.h" | |
131 | ||
132 | #define SCRIPT_MIN_DELAY 0.0001 /* from original sripreplay.pl */ | |
fe95eee9 AM |
133 | --- util-linux-2.19/libmount/src/tab_parse.c~ 2011-02-10 23:28:02.091461025 +0100 |
134 | +++ util-linux-2.19/libmount/src/tab_parse.c 2011-02-10 23:29:04.934794359 +0100 | |
f212f39a | 135 | @@ -422,7 +422,13 @@ |
136 | ||
137 | /* TODO: it would be nice to have a scandir() implementaion that | |
138 | * is able to use already opened directory */ | |
139 | - n = scandir(dirname, &namelist, NULL, versionsort); | |
140 | + n = scandir(dirname, &namelist, NULL, | |
141 | +#ifdef HAVE_VERSIONSORT | |
142 | + versionsort | |
143 | +#else | |
144 | + alphasort | |
145 | +#endif | |
146 | + ); | |
147 | if (n <= 0) | |
148 | return 0; | |
149 |