projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix use of memset without declaration in sched.h cpu set macros
[musl]
/
src
/
regex
/
glob.c
diff --git
a/src/regex/glob.c
b/src/regex/glob.c
index
550f655
..
6f8425c
100644
(file)
--- a/
src/regex/glob.c
+++ b/
src/regex/glob.c
@@
-7,8
+7,6
@@
#include <stdlib.h>
#include <errno.h>
#include <stddef.h>
#include <stdlib.h>
#include <errno.h>
#include <stddef.h>
-#include <unistd.h>
-#include <stdio.h>
#include "libc.h"
struct match
#include "libc.h"
struct match
@@
-58,7
+56,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, '/'))) {
@@
-101,6
+100,10
@@
static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(
continue;
if (p2 && de->d_type && !S_ISDIR(de->d_type<<12) && !S_ISLNK(de->d_type<<12))
continue;
continue;
if (p2 && de->d_type && !S_ISDIR(de->d_type<<12) && !S_ISLNK(de->d_type<<12))
continue;
+ if (p2 && de->d_name[0]=='.' && !de->d_name[1])
+ continue;
+ if (p2 && de->d_name[0]=='.' && de->d_name[1]=='.' && !de->d_name[2])
+ continue;
if (*d) {
memcpy(name, d, l);
name[l] = '/';
if (*d) {
memcpy(name, d, l);
name[l] = '/';
@@
-116,7
+119,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
+158,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;
@@
-170,8
+173,6
@@
int glob(const char *pat, int flags, int (*errfunc)(const char *path, int err),
d = "";
}
d = "";
}
- if (strlen(p) > PATH_MAX) return GLOB_NOSPACE;
-
if (!errfunc) errfunc = ignore_err;
if (!(flags & GLOB_APPEND)) {
if (!errfunc) errfunc = ignore_err;
if (!(flags & GLOB_APPEND)) {
@@
-180,7
+181,9
@@
int glob(const char *pat, int flags, int (*errfunc)(const char *path, int err),
g->gl_pathv = NULL;
}
g->gl_pathv = NULL;
}
- if (*p) error = match_in_dir(d, p, flags, errfunc, &tail);
+ if (strnlen(p, PATH_MAX+1) > PATH_MAX) return GLOB_NOSPACE;
+
+ if (*pat) error = match_in_dir(d, p, flags, errfunc, &tail);
if (error == GLOB_NOSPACE) {
freelist(&head);
return error;
if (error == GLOB_NOSPACE) {
freelist(&head);
return error;