Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: fusl/src/regex/glob.c

Issue 1714623002: [fusl] clang-format fusl (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: headers too Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« fusl/arch/aarch64/atomic_arch.h ('K') | « fusl/src/regex/fnmatch.c ('k') | fusl/src/regex/regcomp.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fusl/src/regex/glob.c
diff --git a/fusl/src/regex/glob.c b/fusl/src/regex/glob.c
index 6affee040c310f435008d227c73bfee7eacab3cb..56410212a7c4c7730d76be038c8b738a19fea2f1 100644
--- a/fusl/src/regex/glob.c
+++ b/fusl/src/regex/glob.c
@@ -9,229 +9,241 @@
#include <stddef.h>
#include "libc.h"
-struct match
-{
- struct match *next;
- char name[1];
+struct match {
+ struct match* next;
+ char name[1];
};
-static int is_literal(const char *p, int useesc)
-{
- int bracket = 0;
- for (; *p; p++) {
- switch (*p) {
- case '\\':
- if (!useesc) break;
- case '?':
- case '*':
- return 0;
- case '[':
- bracket = 1;
- break;
- case ']':
- if (bracket) return 0;
- break;
- }
- }
- return 1;
+static int is_literal(const char* p, int useesc) {
+ int bracket = 0;
+ for (; *p; p++) {
+ switch (*p) {
+ case '\\':
+ if (!useesc)
+ break;
+ case '?':
+ case '*':
+ return 0;
+ case '[':
+ bracket = 1;
+ break;
+ case ']':
+ if (bracket)
+ return 0;
+ break;
+ }
+ }
+ return 1;
}
-static int append(struct match **tail, const char *name, size_t len, int mark)
-{
- struct match *new = malloc(sizeof(struct match) + len + 1);
- if (!new) return -1;
- (*tail)->next = new;
- new->next = NULL;
- strcpy(new->name, name);
- if (mark) strcat(new->name, "/");
- *tail = new;
- return 0;
+static int append(struct match** tail, const char* name, size_t len, int mark) {
+ struct match* new = malloc(sizeof(struct match) + len + 1);
+ if (!new)
+ return -1;
+ (*tail)->next = new;
+ new->next = NULL;
+ strcpy(new->name, name);
+ if (mark)
+ strcat(new->name, "/");
+ *tail = new;
+ return 0;
}
-static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(const char *path, int err), struct match **tail)
-{
- DIR *dir;
- struct dirent de_buf, *de;
- char pat[strlen(p)+1];
- char *p2;
- size_t l = strlen(d);
- int literal;
- int fnm_flags= ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)
- | ((!(flags & GLOB_PERIOD)) ? FNM_PERIOD : 0);
- int error;
-
- if ((p2 = strchr(p, '/'))) {
- strcpy(pat, p);
- pat[p2-p] = 0;
- for (; *p2 == '/'; p2++);
- p = pat;
- }
- literal = is_literal(p, !(flags & GLOB_NOESCAPE));
- if (*d == '/' && !*(d+1)) l = 0;
-
- /* rely on opendir failing for nondirectory objects */
- dir = opendir(*d ? d : ".");
- error = errno;
- if (!dir) {
- /* this is not an error -- we let opendir call stat for us */
- if (error == ENOTDIR) return 0;
- if (error == EACCES && !*p) {
- struct stat st;
- if (!stat(d, &st) && S_ISDIR(st.st_mode)) {
- if (append(tail, d, l, l))
- return GLOB_NOSPACE;
- return 0;
- }
- }
- if (errfunc(d, error) || (flags & GLOB_ERR))
- return GLOB_ABORTED;
- return 0;
- }
- if (!*p) {
- error = append(tail, d, l, l) ? GLOB_NOSPACE : 0;
- closedir(dir);
- return error;
- }
- while (!(error = readdir_r(dir, &de_buf, &de)) && de) {
- char namebuf[l+de->d_reclen+2], *name = namebuf;
- if (!literal && fnmatch(p, de->d_name, fnm_flags))
- continue;
- if (literal && strcmp(p, de->d_name))
- continue;
- if (p2 && de->d_type && !S_ISDIR(de->d_type<<12) && !S_ISLNK(de->d_type<<12))
- continue;
- if (*d) {
- memcpy(name, d, l);
- name[l] = '/';
- strcpy(name+l+1, de->d_name);
- } else {
- name = de->d_name;
- }
- if (p2) {
- if ((error = match_in_dir(name, p2, flags, errfunc, tail))) {
- closedir(dir);
- return error;
- }
- } else {
- int mark = 0;
- if (flags & GLOB_MARK) {
- if (de->d_type && !S_ISLNK(de->d_type<<12))
- mark = S_ISDIR(de->d_type<<12);
- else {
- struct stat st;
- stat(name, &st);
- mark = S_ISDIR(st.st_mode);
- }
- }
- if (append(tail, name, l+de->d_reclen+1, mark)) {
- closedir(dir);
- return GLOB_NOSPACE;
- }
- }
- }
- closedir(dir);
- if (error && (errfunc(d, error) || (flags & GLOB_ERR)))
- return GLOB_ABORTED;
- return 0;
+static int match_in_dir(const char* d,
+ const char* p,
+ int flags,
+ int (*errfunc)(const char* path, int err),
+ struct match** tail) {
+ DIR* dir;
+ struct dirent de_buf, *de;
+ char pat[strlen(p) + 1];
+ char* p2;
+ size_t l = strlen(d);
+ int literal;
+ int fnm_flags = ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0) |
+ ((!(flags & GLOB_PERIOD)) ? FNM_PERIOD : 0);
+ int error;
+
+ if ((p2 = strchr(p, '/'))) {
+ strcpy(pat, p);
+ pat[p2 - p] = 0;
+ for (; *p2 == '/'; p2++)
+ ;
+ p = pat;
+ }
+ literal = is_literal(p, !(flags & GLOB_NOESCAPE));
+ if (*d == '/' && !*(d + 1))
+ l = 0;
+
+ /* rely on opendir failing for nondirectory objects */
+ dir = opendir(*d ? d : ".");
+ error = errno;
+ if (!dir) {
+ /* this is not an error -- we let opendir call stat for us */
+ if (error == ENOTDIR)
+ return 0;
+ if (error == EACCES && !*p) {
+ struct stat st;
+ if (!stat(d, &st) && S_ISDIR(st.st_mode)) {
+ if (append(tail, d, l, l))
+ return GLOB_NOSPACE;
+ return 0;
+ }
+ }
+ if (errfunc(d, error) || (flags & GLOB_ERR))
+ return GLOB_ABORTED;
+ return 0;
+ }
+ if (!*p) {
+ error = append(tail, d, l, l) ? GLOB_NOSPACE : 0;
+ closedir(dir);
+ return error;
+ }
+ while (!(error = readdir_r(dir, &de_buf, &de)) && de) {
+ char namebuf[l + de->d_reclen + 2], *name = namebuf;
+ if (!literal && fnmatch(p, de->d_name, fnm_flags))
+ continue;
+ if (literal && strcmp(p, de->d_name))
+ continue;
+ if (p2 && de->d_type && !S_ISDIR(de->d_type << 12) &&
+ !S_ISLNK(de->d_type << 12))
+ continue;
+ if (*d) {
+ memcpy(name, d, l);
+ name[l] = '/';
+ strcpy(name + l + 1, de->d_name);
+ } else {
+ name = de->d_name;
+ }
+ if (p2) {
+ if ((error = match_in_dir(name, p2, flags, errfunc, tail))) {
+ closedir(dir);
+ return error;
+ }
+ } else {
+ int mark = 0;
+ if (flags & GLOB_MARK) {
+ if (de->d_type && !S_ISLNK(de->d_type << 12))
+ mark = S_ISDIR(de->d_type << 12);
+ else {
+ struct stat st;
+ stat(name, &st);
+ mark = S_ISDIR(st.st_mode);
+ }
+ }
+ if (append(tail, name, l + de->d_reclen + 1, mark)) {
+ closedir(dir);
+ return GLOB_NOSPACE;
+ }
+ }
+ }
+ closedir(dir);
+ if (error && (errfunc(d, error) || (flags & GLOB_ERR)))
+ return GLOB_ABORTED;
+ return 0;
}
-static int ignore_err(const char *path, int err)
-{
- return 0;
+static int ignore_err(const char* path, int err) {
+ return 0;
}
-static void freelist(struct match *head)
-{
- struct match *match, *next;
- for (match=head->next; match; match=next) {
- next = match->next;
- free(match);
- }
+static void freelist(struct match* head) {
+ struct match *match, *next;
+ for (match = head->next; match; match = next) {
+ next = match->next;
+ free(match);
+ }
}
-static int sort(const void *a, const void *b)
-{
- return strcmp(*(const char **)a, *(const char **)b);
+static int sort(const void* a, const void* b) {
+ return strcmp(*(const char**)a, *(const char**)b);
}
-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;
- size_t cnt, i;
- size_t offs = (flags & GLOB_DOOFFS) ? g->gl_offs : 0;
- int error = 0;
-
- if (*p == '/') {
- for (; *p == '/'; p++);
- d = "/";
- } else {
- d = "";
- }
-
- if (strlen(p) > PATH_MAX) return GLOB_NOSPACE;
-
- if (!errfunc) errfunc = ignore_err;
-
- if (!(flags & GLOB_APPEND)) {
- g->gl_offs = offs;
- g->gl_pathc = 0;
- g->gl_pathv = NULL;
- }
-
- if (*p) error = match_in_dir(d, p, flags, errfunc, &tail);
- if (error == GLOB_NOSPACE) {
- freelist(&head);
- return error;
- }
-
- 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++;
- } else
- return GLOB_NOMATCH;
- }
-
- if (flags & GLOB_APPEND) {
- char **pathv = realloc(g->gl_pathv, (offs + g->gl_pathc + cnt + 1) * sizeof(char *));
- if (!pathv) {
- freelist(&head);
- return GLOB_NOSPACE;
- }
- g->gl_pathv = pathv;
- offs += g->gl_pathc;
- } else {
- g->gl_pathv = malloc((offs + cnt + 1) * sizeof(char *));
- if (!g->gl_pathv) {
- freelist(&head);
- return GLOB_NOSPACE;
- }
- for (i=0; i<offs; i++)
- g->gl_pathv[i] = NULL;
- }
- for (i=0, tail=head.next; i<cnt; tail=tail->next, i++)
- g->gl_pathv[offs + i] = tail->name;
- g->gl_pathv[offs + i] = NULL;
- g->gl_pathc += cnt;
-
- if (!(flags & GLOB_NOSORT))
- qsort(g->gl_pathv+offs, cnt, sizeof(char *), sort);
-
- return error;
+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;
+ size_t cnt, i;
+ size_t offs = (flags & GLOB_DOOFFS) ? g->gl_offs : 0;
+ int error = 0;
+
+ if (*p == '/') {
+ for (; *p == '/'; p++)
+ ;
+ d = "/";
+ } else {
+ d = "";
+ }
+
+ if (strlen(p) > PATH_MAX)
+ return GLOB_NOSPACE;
+
+ if (!errfunc)
+ errfunc = ignore_err;
+
+ if (!(flags & GLOB_APPEND)) {
+ g->gl_offs = offs;
+ g->gl_pathc = 0;
+ g->gl_pathv = NULL;
+ }
+
+ if (*p)
+ error = match_in_dir(d, p, flags, errfunc, &tail);
+ if (error == GLOB_NOSPACE) {
+ freelist(&head);
+ return error;
+ }
+
+ 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++;
+ } else
+ return GLOB_NOMATCH;
+ }
+
+ if (flags & GLOB_APPEND) {
+ char** pathv =
+ realloc(g->gl_pathv, (offs + g->gl_pathc + cnt + 1) * sizeof(char*));
+ if (!pathv) {
+ freelist(&head);
+ return GLOB_NOSPACE;
+ }
+ g->gl_pathv = pathv;
+ offs += g->gl_pathc;
+ } else {
+ g->gl_pathv = malloc((offs + cnt + 1) * sizeof(char*));
+ if (!g->gl_pathv) {
+ freelist(&head);
+ return GLOB_NOSPACE;
+ }
+ for (i = 0; i < offs; i++)
+ g->gl_pathv[i] = NULL;
+ }
+ for (i = 0, tail = head.next; i < cnt; tail = tail->next, i++)
+ g->gl_pathv[offs + i] = tail->name;
+ g->gl_pathv[offs + i] = NULL;
+ g->gl_pathc += cnt;
+
+ if (!(flags & GLOB_NOSORT))
+ qsort(g->gl_pathv + offs, cnt, sizeof(char*), sort);
+
+ return error;
}
-void globfree(glob_t *g)
-{
- size_t i;
- for (i=0; i<g->gl_pathc; i++)
- free(g->gl_pathv[g->gl_offs + i] - offsetof(struct match, name));
- free(g->gl_pathv);
- g->gl_pathc = 0;
- g->gl_pathv = NULL;
+void globfree(glob_t* g) {
+ size_t i;
+ for (i = 0; i < g->gl_pathc; i++)
+ free(g->gl_pathv[g->gl_offs + i] - offsetof(struct match, name));
+ free(g->gl_pathv);
+ g->gl_pathc = 0;
+ g->gl_pathv = NULL;
}
LFS64(glob);
« fusl/arch/aarch64/atomic_arch.h ('K') | « fusl/src/regex/fnmatch.c ('k') | fusl/src/regex/regcomp.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698