#include <stdlib.h>
#include <errno.h>
#include <stddef.h>
-#include <unistd.h>
-#include <stdio.h>
#include "libc.h"
struct match
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;
d = "";
}
- if (strlen(p) > PATH_MAX) return GLOB_NOSPACE;
-
if (!errfunc) errfunc = ignore_err;
if (!(flags & GLOB_APPEND)) {
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;