Skip to content

Commit 55934a5

Browse files
authored
Use octal JS literals. NFC (#23022)
Followup to #23014
1 parent 724963b commit 55934a5

7 files changed

+13
-14
lines changed

src/library_fs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,7 @@ FS.staticInit();
13781378
FS.mkdir('/proc/self/fd');
13791379
FS.mount({
13801380
mount() {
1381-
var node = FS.createNode(proc_self, 'fd', {{{ cDefs.S_IFDIR }}} | {{{ 0777 }}}, {{{ cDefs.S_IXUGO }}});
1381+
var node = FS.createNode(proc_self, 'fd', {{{ cDefs.S_IFDIR | 0o777 }}}, {{{ cDefs.S_IXUGO }}});
13821382
node.node_ops = {
13831383
lookup(parent, name) {
13841384
var fd = +name;

src/library_lz4.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
addToLibrary({
99
$LZ4__deps: ['$FS', '$preloadPlugins'],
1010
$LZ4: {
11-
DIR_MODE: {{{ cDefs.S_IFDIR }}} | 511 /* 0777 */,
12-
FILE_MODE: {{{ cDefs.S_IFREG }}} | 511 /* 0777 */,
11+
DIR_MODE: {{{ cDefs.S_IFDIR | 0o777 }}},
12+
FILE_MODE: {{{ cDefs.S_IFREG | 0o777 }}},
1313
CHUNK_SIZE: -1,
1414
codec: null,
1515
init() {

src/library_memfs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ addToLibrary({
1818
$MEMFS: {
1919
ops_table: null,
2020
mount(mount) {
21-
return MEMFS.createNode(null, '/', {{{ cDefs.S_IFDIR }}} | 511 /* 0777 */, 0);
21+
return MEMFS.createNode(null, '/', {{{ cDefs.S_IFDIR | 0o777 }}}, 0);
2222
},
2323
createNode(parent, name, mode, dev) {
2424
if (FS.isBlkdev(mode) || FS.isFIFO(mode)) {
@@ -232,7 +232,7 @@ addToLibrary({
232232
return entries;
233233
},
234234
symlink(parent, newname, oldpath) {
235-
var node = MEMFS.createNode(parent, newname, 511 /* 0777 */ | {{{ cDefs.S_IFLNK }}}, 0);
235+
var node = MEMFS.createNode(parent, newname, 0o777 | {{{ cDefs.S_IFLNK }}}, 0);
236236
node.link = oldpath;
237237
return node;
238238
},

src/library_pipefs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ addToLibrary({
1212
mount(mount) {
1313
// Do not pollute the real root directory or its child nodes with pipes
1414
// Looks like it is OK to create another pseudo-root node not linked to the FS.root hierarchy this way
15-
return FS.createNode(null, '/', {{{ cDefs.S_IFDIR }}} | 511 /* 0777 */, 0);
15+
return FS.createNode(null, '/', {{{ cDefs.S_IFDIR }}} | 0o777, 0);
1616
},
1717
createPipe() {
1818
var pipe = {

src/library_sockfs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ addToLibrary({
4141
SOCKFS.on('close', (fd) => dbg(`websocket: close fd = ${fd}`));
4242
#endif
4343

44-
return FS.createNode(null, '/', {{{ cDefs.S_IFDIR }}} | 511 /* 0777 */, 0);
44+
return FS.createNode(null, '/', {{{ cDefs.S_IFDIR | 0o777 }}}, 0);
4545
},
4646
createSocket(family, type, protocol) {
4747
type &= ~{{{ cDefs.SOCK_CLOEXEC | cDefs.SOCK_NONBLOCK }}}; // Some applications may pass it; it makes no sense for a single process.

src/library_wasmfs.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,8 @@ FS.init();
178178
rmdir: (path) => FS.handleError(
179179
withStackSave(() => __wasmfs_rmdir(stringToUTF8OnStack(path)))
180180
),
181-
open: (path, flags, mode) => withStackSave(() => {
181+
open: (path, flags, mode = 0o666) => withStackSave(() => {
182182
flags = typeof flags == 'string' ? FS_modeStringToFlags(flags) : flags;
183-
mode = typeof mode == 'undefined' ? 438 /* 0666 */ : mode;
184183
var buffer = stringToUTF8OnStack(path);
185184
var fd = FS.handleError(__wasmfs_open(buffer, flags, mode));
186185
return { fd : fd };
@@ -449,7 +448,7 @@ FS.init();
449448
mkdev(path, mode, dev) {
450449
if (typeof dev === 'undefined') {
451450
dev = mode;
452-
mode = 438 /* 0666 */;
451+
mode = 0o666;
453452
}
454453

455454
var deviceBackend = wasmFSDevices[dev];
@@ -517,7 +516,7 @@ FS.init();
517516

518517
$FS_create__deps: ['$FS_mknod'],
519518
// Default settings copied from the legacy JS FS API.
520-
$FS_create: (path, mode = 438 /* 0666 */) => {
519+
$FS_create: (path, mode = 0o666) => {
521520
mode &= {{{ cDefs.S_IALLUGO }}};
522521
mode |= {{{ cDefs.S_IFREG }}};
523522
return FS_mknod(path, mode, 0);
@@ -546,7 +545,7 @@ FS.init();
546545
},
547546

548547
$FS_mkdir__deps: ['_wasmfs_mkdir'],
549-
$FS_mkdir: (path, mode = 511 /* 0777 */) => FS.handleError(withStackSave(() => {
548+
$FS_mkdir: (path, mode = 0o777) => FS.handleError(withStackSave(() => {
550549
var buffer = stringToUTF8OnStack(path);
551550
return __wasmfs_mkdir(buffer, mode);
552551
})),

src/library_workerfs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
addToLibrary({
88
$WORKERFS__deps: ['$FS'],
99
$WORKERFS: {
10-
DIR_MODE: {{{ cDefs.S_IFDIR }}} | 511 /* 0777 */,
11-
FILE_MODE: {{{ cDefs.S_IFREG }}} | 511 /* 0777 */,
10+
DIR_MODE: {{{ cDefs.S_IFDIR | 0o777 }}},
11+
FILE_MODE: {{{ cDefs.S_IFREG | 0o777 }}},
1212
reader: null,
1313
mount(mount) {
1414
assert(ENVIRONMENT_IS_WORKER);

0 commit comments

Comments
 (0)