Skip to content

Commit 8a73ec9

Browse files
committed
temporary: revert bug#75606 fix.
1 parent cd0ec62 commit 8a73ec9

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

build-tarball.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ git clone --depth 1 "$gnulib_url"
4040
# Apply patches.
4141
(cd "$package" && patch -p1 < ../patches/cygwin32-failure.patch)
4242
(cd "$package" && patch -p1 < ../patches/expected-failures.patch)
43+
(cd "$package" && patch -p1 < ../patches/revert-75606-fix.diff) # temporary
4344
(cd coreutils && rm -f gl/modules/link-tests.diff && sed -i -e '/link-tests.diff/d' gl/local.mk)
4445
(cd coreutils && rm -f gl/modules/rename-tests.diff && sed -i -e '/rename-tests.diff/d' gl/local.mk)
4546
(cd gnulib && patch -p1 < ../patches/ubsan.diff)

patches/revert-75606-fix.diff

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/src/sort.c b/src/sort.c
2+
index 0928fd57c..997566240 100644
3+
--- a/src/sort.c
4+
+++ b/src/sort.c
5+
@@ -2373,11 +2373,7 @@ debug_key (struct line const *line, struct keyfield const *key)
6+
if (key->sword != SIZE_MAX)
7+
beg = begfield (line, key);
8+
if (key->eword != SIZE_MAX)
9+
- {
10+
- lim = limfield (line, key);
11+
- /* Treat field ends before field starts as empty fields. */
12+
- lim = MAX (beg, lim);
13+
- }
14+
+ lim = limfield (line, key);
15+
16+
if ((key->skipsblanks && key->sword == SIZE_MAX)
17+
|| key->month || key_numeric (key))

0 commit comments

Comments
 (0)