]> git.pld-linux.org Git - packages/util-linux.git/blame - util-linux-diet.patch
projects / packages / util-linux.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- tab
[packages/util-linux.git] / util-linux-diet.patch
CommitLineData
f212f39a 1--- util-linux-ng-2.18/shlibs/mount/src/fs.c~ 2010-06-08 10:44:20.000000000 +0200
2+++ util-linux-ng-2.18/shlibs/mount/src/fs.c 2010-08-26 11:12:31.326572794 +0200
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"
13--- util-linux-ng-2.18/shlibs/mount/src/tab_parse.c~ 2010-06-07 12:35:06.000000000 +0200
14+++ util-linux-ng-2.18/shlibs/mount/src/tab_parse.c 2010-08-26 11:16:35.762572782 +0200
15@@ -9,6 +9,9 @@
16 #include <dirent.h>
17 #include <fcntl.h>
18 #include <unistd.h>
19+#ifdef __dietlibc__
20+#include <sys/stat.h> /* for makedev macro */
21+#endif
22
23 #include "nls.h"
24 #include "mangle.h"
25--- util-linux-ng-2.18/lib/tt.c~ 2010-06-07 11:44:06.000000000 +0200
26+++ util-linux-ng-2.18/lib/tt.c 2010-08-26 11:32:34.886572774 +0200
27@@ -54,7 +54,7 @@
28 };
29
30 #else /* !HAVE_WIDECHAR */
31-# define mbs_width strlen(_s)
32+# define mbs_width(_s) strlen(_s)
33 #endif /* !HAVE_WIDECHAR */
34
35 #define is_last_column(_tb, _cl) \
36--- util-linux-2.19/lib/strutils.c~ 2011-01-31 16:43:47.000000000 +0100
37+++ util-linux-2.19/lib/strutils.c 2011-02-10 12:49:12.221843465 +0100
38@@ -12,6 +12,9 @@
39 #include <sys/stat.h>
40 #include <locale.h>
41 #include <string.h>
42+#ifdef __dietlibc__
43+#include <stdint.h>
44+#endif
45
46 static int do_scale_by_power (uintmax_t *x, int base, int power)
47 {
48--- util-linux-2.19/shlibs/mount/src/utils.c~ 2011-01-24 23:46:29.000000000 +0100
49+++ util-linux-2.19/shlibs/mount/src/utils.c 2011-02-10 20:12:00.499611392 +0100
50@@ -398,7 +398,11 @@
51 int rc = -1;
52 struct passwd pwd;
53 struct passwd *pw;
54+#ifdef _SC_GETPW_R_SIZE_MAX
55 size_t sz = sysconf(_SC_GETPW_R_SIZE_MAX);
56+#else
57+ size_t sz = 0;
58+#endif
59 char *buf;
60
61 if (!username || !uid)
62@@ -427,7 +431,11 @@
63 int rc = -1;
64 struct group grp;
65 struct group *gr;
66+#ifdef _SC_GETGR_R_SIZE_MAX
67 size_t sz = sysconf(_SC_GETGR_R_SIZE_MAX);
68+#else
69+ size_t sz = 0;
70+#endif
71 char *buf;
72
73 if (!groupname || !gid)
74--- util-linux-2.19/shlibs/mount/src/tab_update.c~ 2011-02-09 14:23:48.000000000 +0100
75+++ util-linux-2.19/shlibs/mount/src/tab_update.c 2011-02-10 20:26:15.846797059 +0100
a0c4f612
AM		 76@@ -653,7 +653,12 @@
77 sigfillset(&sigs);
78 sigprocmask(SIG_BLOCK, &sigs, &upd->oldsigmask);
f212f39a 79
a0c4f612
AM		 80- upd->utab_lock = open(lfile, O_RDONLY|O_CREAT|O_CLOEXEC, S_IWUSR|
81+ upd->utab_lock = open(lfile, O_RDONLY|
f212f39a 82+#ifdef O_CLOEXEC
a0c4f612 83+ O_CLOEXEC|
f212f39a 84+#endif
a0c4f612
AM		 85+ O_CREAT,
86+ S_IWUSR|
87 S_IRUSR|S_IRGRP|S_IROTH);
f212f39a 88 free(lfile);
89
f212f39a 90--- util-linux-2.19/lib/at.c~ 2011-01-31 16:43:47.000000000 +0100
91+++ util-linux-2.19/lib/at.c 2011-02-10 20:30:37.336797058 +0100
92@@ -7,6 +7,7 @@
93 #include <stdlib.h>
94 #include <fcntl.h>
95 #include <sys/stat.h>
96+#include <limits.h>
97
98 #include "at.h"
99
f212f39a 100--- util-linux-2.19/misc-utils/findmnt.c~ 2011-01-31 16:43:47.000000000 +0100
101+++ util-linux-2.19/misc-utils/findmnt.c 2011-02-10 20:54:23.100130391 +0100
102@@ -30,6 +30,9 @@
103 #include <sys/ioctl.h>
104 #endif
105 #include <assert.h>
106+#ifdef __dietlibc__
107+#include <sys/stat.h> /* for major and minor macros */
108+#endif
109
110 #define USE_UNSTABLE_LIBMOUNT_API
111 #include <libmount.h>
112--- util-linux-2.19/fsck/fsck.c~ 2011-02-07 16:19:29.000000000 +0100
113+++ util-linux-2.19/fsck/fsck.c 2011-02-10 21:09:27.024658725 +0100
114@@ -270,7 +270,13 @@
115 if (verbose)
116 printf(_("Locking disk %s ... "), diskname);
117
118- inst->lock = open(diskname, O_CLOEXEC | O_RDONLY);
119+ inst->lock = open(diskname,
120+#ifdef O_CLOEXEC
121+ O_CLOEXEC | O_RDONLY
122+#else
123+ O_RDONLY
124+#endif
125+ );
126 if (inst->lock >= 0) {
127 int rc = -1;
128
129--- util-linux-2.19/configure.ac~ 2011-02-10 21:28:23.395401725 +0100
130+++ util-linux-2.19/configure.ac 2011-02-10 22:12:29.997898392 +0100
131@@ -188,6 +188,8 @@
132 lchown \
133 llseek \
134 lseek64 \
135+ mkostemp \
136+ versionsort \
137 strtoull \
138 sysconf \
139 getdtablesize \
140--- util-linux-2.19/misc-utils/findfs.c~ 2011-01-31 16:43:47.000000000 +0100
141+++ util-linux-2.19/misc-utils/findfs.c 2011-02-10 22:24:39.615735924 +0100
142@@ -12,6 +12,7 @@
143
144 #include <blkid.h>
145
146+#include "c.h"
147 #include "nls.h"
148
149 static void __attribute__((__noreturn__)) usage(int rc)
150--- util-linux-2.19/misc-utils/scriptreplay.c~ 2011-01-31 16:43:47.000000000 +0100
151+++ util-linux-2.19/misc-utils/scriptreplay.c 2011-02-10 22:26:22.019069258 +0100
152@@ -28,6 +28,7 @@
153 #include <unistd.h>
154 #include <err.h>
155
156+#include "c.h"
157 #include "nls.h"
158
159 #define SCRIPT_MIN_DELAY 0.0001 /* from original sripreplay.pl */
160--- util-linux-2.19/shlibs/mount/src/tab_parse.c~ 2011-02-10 23:28:02.091461025 +0100
161+++ util-linux-2.19/shlibs/mount/src/tab_parse.c 2011-02-10 23:29:04.934794359 +0100
162@@ -422,7 +422,13 @@
163
164 /* TODO: it would be nice to have a scandir() implementaion that
165 * is able to use already opened directory */
166- n = scandir(dirname, &namelist, NULL, versionsort);
167+ n = scandir(dirname, &namelist, NULL,
168+#ifdef HAVE_VERSIONSORT
169+ versionsort
170+#else
171+ alphasort
172+#endif
173+ );
174 if (n <= 0)
175 return 0;
176
Collection of basic system utilities for Linux
This page took 0.075769 seconds and 4 git commands to generate.