Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1263077 - Stop using parseInt in the Add-on SDK when specifying octal numbers now that JS has the new octal notation. r=dietrich

Browse Source
This commit is contained in:
Jonathan Watt 2016-03-22 13:21:15 +00:00
parent 87827f2189
commit 4b7a85789e
8 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addon-sdk/source/lib/sdk/io/file.js
View File

@ -142,7 +142,7 @@ exports.open = function open(filename, mode) {
var openFlags = OPEN_FLAGS.WRONLY |
OPEN_FLAGS.CREATE_FILE |
OPEN_FLAGS.TRUNCATE;
var permFlags = parseInt("0644", 8); // u+rw go+r
var permFlags = 0o644; // u+rw go+r
try {
stream.init(file, openFlags, permFlags, 0);
}
@ -178,7 +178,7 @@ exports.remove = function remove(path) {
exports.mkpath = function mkpath(path) {
var file = MozFile(path);
if (!file.exists())
file.create(Ci.nsIFile.DIRECTORY_TYPE, parseInt("0755", 8)); // u+rwx go+rx
file.create(Ci.nsIFile.DIRECTORY_TYPE, 0o755); // u+rwx go+rx
else if (!file.isDirectory())
throw new Error("The path already exists and is not a directory: " + path);
};

2
addon-sdk/source/lib/sdk/io/fs.js
View File

@ -41,7 +41,7 @@ const { REOPEN_ON_REWIND, DEFER_OPEN } = Ci.nsIFileInputStream;
const { DIRECTORY_TYPE, NORMAL_FILE_TYPE } = Ci.nsIFile;
const { NS_SEEK_SET, NS_SEEK_CUR, NS_SEEK_END } = Ci.nsISeekableStream;
const FILE_PERMISSION = parseInt("0666", 8);
const FILE_PERMISSION = 0o666;
const PR_UINT32_MAX = 0xfffffff;
// Values taken from:
// http://mxr.mozilla.org/mozilla-central/source/nsprpub/pr/include/prio.h#615

6
addon-sdk/source/test/addons/content-permissions/httpd.js
View File

@ -2046,7 +2046,7 @@ function maybeAddHeaders(file, metadata, response)
return;
const PR_RDONLY = 0x01;
var fis = new FileInputStream(headerFile, PR_RDONLY, parseInt("444", 8),
var fis = new FileInputStream(headerFile, PR_RDONLY, 0o444,
Ci.nsIFileInputStream.CLOSE_ON_EOF);
try
@ -2572,7 +2572,7 @@ ServerHandler.prototype =
var type = this._getTypeFromFile(file);
if (type === SJS_TYPE)
{
var fis = new FileInputStream(file, PR_RDONLY, parseInt("444", 8),
var fis = new FileInputStream(file, PR_RDONLY, 0o444,
Ci.nsIFileInputStream.CLOSE_ON_EOF);
try
@ -2666,7 +2666,7 @@ ServerHandler.prototype =
maybeAddHeaders(file, metadata, response);
response.setHeader("Content-Length", "" + count, false);
var fis = new FileInputStream(file, PR_RDONLY, parseInt("444", 8),
var fis = new FileInputStream(file, PR_RDONLY, 0o444,
Ci.nsIFileInputStream.CLOSE_ON_EOF);
offset = offset || 0;

6
addon-sdk/source/test/addons/e10s-content/lib/httpd.js
View File

@ -2047,7 +2047,7 @@ function maybeAddHeaders(file, metadata, response)
return;
const PR_RDONLY = 0x01;
var fis = new FileInputStream(headerFile, PR_RDONLY, parseInt("444", 8),
var fis = new FileInputStream(headerFile, PR_RDONLY, 0o444,
Ci.nsIFileInputStream.CLOSE_ON_EOF);
try
@ -2573,7 +2573,7 @@ ServerHandler.prototype =
var type = this._getTypeFromFile(file);
if (type === SJS_TYPE)
{
var fis = new FileInputStream(file, PR_RDONLY, parseInt("444", 8),
var fis = new FileInputStream(file, PR_RDONLY, 0o444,
Ci.nsIFileInputStream.CLOSE_ON_EOF);
try
@ -2667,7 +2667,7 @@ ServerHandler.prototype =
maybeAddHeaders(file, metadata, response);
response.setHeader("Content-Length", "" + count, false);
var fis = new FileInputStream(file, PR_RDONLY, parseInt("444", 8),
var fis = new FileInputStream(file, PR_RDONLY, 0o444,
Ci.nsIFileInputStream.CLOSE_ON_EOF);
offset = offset || 0;

6
addon-sdk/source/test/addons/places/lib/httpd.js
View File

@ -2046,7 +2046,7 @@ function maybeAddHeaders(file, metadata, response)
return;
const PR_RDONLY = 0x01;
var fis = new FileInputStream(headerFile, PR_RDONLY, parseInt("444", 8),
var fis = new FileInputStream(headerFile, PR_RDONLY, 0o444,
Ci.nsIFileInputStream.CLOSE_ON_EOF);
try
@ -2572,7 +2572,7 @@ ServerHandler.prototype =
var type = this._getTypeFromFile(file);
if (type === SJS_TYPE)
{
var fis = new FileInputStream(file, PR_RDONLY, parseInt("444", 8),
var fis = new FileInputStream(file, PR_RDONLY, 0o444,
Ci.nsIFileInputStream.CLOSE_ON_EOF);
try
@ -2666,7 +2666,7 @@ ServerHandler.prototype =
maybeAddHeaders(file, metadata, response);
response.setHeader("Content-Length", "" + count, false);
var fis = new FileInputStream(file, PR_RDONLY, parseInt("444", 8),
var fis = new FileInputStream(file, PR_RDONLY, 0o444,
Ci.nsIFileInputStream.CLOSE_ON_EOF);
offset = offset || 0;

2
addon-sdk/source/test/fixtures/child-process-scripts.js vendored
View File

@ -66,7 +66,7 @@ function makeExecutable (name) {
let { CC } = require('chrome');
let nsILocalFile = CC('@mozilla.org/file/local;1', 'nsILocalFile', 'initWithPath');
let file = nsILocalFile(name);
file.permissions = parseInt('0777', 8);
file.permissions = 0o777;
}
function deleteFile (name) {

6
addon-sdk/source/test/lib/httpd.js
View File

@ -2047,7 +2047,7 @@ function maybeAddHeaders(file, metadata, response)
return;
const PR_RDONLY = 0x01;
var fis = new FileInputStream(headerFile, PR_RDONLY, parseInt("444", 8),
var fis = new FileInputStream(headerFile, PR_RDONLY, 0o444,
Ci.nsIFileInputStream.CLOSE_ON_EOF);
try
@ -2573,7 +2573,7 @@ ServerHandler.prototype =
var type = this._getTypeFromFile(file);
if (type === SJS_TYPE)
{
var fis = new FileInputStream(file, PR_RDONLY, parseInt("444", 8),
var fis = new FileInputStream(file, PR_RDONLY, 0o444,
Ci.nsIFileInputStream.CLOSE_ON_EOF);
try
@ -2667,7 +2667,7 @@ ServerHandler.prototype =
maybeAddHeaders(file, metadata, response);
response.setHeader("Content-Length", "" + count, false);
var fis = new FileInputStream(file, PR_RDONLY, parseInt("444", 8),
var fis = new FileInputStream(file, PR_RDONLY, 0o444,
Ci.nsIFileInputStream.CLOSE_ON_EOF);
offset = offset || 0;

20
addon-sdk/source/test/test-fs.js
View File

@ -510,12 +510,12 @@ exports["test fs.chmod"] = function (assert, done) {
testPerm("0755")()
.then(testPerm("0777"))
.then(testPerm("0666"))
.then(testPerm(parseInt("0511", 8)))
.then(testPerm(parseInt("0200", 8)))
.then(testPerm(0o511))
.then(testPerm(0o200))
.then(testPerm("0040"))
.then(testPerm("0000"))
.then(testPermSync(parseInt("0777", 8)))
.then(testPermSync(parseInt("0666", 8)))
.then(testPermSync(0o777))
.then(testPermSync(0o666))
.then(testPermSync("0511"))
.then(testPermSync("0200"))
.then(testPermSync("0040"))
@ -524,20 +524,20 @@ exports["test fs.chmod"] = function (assert, done) {
assert.pass("Successful chmod passes");
}, assert.fail)
// Test invalid paths
.then(() => chmod("not-a-valid-file", parseInt("0755", 8)))
.then(() => chmod("not-a-valid-file", 0o755))
.then(assert.fail, (err) => {
checkPermError(err, "not-a-valid-file");
})
.then(() => chmod("not-a-valid-file", parseInt("0755", 8), "sync"))
.then(() => chmod("not-a-valid-file", 0o755, "sync"))
.then(assert.fail, (err) => {
checkPermError(err, "not-a-valid-file");
})
// Test invalid files
.then(() => chmod("resource://not-a-real-file", parseInt("0755", 8)))
.then(() => chmod("resource://not-a-real-file", 0o755))
.then(assert.fail, (err) => {
checkPermError(err, "resource://not-a-real-file");
})
.then(() => chmod("resource://not-a-real-file", parseInt("0755", 8), 'sync'))
.then(() => chmod("resource://not-a-real-file", 0o755, 'sync'))
.then(assert.fail, (err) => {
checkPermError(err, "resource://not-a-real-file");
})
@ -603,8 +603,8 @@ exports["test fs.chmod"] = function (assert, done) {
if (!isWindows)
return mode;
var ANY_READ = parseInt("0444", 8);
var ANY_WRITE = parseInt("0222", 8);
var ANY_READ = 0o444;
var ANY_WRITE = 0o222;
var winMode = 0;
// On Windows, if WRITE is true, then READ is also true