forked from StephanTLavavej/mingw-distro
-
Notifications
You must be signed in to change notification settings - Fork 0
/
coreutils.patch
280 lines (257 loc) · 9.05 KB
/
coreutils.patch
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
273
274
275
276
277
278
279
280
diff -aurN coreutils-8.25/configure coreutils-8.25-fixed/configure
--- coreutils-8.25/configure 2016-01-20 02:32:53.000000000 -0800
+++ coreutils-8.25-fixed/configure 2016-04-07 21:46:33.632386300 -0700
@@ -40685,17 +40685,7 @@
esac
fi
-if test -z "$ac_list_mounted_fs"; then
- as_fn_error $? "could not determine how to read list of mounted file systems" "$LINENO" 5
- # FIXME -- no need to abort building the whole package
- # Can't build mountlist.c or anything that needs its functions
-fi
-
-if test $ac_list_mounted_fs = found; then :
- gl_cv_list_mounted_fs=yes
-else
gl_cv_list_mounted_fs=no
-fi
diff -aurN coreutils-8.25/lib/c-strtod.c coreutils-8.25-fixed/lib/c-strtod.c
--- coreutils-8.25/lib/c-strtod.c 2016-01-01 05:45:55.000000000 -0800
+++ coreutils-8.25-fixed/lib/c-strtod.c 2016-04-07 21:46:33.648011100 -0700
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <string.h>
-#if LONG
+#if LONGCAT
# define C_STRTOD c_strtold
# define DOUBLE long double
# define STRTOD_L strtold_l
@@ -37,7 +37,7 @@
#endif
/* c_strtold falls back on strtod if strtold doesn't conform to C99. */
-#if LONG && HAVE_C99_STRTOLD
+#if LONGCAT && HAVE_C99_STRTOLD
# define STRTOD strtold
#else
# define STRTOD strtod
diff -aurN coreutils-8.25/lib/c-strtold.c coreutils-8.25-fixed/lib/c-strtold.c
--- coreutils-8.25/lib/c-strtold.c 2011-08-23 06:48:12.000000000 -0700
+++ coreutils-8.25-fixed/lib/c-strtold.c 2016-04-07 21:46:33.663635900 -0700
@@ -1,2 +1,2 @@
-#define LONG 1
+#define LONGCAT 1
#include "c-strtod.c"
diff -aurN coreutils-8.25/lib/ftruncate.c coreutils-8.25-fixed/lib/ftruncate.c
--- coreutils-8.25/lib/ftruncate.c 2016-01-01 05:45:55.000000000 -0800
+++ coreutils-8.25-fixed/lib/ftruncate.c 2016-04-07 21:46:33.663635900 -0700
@@ -14,6 +14,10 @@
You should have received a copy of the GNU General Public License along
with this program; if not, see <http://www.gnu.org/licenses/>. */
+/* Ensure that <windows.h> declares GetFileSizeEx. */
+# undef _WIN32_WINNT
+# define _WIN32_WINNT 0x500
+
#include <config.h>
/* Specification. */
@@ -29,10 +33,6 @@
/* Large File Support: off_t is 64-bit, but chsize() takes only a 32-bit
argument. So, define a 64-bit safe SetFileSize function ourselves. */
-/* Ensure that <windows.h> declares GetFileSizeEx. */
-# undef _WIN32_WINNT
-# define _WIN32_WINNT 0x500
-
/* Get declarations of the native Windows API functions. */
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
diff -aurN coreutils-8.25/lib/gethostname.c coreutils-8.25-fixed/lib/gethostname.c
--- coreutils-8.25/lib/gethostname.c 2016-01-01 05:45:55.000000000 -0800
+++ coreutils-8.25-fixed/lib/gethostname.c 2016-04-07 21:46:33.679254200 -0700
@@ -87,8 +87,9 @@
#undef gethostname
int
-rpl_gethostname (char *name, size_t len)
+PASCAL rpl_gethostname (char *name, int int_len)
{
+ size_t len = (size_t) int_len;
int r;
if (len > INT_MAX)
diff -aurN coreutils-8.25/lib/randread.c coreutils-8.25-fixed/lib/randread.c
--- coreutils-8.25/lib/randread.c 2016-01-01 05:48:50.000000000 -0800
+++ coreutils-8.25-fixed/lib/randread.c 2016-04-07 21:46:33.679254200 -0700
@@ -176,9 +176,6 @@
}
ISAAC_SEED (struct timeval, gettimeofday (&v, NULL));
ISAAC_SEED (pid_t, v = getpid ());
- ISAAC_SEED (pid_t, v = getppid ());
- ISAAC_SEED (uid_t, v = getuid ());
- ISAAC_SEED (uid_t, v = getgid ());
#ifdef lint
/* Normally we like having the extra randomness from uninitialized
diff -aurN coreutils-8.25/lib/unistd.in.h coreutils-8.25-fixed/lib/unistd.in.h
--- coreutils-8.25/lib/unistd.in.h 2016-01-01 06:17:01.000000000 -0800
+++ coreutils-8.25-fixed/lib/unistd.in.h 2016-04-07 21:46:33.679254200 -0700
@@ -739,9 +739,9 @@
# undef gethostname
# define gethostname rpl_gethostname
# endif
-_GL_FUNCDECL_RPL (gethostname, int, (char *name, size_t len)
+_GL_FUNCDECL_RPL (gethostname, int PASCAL, (char *name, int len)
_GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (gethostname, int, (char *name, size_t len));
+_GL_CXXALIAS_RPL (gethostname, int PASCAL, (char *name, int len));
# else
# if !@HAVE_GETHOSTNAME@
_GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len)
diff -aurN coreutils-8.25/lib/xstrtod.c coreutils-8.25-fixed/lib/xstrtod.c
--- coreutils-8.25/lib/xstrtod.c 2016-01-01 05:45:55.000000000 -0800
+++ coreutils-8.25-fixed/lib/xstrtod.c 2016-04-07 21:46:33.694879600 -0700
@@ -26,7 +26,7 @@
#include <limits.h>
#include <stdio.h>
-#if LONG
+#if LONGCAT
# define XSTRTOD xstrtold
# define DOUBLE long double
#else
diff -aurN coreutils-8.25/lib/xstrtold.c coreutils-8.25-fixed/lib/xstrtold.c
--- coreutils-8.25/lib/xstrtold.c 2011-08-23 06:48:13.000000000 -0700
+++ coreutils-8.25-fixed/lib/xstrtold.c 2016-04-07 21:46:33.694879600 -0700
@@ -1,2 +1,2 @@
-#define LONG 1
+#define LONGCAT 1
#include "xstrtod.c"
diff -aurN coreutils-8.25/src/sort.c coreutils-8.25-fixed/src/sort.c
--- coreutils-8.25/src/sort.c 2016-01-16 11:09:33.000000000 -0800
+++ coreutils-8.25-fixed/src/sort.c 2016-04-07 21:51:00.800143100 -0700
@@ -26,7 +26,6 @@
#include <pthread.h>
#include <sys/resource.h>
#include <sys/types.h>
-#include <sys/wait.h>
#include <signal.h>
#include <assert.h>
#include "system.h"
@@ -475,8 +474,6 @@
-c, --check, --check=diagnose-first check for sorted input; do not sort\n\
-C, --check=quiet, --check=silent like -c, but do not report first bad line\
\n\
- --compress-program=PROG compress temporaries with PROG;\n\
- decompress them with PROG -d\n\
"), stdout);
fputs (_("\
--debug annotate the part of the line used to sort,\n\
@@ -541,7 +538,6 @@
enum
{
CHECK_OPTION = CHAR_MAX + 1,
- COMPRESS_PROGRAM_OPTION,
DEBUG_PROGRAM_OPTION,
FILES0_FROM_OPTION,
NMERGE_OPTION,
@@ -556,7 +552,6 @@
{
{"ignore-leading-blanks", no_argument, NULL, 'b'},
{"check", optional_argument, NULL, CHECK_OPTION},
- {"compress-program", required_argument, NULL, COMPRESS_PROGRAM_OPTION},
{"debug", no_argument, NULL, DEBUG_PROGRAM_OPTION},
{"dictionary-order", no_argument, NULL, 'd'},
{"ignore-case", no_argument, NULL, 'f'},
@@ -717,21 +712,7 @@
static pid_t
reap (pid_t pid)
{
- int status;
- pid_t cpid = waitpid ((pid ? pid : -1), &status, (pid ? 0 : WNOHANG));
-
- if (cpid < 0)
- error (SORT_FAILURE, errno, _("waiting for %s [-d]"),
- quoteaf (compress_program));
- else if (0 < cpid && (0 < pid || delete_proc (cpid)))
- {
- if (! WIFEXITED (status) || WEXITSTATUS (status))
- error (SORT_FAILURE, 0, _("%s [-d] terminated abnormally"),
- quoteaf (compress_program));
- --nprocs;
- }
-
- return cpid;
+ exit(SORT_FAILURE);
}
/* TEMP represents a new process; add it to the process table. Create
@@ -3734,7 +3715,7 @@
if (STREQ (files[i], "-"))
continue;
- if (euidaccess (files[i], R_OK) != 0)
+ if (access (files[i], R_OK) != 0)
die (_("cannot read"), files[i]);
}
}
@@ -4228,7 +4209,7 @@
static int const sig[] =
{
/* The usual suspects. */
- SIGALRM, SIGHUP, SIGINT, SIGPIPE, SIGQUIT, SIGTERM,
+ SIGINT, SIGTERM,
#ifdef SIGPOLL
SIGPOLL,
#endif
@@ -4274,7 +4255,6 @@
}
#endif
}
- signal (SIGCHLD, SIG_DFL); /* Don't inherit CHLD handling from parent. */
/* The signal mask is known, so it is safe to invoke exit_cleanup. */
atexit (exit_cleanup);
@@ -4399,12 +4379,6 @@
checkonly = c;
break;
- case COMPRESS_PROGRAM_OPTION:
- if (compress_program && !STREQ (compress_program, optarg))
- error (SORT_FAILURE, 0, _("multiple compress programs specified"));
- compress_program = optarg;
- break;
-
case DEBUG_PROGRAM_OPTION:
debug = true;
break;
@@ -4758,8 +4732,8 @@
free (files);
#endif
- if (have_read_stdin && fclose (stdin) == EOF)
- die (_("close failed"), "-");
+ if (have_read_stdin)
+ fclose (stdin);
return EXIT_SUCCESS;
}
diff -aurN coreutils-8.25/src/uniq.c coreutils-8.25-fixed/src/uniq.c
--- coreutils-8.25/src/uniq.c 2016-01-13 03:08:59.000000000 -0800
+++ coreutils-8.25-fixed/src/uniq.c 2016-04-07 21:54:06.160202300 -0700
@@ -233,7 +233,6 @@
size_opt (char const *opt, char const *msgid)
{
unsigned long int size;
- verify (SIZE_MAX <= ULONG_MAX);
switch (xstrtoul (opt, NULL, 10, &size, ""))
{
@@ -461,9 +460,11 @@
}
closefiles:
- if (ferror (stdin) || fclose (stdin) != 0)
+ if (ferror (stdin))
error (EXIT_FAILURE, 0, _("error reading %s"), quoteaf (infile));
+ fclose (stdin);
+
/* stdout is handled via the atexit-invoked close_stdout function. */
free (lb1.buffer);
diff -aurN coreutils-8.25/src/wc.c coreutils-8.25-fixed/src/wc.c
--- coreutils-8.25/src/wc.c 2016-01-13 03:11:36.000000000 -0800
+++ coreutils-8.25-fixed/src/wc.c 2016-04-07 21:46:33.710504700 -0700
@@ -531,7 +531,7 @@
{
have_read_stdin = true;
if (O_BINARY && ! isatty (STDIN_FILENO))
- xfreopen (NULL, "rb", stdin);
+ _setmode (STDIN_FILENO, _O_BINARY);
return wc (STDIN_FILENO, file, fstatus, -1);
}
else