projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove leftover unused variable in mktemp after refactoring
[musl]
/
src
/
regex
/
glob.c
diff --git
a/src/regex/glob.c
b/src/regex/glob.c
index
550f655
..
6c07e6b
100644
(file)
--- a/
src/regex/glob.c
+++ b/
src/regex/glob.c
@@
-58,7
+58,8
@@
static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(
char *p2;
size_t l = strlen(d);
int literal;
char *p2;
size_t l = strlen(d);
int literal;
- int fnm_flags= ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0) | FNM_PERIOD;
+ int fnm_flags= ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)
+ | ((!(flags & GLOB_PERIOD)) ? FNM_PERIOD : 0);
int error;
if ((p2 = strchr(p, '/'))) {
int error;
if ((p2 = strchr(p, '/'))) {
@@
-116,7
+117,7
@@
static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(
} else {
int mark = 0;
if (flags & GLOB_MARK) {
} else {
int mark = 0;
if (flags & GLOB_MARK) {
- if (de->d_type)
+ if (de->d_type
&& !S_ISLNK(de->d_type<<12)
)
mark = S_ISDIR(de->d_type<<12);
else {
struct stat st;
mark = S_ISDIR(de->d_type<<12);
else {
struct stat st;
@@
-155,7
+156,7
@@
static int sort(const void *a, const void *b)
return strcmp(*(const char **)a, *(const char **)b);
}
return strcmp(*(const char **)a, *(const char **)b);
}
-int glob(const char *
pat, int flags, int (*errfunc)(const char *path, int err), glob_t *
g)
+int glob(const char *
restrict pat, int flags, int (*errfunc)(const char *path, int err), glob_t *restrict
g)
{
const char *p=pat, *d;
struct match head = { .next = NULL }, *tail = &head;
{
const char *p=pat, *d;
struct match head = { .next = NULL }, *tail = &head;