Page MenuHomeFreeBSD
Differential D32440

devel/wasi-libc: update to g20210923
ClosedPublic
Actions

Authored by val_packett.cool on Oct 10 2021, 2:04 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 3, 12:55 AM
Unknown Object (File)
Sat, Mar 1, 3:32 PM
Unknown Object (File)
Mon, Feb 24, 3:10 AM
Unknown Object (File)
Mon, Feb 24, 1:05 AM
Unknown Object (File)
Sun, Feb 23, 3:34 PM
Unknown Object (File)
Sun, Feb 23, 1:42 PM
Unknown Object (File)
Sun, Feb 23, 10:01 AM
Unknown Object (File)
Feb 10 2025, 12:40 AM
View All 83 Files
Subscribers
mat
Contributor Reviewers (ports)

Details

Reviewers
mikael
Group Reviewers
Contributor Reviewers (ports)
Commits
R11:dabb8bcf4ecd: devel/wasi-libc: Update to g20210923.
R11:4d8144647a12: devel/wasi-libc: Update to g20210923.

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
devel/
wasi-libc/
10 lines
10 lines
3 lines

Diff 97217

View Options

devel/wasi-libc/Makefile

Show First 20 Lines • Show All 117 Lines • ▼ Show 20 Lines
* permissions: 755 * permissions: 755
* nlink: 58283552 * nlink: 58283552
* uid: 1001 * uid: 1001
*/ */
#define DIR_METATABLE "directory iterator metatable" #define DIR_METATABLE "directory iterator metatable"
static int static int
lua_dir_iter_pushtype(lua_State *L __unused, const struct dirent *ent __unused)
cemUnsubmitted
Done
Inline Actions

const struct dirent *entry

cem: `const struct dirent *entry`
{
/*
cemUnsubmitted
Done
Inline Actions

Maybe add a comment about why we're only exposing this non-standard lfs extension to the loader.

cem: Maybe add a comment about why we're only exposing this non-standard lfs extension to the loader.
* This is a non-standard extension to luafilesystem for loader's
* benefit. The extra stat() calls to determine the entry type can
* be quite expensive on some systems, so this speeds up enumeration of
* /boot greatly by providing the type up front.
*
* This extension is compatible enough with luafilesystem, in that we're
* just using an extra return value for the iterator.
*/
cemUnsubmitted
Done
Inline Actions

If we're doing strings, it might make sense to just match the lfs.attributes(,"mode") strings — "directory", etc.

We could also expose some integer constants in lfs namespace and match on those? If strings are more canonical in Lua it's fine to stay with strings.

cem: If we're doing strings, it might make sense to just match the lfs.attributes(,"mode") strings —…
kevansAuthorUnsubmitted
Done
Inline Actions

Now that you mention it, we might as well just export lfs.DT_DIR for loader. I'll drop DT_REG in the process, because I still haven't come up with a situation where I care for it.

kevans: Now that you mention it, we might as well just export lfs.DT_DIR for loader. I'll drop DT_REG…
#ifdef _STANDALONE
lua_pushinteger(L, ent->d_type);
return 1;
#else
return 0;
#endif
}
static int
lua_dir_iter_next(lua_State *L) lua_dir_iter_next(lua_State *L)
{ {
struct dirent *entry; struct dirent *entry;
DIR *dp, **dpp; DIR *dp, **dpp;
dpp = (DIR **)luaL_checkudata(L, 1, DIR_METATABLE); dpp = (DIR **)luaL_checkudata(L, 1, DIR_METATABLE);
dp = *dpp; dp = *dpp;
luaL_argcheck(L, dp != NULL, 1, "closed directory"); luaL_argcheck(L, dp != NULL, 1, "closed directory");
#ifdef _STANDALONE #ifdef _STANDALONE
entry = readdirfd(dp->fd); entry = readdirfd(dp->fd);
#else #else
entry = readdir(dp); entry = readdir(dp);
#endif #endif
if (entry == NULL) { if (entry == NULL) {
closedir(dp); closedir(dp);
*dpp = NULL; *dpp = NULL;
return 0; return 0;
} }
lua_pushstring(L, entry->d_name); lua_pushstring(L, entry->d_name);
return 1; return 1 + lua_dir_iter_pushtype(L, entry);
} }
static int static int
lua_dir_iter_close(lua_State *L) lua_dir_iter_close(lua_State *L)
{ {
DIR *dp, **dpp; DIR *dp, **dpp;
dpp = (DIR **)lua_touserdata(L, 1); dpp = (DIR **)lua_touserdata(L, 1);
▲ Show 20 Lines • Show All 259 Lines • ▼ Show 20 Lines
}; };
#undef REG_SIMPLE #undef REG_SIMPLE
int int
luaopen_lfs(lua_State *L) luaopen_lfs(lua_State *L)
{ {
register_metatable(L); register_metatable(L);
luaL_newlib(L, fslib); luaL_newlib(L, fslib);
#ifdef _STANDALONE
/* Non-standard extension for loader, used with lfs.dir(). */
lua_pushinteger(L, DT_DIR);
lua_setfield(L, -2, "DT_DIR");
#endif
return 1; return 1;
} }
View Options

devel/wasi-libc/distinfo

Show First 20 Lines • Show All 117 Lines • ▼ Show 20 Lines
* permissions: 755 * permissions: 755
* nlink: 58283552 * nlink: 58283552
* uid: 1001 * uid: 1001
*/ */
#define DIR_METATABLE "directory iterator metatable" #define DIR_METATABLE "directory iterator metatable"
static int static int
lua_dir_iter_pushtype(lua_State *L __unused, const struct dirent *ent __unused)
cemUnsubmitted
Done
Inline Actions

const struct dirent *entry

cem: `const struct dirent *entry`
{
/*
cemUnsubmitted
Done
Inline Actions

Maybe add a comment about why we're only exposing this non-standard lfs extension to the loader.

cem: Maybe add a comment about why we're only exposing this non-standard lfs extension to the loader.
* This is a non-standard extension to luafilesystem for loader's
* benefit. The extra stat() calls to determine the entry type can
* be quite expensive on some systems, so this speeds up enumeration of
* /boot greatly by providing the type up front.
*
* This extension is compatible enough with luafilesystem, in that we're
* just using an extra return value for the iterator.
*/
cemUnsubmitted
Done
Inline Actions

If we're doing strings, it might make sense to just match the lfs.attributes(,"mode") strings — "directory", etc.

We could also expose some integer constants in lfs namespace and match on those? If strings are more canonical in Lua it's fine to stay with strings.

cem: If we're doing strings, it might make sense to just match the lfs.attributes(,"mode") strings —…
kevansAuthorUnsubmitted
Done
Inline Actions

Now that you mention it, we might as well just export lfs.DT_DIR for loader. I'll drop DT_REG in the process, because I still haven't come up with a situation where I care for it.

kevans: Now that you mention it, we might as well just export lfs.DT_DIR for loader. I'll drop DT_REG…
#ifdef _STANDALONE
lua_pushinteger(L, ent->d_type);
return 1;
#else
return 0;
#endif
}
static int
lua_dir_iter_next(lua_State *L) lua_dir_iter_next(lua_State *L)
{ {
struct dirent *entry; struct dirent *entry;
DIR *dp, **dpp; DIR *dp, **dpp;
dpp = (DIR **)luaL_checkudata(L, 1, DIR_METATABLE); dpp = (DIR **)luaL_checkudata(L, 1, DIR_METATABLE);
dp = *dpp; dp = *dpp;
luaL_argcheck(L, dp != NULL, 1, "closed directory"); luaL_argcheck(L, dp != NULL, 1, "closed directory");
#ifdef _STANDALONE #ifdef _STANDALONE
entry = readdirfd(dp->fd); entry = readdirfd(dp->fd);
#else #else
entry = readdir(dp); entry = readdir(dp);
#endif #endif
if (entry == NULL) { if (entry == NULL) {
closedir(dp); closedir(dp);
*dpp = NULL; *dpp = NULL;
return 0; return 0;
} }
lua_pushstring(L, entry->d_name); lua_pushstring(L, entry->d_name);
return 1; return 1 + lua_dir_iter_pushtype(L, entry);
} }
static int static int
lua_dir_iter_close(lua_State *L) lua_dir_iter_close(lua_State *L)
{ {
DIR *dp, **dpp; DIR *dp, **dpp;
dpp = (DIR **)lua_touserdata(L, 1); dpp = (DIR **)lua_touserdata(L, 1);
▲ Show 20 Lines • Show All 259 Lines • ▼ Show 20 Lines
}; };
#undef REG_SIMPLE #undef REG_SIMPLE
int int
luaopen_lfs(lua_State *L) luaopen_lfs(lua_State *L)
{ {
register_metatable(L); register_metatable(L);
luaL_newlib(L, fslib); luaL_newlib(L, fslib);
#ifdef _STANDALONE
/* Non-standard extension for loader, used with lfs.dir(). */
lua_pushinteger(L, DT_DIR);
lua_setfield(L, -2, "DT_DIR");
#endif
return 1; return 1;
} }
View Options

devel/wasi-libc/pkg-plist

Show First 20 Lines • Show All 117 Lines • ▼ Show 20 Lines
* permissions: 755 * permissions: 755
* nlink: 58283552 * nlink: 58283552
* uid: 1001 * uid: 1001
*/ */
#define DIR_METATABLE "directory iterator metatable" #define DIR_METATABLE "directory iterator metatable"
static int static int
lua_dir_iter_pushtype(lua_State *L __unused, const struct dirent *ent __unused)
cemUnsubmitted
Done
Inline Actions

const struct dirent *entry

cem: `const struct dirent *entry`
{
/*
cemUnsubmitted
Done
Inline Actions

Maybe add a comment about why we're only exposing this non-standard lfs extension to the loader.

cem: Maybe add a comment about why we're only exposing this non-standard lfs extension to the loader.
* This is a non-standard extension to luafilesystem for loader's
* benefit. The extra stat() calls to determine the entry type can
* be quite expensive on some systems, so this speeds up enumeration of
* /boot greatly by providing the type up front.
*
* This extension is compatible enough with luafilesystem, in that we're
* just using an extra return value for the iterator.
*/
cemUnsubmitted
Done
Inline Actions

If we're doing strings, it might make sense to just match the lfs.attributes(,"mode") strings — "directory", etc.

We could also expose some integer constants in lfs namespace and match on those? If strings are more canonical in Lua it's fine to stay with strings.

cem: If we're doing strings, it might make sense to just match the lfs.attributes(,"mode") strings —…
kevansAuthorUnsubmitted
Done
Inline Actions

Now that you mention it, we might as well just export lfs.DT_DIR for loader. I'll drop DT_REG in the process, because I still haven't come up with a situation where I care for it.

kevans: Now that you mention it, we might as well just export lfs.DT_DIR for loader. I'll drop DT_REG…
#ifdef _STANDALONE
lua_pushinteger(L, ent->d_type);
return 1;
#else
return 0;
#endif
}
static int
lua_dir_iter_next(lua_State *L) lua_dir_iter_next(lua_State *L)
{ {
struct dirent *entry; struct dirent *entry;
DIR *dp, **dpp; DIR *dp, **dpp;
dpp = (DIR **)luaL_checkudata(L, 1, DIR_METATABLE); dpp = (DIR **)luaL_checkudata(L, 1, DIR_METATABLE);
dp = *dpp; dp = *dpp;
luaL_argcheck(L, dp != NULL, 1, "closed directory"); luaL_argcheck(L, dp != NULL, 1, "closed directory");
#ifdef _STANDALONE #ifdef _STANDALONE
entry = readdirfd(dp->fd); entry = readdirfd(dp->fd);
#else #else
entry = readdir(dp); entry = readdir(dp);
#endif #endif
if (entry == NULL) { if (entry == NULL) {
closedir(dp); closedir(dp);
*dpp = NULL; *dpp = NULL;
return 0; return 0;
} }
lua_pushstring(L, entry->d_name); lua_pushstring(L, entry->d_name);
return 1; return 1 + lua_dir_iter_pushtype(L, entry);
} }
static int static int
lua_dir_iter_close(lua_State *L) lua_dir_iter_close(lua_State *L)
{ {
DIR *dp, **dpp; DIR *dp, **dpp;
dpp = (DIR **)lua_touserdata(L, 1); dpp = (DIR **)lua_touserdata(L, 1);
▲ Show 20 Lines • Show All 259 Lines • ▼ Show 20 Lines
}; };
#undef REG_SIMPLE #undef REG_SIMPLE
int int
luaopen_lfs(lua_State *L) luaopen_lfs(lua_State *L)
{ {
register_metatable(L); register_metatable(L);
luaL_newlib(L, fslib); luaL_newlib(L, fslib);
#ifdef _STANDALONE
/* Non-standard extension for loader, used with lfs.dir(). */
lua_pushinteger(L, DT_DIR);
lua_setfield(L, -2, "DT_DIR");
#endif
return 1; return 1;
} }