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
8 +#include <sys/stat.h> /* for major and minor macros */
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
20 +#include <sys/stat.h> /* for makedev macro */
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
30 #else /* !HAVE_WIDECHAR */
31 -# define mbs_width strlen(_s)
32 +# define mbs_width(_s) strlen(_s)
33 #endif /* !HAVE_WIDECHAR */
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
46 static int do_scale_by_power (uintmax_t *x, int base, int power)
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
54 +#ifdef _SC_GETPW_R_SIZE_MAX
55 size_t sz = sysconf(_SC_GETPW_R_SIZE_MAX);
61 if (!username || !uid)
66 +#ifdef _SC_GETGR_R_SIZE_MAX
67 size_t sz = sysconf(_SC_GETGR_R_SIZE_MAX);
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
78 DBG(UPDATE, mnt_debug("%s: locking", lfile));
80 - fd = open(lfile, O_RDONLY|O_CREAT|O_CLOEXEC, S_IWUSR|
81 - S_IRUSR|S_IRGRP|S_IROTH);
84 + O_RDONLY|O_CREAT|O_CLOEXEC,
88 + S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH);
93 --- util-linux-2.19/lib/at.c~ 2011-01-31 16:43:47.000000000 +0100
94 +++ util-linux-2.19/lib/at.c 2011-02-10 20:30:37.336797058 +0100
103 --- util-linux-2.19/shlibs/mount/src/utils.c~ 2011-02-10 20:32:07.906797058 +0100
104 +++ util-linux-2.19/shlibs/mount/src/utils.c 2011-02-10 20:49:24.336797058 +0100
109 +#ifndef HAVE_MKOSTEMP
110 + if ( mktemp( n ) == NULL ) {
114 + fd = open(n, flags | O_EXCL);
116 fd = mkostemp(n, flags | O_EXCL);
121 --- util-linux-2.19/misc-utils/findmnt.c~ 2011-01-31 16:43:47.000000000 +0100
122 +++ util-linux-2.19/misc-utils/findmnt.c 2011-02-10 20:54:23.100130391 +0100
124 #include <sys/ioctl.h>
128 +#include <sys/stat.h> /* for major and minor macros */
131 #define USE_UNSTABLE_LIBMOUNT_API
132 #include <libmount.h>
133 --- util-linux-2.19/fsck/fsck.c~ 2011-02-07 16:19:29.000000000 +0100
134 +++ util-linux-2.19/fsck/fsck.c 2011-02-10 21:09:27.024658725 +0100
137 printf(_("Locking disk %s ... "), diskname);
139 - inst->lock = open(diskname, O_CLOEXEC | O_RDONLY);
140 + inst->lock = open(diskname,
142 + O_CLOEXEC | O_RDONLY
147 if (inst->lock >= 0) {
150 --- util-linux-2.19/configure.ac~ 2011-02-10 21:28:23.395401725 +0100
151 +++ util-linux-2.19/configure.ac 2011-02-10 22:12:29.997898392 +0100
161 --- util-linux-2.19/misc-utils/findfs.c~ 2011-01-31 16:43:47.000000000 +0100
162 +++ util-linux-2.19/misc-utils/findfs.c 2011-02-10 22:24:39.615735924 +0100
170 static void __attribute__((__noreturn__)) usage(int rc)
171 --- util-linux-2.19/misc-utils/scriptreplay.c~ 2011-01-31 16:43:47.000000000 +0100
172 +++ util-linux-2.19/misc-utils/scriptreplay.c 2011-02-10 22:26:22.019069258 +0100
180 #define SCRIPT_MIN_DELAY 0.0001 /* from original sripreplay.pl */
181 --- util-linux-2.19/shlibs/mount/src/tab_parse.c~ 2011-02-10 23:28:02.091461025 +0100
182 +++ util-linux-2.19/shlibs/mount/src/tab_parse.c 2011-02-10 23:29:04.934794359 +0100
185 /* TODO: it would be nice to have a scandir() implementaion that
186 * is able to use already opened directory */
187 - n = scandir(dirname, &namelist, NULL, versionsort);
188 + n = scandir(dirname, &namelist, NULL,
189 +#ifdef HAVE_VERSIONSORT