From: Artem S. Povalyukhin <artem.povaluhin@gmail.com>
Date: Mon, 11 May 2020 06:58:28 +0000 (+0300)
Subject: Introduced fs.Error.code.
X-Git-Tag: 0.4.2~62
X-Git-Url: http://git.kaiwu.me/sitemap.xml?a=commitdiff_plain;h=f11e4fdec674c558b89284ce89bdc6972dd1a64c;p=njs.git

Introduced fs.Error.code.
---

diff --git a/src/njs_fs.c b/src/njs_fs.c
index 2d63452b..9d3b9cb7 100644
--- a/src/njs_fs.c
+++ b/src/njs_fs.c
@@ -873,9 +873,11 @@ njs_fs_error(njs_vm_t *vm, const char *syscall, const char *description,
     size_t        size;
     njs_int_t     ret;
     njs_value_t   value;
+    const char    *code;
     njs_object_t  *error;
 
     static const njs_value_t  string_errno = njs_string("errno");
+    static const njs_value_t  string_code = njs_string("code");
     static const njs_value_t  string_path = njs_string("path");
     static const njs_value_t  string_syscall = njs_string("syscall");
 
@@ -900,6 +902,20 @@ njs_fs_error(njs_vm_t *vm, const char *syscall, const char *description,
         if (njs_slow_path(ret != NJS_OK)) {
             return NJS_ERROR;
         }
+
+        code = njs_errno_string(errn);
+        size = njs_strlen(code);
+
+        ret = njs_string_new(vm, &value, (u_char *) code, size, size);
+        if (njs_slow_path(ret != NJS_OK)) {
+            return NJS_ERROR;
+        }
+
+        ret = njs_value_property_set(vm, retval, njs_value_arg(&string_code),
+                                     &value);
+        if (njs_slow_path(ret != NJS_OK)) {
+            return NJS_ERROR;
+        }
     }
 
     if (path != NULL) {
diff --git a/test/js/fs_promises_002.js b/test/js/fs_promises_002.js
index 0ad3e728..8345ca40 100644
--- a/test/js/fs_promises_002.js
+++ b/test/js/fs_promises_002.js
@@ -14,8 +14,7 @@ var testSync = new Promise((resolve, reject) => {
             fs.accessSync(fname + '___');
             failed = true;
         } catch(e) {
-            failed = (e.syscall != 'access');
-            // TODO: e.code != 'ENOENT'
+            failed = (e.syscall != 'access') || e.code != 'ENOENT';
         }
         resolve(failed);
     } catch (e) {
@@ -33,7 +32,8 @@ var testCallback = new Promise((resolve, reject) => {
         fs.access(fname, fs.constants.R_OK | fs.constants.W_OK, (err) => {
             failed |= (err !== undefined);
             fs.access(fname + '___', (err) => {
-                failed |= ((err === undefined) || (err.syscall != 'access'));
+                failed |= ((err === undefined) || (err.syscall != 'access')
+                                               || err.code != 'ENOENT');
                 resolve(failed);
             });
         });
@@ -66,6 +66,7 @@ Promise.resolve()
     console.log('testPromise failed');
 })
 .catch((e) => {
-    console.log('testPromise ok', (e.syscall == 'access') && (e.path == fname + '___'));
+    console.log('testPromise ok', (e.syscall == 'access') && (e.path == fname + '___')
+                                                          && e.code == 'ENOENT');
 })
 ;
diff --git a/test/js/fs_promises_004.js b/test/js/fs_promises_004.js
index 2d6f760a..873e787c 100644
--- a/test/js/fs_promises_004.js
+++ b/test/js/fs_promises_004.js
@@ -23,7 +23,7 @@ var testSync = () => new Promise((resolve, reject) => {
             fs.realpathSync(fname);
             throw new Error('fs.realpathSync error 1');
         } catch (e) {
-            if (e.syscall != 'realpath') { // e.code
+            if (e.syscall != 'realpath' || e.code != 'ENOENT') {
                 throw e;
             }
         }
@@ -79,7 +79,7 @@ var testCallback = () => new Promise((resolve, reject) => {
                 reject(new Error('fs.realpath error 1'));
                 return;
             }
-            if (err.syscall != 'realpath') {
+            if (err.syscall != 'realpath' || err.code != 'ENOENT') {
                 reject(err);
                 return;
             }
@@ -165,7 +165,7 @@ Promise.resolve()
 .then(() => fsp.realpath(fname)
             .then(() => { throw new Error('fsp.realpath error 1') }))
 .catch((e) => {
-    if (e.syscall != 'realpath') {
+    if (e.syscall != 'realpath' || e.code != 'ENOENT') {
         throw e;
     }
 })
diff --git a/test/njs_expect_test.exp b/test/njs_expect_test.exp
index 99131ab9..6abc00ad 100644
--- a/test/njs_expect_test.exp
+++ b/test/njs_expect_test.exp
@@ -511,7 +511,7 @@ njs_test {
     {"var fs = require('fs'); \r\n"
      "undefined\r\n>> "}
     {"fs.readFile('test/fs/nonexistent', 'utf8', function (e) {console.log(JSON.stringify(e))})\r\n"
-     "undefined\r\n{\"errno\":2,\"path\":\"test/fs/nonexistent\",\"syscall\":\"open\"}\r\n>> "}
+     "undefined\r\n{\"errno\":2,\"code\":\"ENOENT\",\"path\":\"test/fs/nonexistent\",\"syscall\":\"open\"}\r\n>> "}
 }
 
 njs_test {
@@ -571,7 +571,7 @@ njs_test {
     {"var fs = require('fs'); \r\n"
      "undefined\r\n>> "}
     {"try { fs.readFileSync('test/fs/nonexistent')} catch (e) {console.log(JSON.stringify(e))}\r\n"
-     "{\"errno\":2,\"path\":\"test/fs/nonexistent\",\"syscall\":\"open\"}\r\nundefined\r\n>> "}
+     "{\"errno\":2,\"code\":\"ENOENT\",\"path\":\"test/fs/nonexistent\",\"syscall\":\"open\"}\r\nundefined\r\n>> "}
 }
 
 njs_test {
@@ -648,7 +648,7 @@ njs_test {
     {"var fs = require('fs')\r\n"
      "undefined\r\n>> "}
     {"fs.writeFile('/invalid_path', 'ABC', function (e) { console.log(JSON.stringify(e))})\r\n"
-     "undefined\r\n{\"errno\":13,\"path\":\"/invalid_path\",\"syscall\":\"open\"}\r\n>> "}
+     "undefined\r\n{\"errno\":13,\"code\":\"EACCES\",\"path\":\"/invalid_path\",\"syscall\":\"open\"}\r\n>> "}
 }
 
 # require('fs').writeFileSync()