sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (8f5ad37d7a3d3218a1409e296cc22c186a843d3d)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (8f5ad37d7a3d3218a1409e296cc22c186a843d3d)
- Date: Wed, 10 Apr 2024 23:19:27 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
libs/musl/DETAILS |
4
libs/musl/HISTORY |
6 +
libs/musl/patches/0001-glob-introduce-context-struct-for-do_glob.patch |
8 -
libs/musl/patches/0002-glob-implement-GLOB_NOMAGIC.patch |
53 ++++++++++
libs/musl/patches/0004-glob-implement-GLOB_NOMAGIC.patch |
53 ----------
5 files changed, 65 insertions(+), 59 deletions(-)
New commits:
commit 8f5ad37d7a3d3218a1409e296cc22c186a843d3d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
musl 1.2.5
diff --git a/libs/musl/DETAILS b/libs/musl/DETAILS
index cf531dc..0f1703e 100755
--- a/libs/musl/DETAILS
+++ b/libs/musl/DETAILS
@@ -1,11 +1,11 @@
SPELL=musl
- VERSION=1.2.4
+ VERSION=1.2.5
SECURITY_PATCH=1
SOURCE="$SPELL-$VERSION.tar.gz"
WEB_SITE="https://musl.libc.org";
# Watch: https://musl.libc.org
SOURCE_URL[0]="$WEB_SITE/releases/${SOURCE}"
-
SOURCE_HASH=sha512:498ec5d7941194a8806f4d42f0f6d218c862996ef1398b737d0d06995e0b7a6574b240a48088f6b84016b14b2776fe463f829dcb11149cdfc1023d496b235c55
+
SOURCE_HASH=sha512:7bb7f7833923cd69c7a1a9b8a5f1784bfd5289663eb6061dcd43d583e45987df8a68a1be05d75cc1c88a3f5b610653d1a70f4a9cff4d8f7fd41ae73ee058c17c
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
STAGED_INSTALL=off
LICENSE[0]="MIT"
diff --git a/libs/musl/HISTORY b/libs/musl/HISTORY
index 497959c..5885882 100644
--- a/libs/musl/HISTORY
+++ b/libs/musl/HISTORY
@@ -1,3 +1,9 @@
+2024-04-09 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.5
+ * patches/0001-glob-introduce-context-struct-for-do_glob.patch,
+ patches/0002-glob-implement-GLOB_NOMAGIC.patch:
+ updated patches
+
2023-06-09 Ismael Luceno <ismael AT sourcemage.org>
*
patches/0005-add-internal-aliases-__opendir-__readdir-and-__close.patch,
patches/0006-glob-implement-GLOB_ALTDIRFUNC-et-al.patch:
diff --git
a/libs/musl/patches/0001-glob-introduce-context-struct-for-do_glob.patch
b/libs/musl/patches/0001-glob-introduce-context-struct-for-do_glob.patch
index b90bab3..ecaf46f 100644
--- a/libs/musl/patches/0001-glob-introduce-context-struct-for-do_glob.patch
+++ b/libs/musl/patches/0001-glob-introduce-context-struct-for-do_glob.patch
@@ -1,7 +1,7 @@
-From 0285118ef8f42e0b134eb30354f6bc1b0890fe9c Mon Sep 17 00:00:00 2001
+From 589bdb32ed0285be4a5361d3da6d9146f61eb9ed Mon Sep 17 00:00:00 2001
From: Ismael Luceno <ismael AT iodev.co.uk>
Date: Fri, 27 Aug 2021 19:10:25 +0200
-Subject: [PATCH] glob: introduce context struct for do_glob
+Subject: [PATCH 1/2] glob: introduce context struct for do_glob
this reduces the function frame by sharing more state in the recursion,
and produces a slightly smaller object file with GCC 10.3 on x86_64:
@@ -22,7 +22,7 @@ Notes:
1 file changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/regex/glob.c b/src/regex/glob.c
-index a490644653a9..d8377f35d7d3 100644
+index 87bae084fb27..3194eea74a75 100644
--- a/src/regex/glob.c
+++ b/src/regex/glob.c
@@ -32,10 +32,16 @@ static int append(struct match **tail, const char *name,
size_t len, int mark)
@@ -144,5 +144,5 @@ index a490644653a9..d8377f35d7d3 100644
}
--
-2.40.1
+2.43.0
diff --git a/libs/musl/patches/0002-glob-implement-GLOB_NOMAGIC.patch
b/libs/musl/patches/0002-glob-implement-GLOB_NOMAGIC.patch
new file mode 100644
index 0000000..05e3dc9
--- /dev/null
+++ b/libs/musl/patches/0002-glob-implement-GLOB_NOMAGIC.patch
@@ -0,0 +1,53 @@
+From c3c0fc50216a7a6665092bf9eeb8a72a941ac919 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Fri, 26 Jul 2019 18:13:14 +0200
+Subject: [PATCH 2/2] glob: implement GLOB_NOMAGIC
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ include/glob.h | 1 +
+ src/regex/glob.c | 16 +++++++++++-----
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/include/glob.h b/include/glob.h
+index fed06745354a..35a2772b1d3c 100644
+--- a/include/glob.h
++++ b/include/glob.h
+@@ -31,6 +31,7 @@ void globfree(glob_t *);
+ #define GLOB_NOESCAPE 0x40
+ #define GLOB_PERIOD 0x80
+
++#define GLOB_NOMAGIC 0x0800
+ #define GLOB_TILDE 0x1000
+ #define GLOB_TILDE_CHECK 0x4000
+
+diff --git a/src/regex/glob.c b/src/regex/glob.c
+index 3194eea74a75..21b0f0614668 100644
+--- a/src/regex/glob.c
++++ b/src/regex/glob.c
+@@ -272,11 +272,17 @@ int glob(const char *restrict pat, int flags, int
(*errfunc)(const char *path, i
+
+ for (cnt=0, tail=head.next; tail; tail=tail->next, cnt++);
+ if (!cnt) {
+- if (flags & GLOB_NOCHECK) {
+- tail = &head;
+- if (append(&tail, pat, strlen(pat), 0))
+- return GLOB_NOSPACE;
+- cnt++;
++ /* GLOB_NOMAGIC implies GLOB_NOCHECK */
++ if (flags & (GLOB_NOMAGIC | GLOB_NOCHECK)) {
++ size_t len = strcspn(pat,
++ (flags & GLOB_NOMAGIC) ? "*?[" : "");
++ if (!pat[len]) {
++ tail = &head;
++ if (append(&tail, pat, len, 0))
++ return GLOB_NOSPACE;
++ cnt++;
++ } else if (!error)
++ return GLOB_NOMATCH;
+ } else if (!error)
+ return GLOB_NOMATCH;
+ }
+--
+2.43.0
+
diff --git a/libs/musl/patches/0004-glob-implement-GLOB_NOMAGIC.patch
b/libs/musl/patches/0004-glob-implement-GLOB_NOMAGIC.patch
deleted file mode 100644
index 53ec2af..0000000
--- a/libs/musl/patches/0004-glob-implement-GLOB_NOMAGIC.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5d89738649095a36f584ec30a59c945c8191593e Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Fri, 26 Jul 2019 18:13:14 +0200
-Subject: [PATCH 4/6] glob: implement GLOB_NOMAGIC
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- include/glob.h | 1 +
- src/regex/glob.c | 13 +++++++++----
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/include/glob.h b/include/glob.h
-index 4a562a206d52..0ff70bdfeef2 100644
---- a/include/glob.h
-+++ b/include/glob.h
-@@ -31,6 +31,7 @@ void globfree(glob_t *);
- #define GLOB_NOESCAPE 0x40
- #define GLOB_PERIOD 0x80
-
-+#define GLOB_NOMAGIC 0x0800
- #define GLOB_TILDE 0x1000
- #define GLOB_TILDE_CHECK 0x4000
-
-diff --git a/src/regex/glob.c b/src/regex/glob.c
-index 9de080ed9ccd..7780e21ee113 100644
---- a/src/regex/glob.c
-+++ b/src/regex/glob.c
-@@ -260,13 +260,18 @@ int glob(const char *restrict pat, int flags, int
(*errfunc)(const char *path, i
-
- for (cnt=0, tail=head.next; tail; tail=tail->next, cnt++);
- if (!cnt) {
-+ size_t len;
- if (flags & GLOB_NOCHECK) {
-- tail = &head;
-- if (append(&tail, pat, strlen(pat), 0))
-- return GLOB_NOSPACE;
-- cnt++;
-+ len = strlen(pat);
-+ } else if (flags & GLOB_NOMAGIC) {
-+ len = strcspn(pat, "*?[");
-+ if (pat[len]) return GLOB_NOMATCH;
- } else
- return GLOB_NOMATCH;
-+ tail = &head;
-+ if (append(&tail, pat, len, 0))
-+ return GLOB_NOSPACE;
-+ cnt++;
- }
-
- if (flags & GLOB_APPEND) {
---
-2.22.0
-
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (8f5ad37d7a3d3218a1409e296cc22c186a843d3d), Ismael Luceno, 04/10/2024
Archive powered by MHonArc 2.6.24.