From: Ismael Luceno <ismael@iodev.co.uk>
To: musl@lists.openwall.com
Cc: Ismael Luceno <ismael@iodev.co.uk>
Subject: [PATCH] glob: implement GLOB_TILDE
Date: Tue, 23 Jul 2019 20:33:54 +0200 [thread overview]
Message-ID: <20190723183354.31633-1-ismael@iodev.co.uk> (raw)
Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
---
include/glob.h | 1 +
src/regex/glob.c | 26 ++++++++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/include/glob.h b/include/glob.h
index 76f6c1c68a23..fc8106b20c5b 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -30,6 +30,7 @@ void globfree(glob_t *);
#define GLOB_APPEND 0x20
#define GLOB_NOESCAPE 0x40
#define GLOB_PERIOD 0x80
+#define GLOB_TILDE 0x100
#define GLOB_NOSPACE 1
#define GLOB_ABORTED 2
diff --git a/src/regex/glob.c b/src/regex/glob.c
index aa1c6a4482ee..77b81f707420 100644
--- a/src/regex/glob.c
+++ b/src/regex/glob.c
@@ -8,6 +8,8 @@
#include <stdlib.h>
#include <errno.h>
#include <stddef.h>
+#include <unistd.h>
+#include "../passwd/pwf.h"
struct match
{
@@ -35,6 +37,30 @@ static int do_glob(char *buf, size_t pos, int type, char *pat, int flags, int (*
/* If GLOB_MARK is unused, we don't care about type. */
if (!type && !(flags & GLOB_MARK)) type = DT_REG;
+ if ((flags & GLOB_TILDE) && *pat == '~') {
+ struct passwd pw, *res;
+ char *buf = NULL;
+ size_t len = 0;
+ char *name_end = strchr(++pat, '/');
+ if (name_end)
+ *name_end = 0;
+ uid_t uid = *pat ? 0 : getuid();
+ int err = __getpw_a(pat, uid, &pw, &buf, &len, &res);
+ if (!err && res) {
+ while (pos < PATH_MAX - 1 && *pw.pw_dir)
+ buf[pos++] = *pw.pw_dir++;
+ }
+ free(buf);
+ if (err)
+ return GLOB_NOSPACE;
+ if (!res)
+ return 0;
+ if (name_end) {
+ pat = name_end;
+ *pat = '/';
+ }
+ }
+
/* Special-case the remaining pattern being all slashes, in
* which case we can use caller-passed type if it's a dir. */
if (*pat && type!=DT_DIR) type = 0;
--
2.22.0
next reply other threads:[~2019-07-23 18:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-23 18:33 Ismael Luceno [this message]
2019-07-23 20:07 ` Rich Felker
2019-07-24 7:15 ` Ismael Luceno
2019-07-24 13:00 ` Rich Felker
2019-07-24 17:25 ` Ismael Luceno
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190723183354.31633-1-ismael@iodev.co.uk \
--to=ismael@iodev.co.uk \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).