fs: fix symlink error message

vkurchatkin · chrisdickinson · commit f6556b678d93 · 2014-11-15T17:01:13.000-08:00
the arguments were swapped, so fs.symlink{Sync,} would report that the wrong file EEXIST'd in error. Fixes: nodejs/node-v0.x-archive#8651 Fixes: nodejs/node-v0.x-archive#4314 Fixes: nodejs/node-v0.x-archive#5381 PR-URL: nodejs/node-v0.x-archive#8657 Reviewed-by: Chris Dickinson <christopher.s.dickinson@gmail.com>
diff --git a/src/node_file.cc b/src/node_file.cc
@@ -515,9 +515,9 @@ static void Symlink(const FunctionCallbackInfo<Value>& args) {
   }
 
   if (args[3]->IsFunction()) {
-    ASYNC_DEST_CALL(symlink, args[3], *dest, *dest, *path, flags)
+    ASYNC_DEST_CALL(symlink, args[3], *path, *dest, *path, flags)
   } else {
-    SYNC_DEST_CALL(symlink, *path, *dest, *dest, *path, flags)
+    SYNC_DEST_CALL(symlink, *dest, *path, *dest, *path, flags)
   }
 }
 
diff --git a/test/simple/test-fs-error-messages.js b/test/simple/test-fs-error-messages.js
@@ -56,6 +56,10 @@ fs.link(existingFile, existingFile2, function(err) {
   assert.ok(0 <= err.message.indexOf(existingFile2));
 });
 
+fs.symlink(existingFile, existingFile2, function(err) {
+  assert.ok(0 <= err.message.indexOf(existingFile2));
+});
+
 fs.unlink(fn, function(err) {
   assert.ok(0 <= err.message.indexOf(fn));
 });
@@ -153,6 +157,14 @@ try {
   assert.ok(0 <= err.message.indexOf(existingFile2));
 }
 
+try {
+  ++expected;
+  fs.symlinkSync(existingFile, existingFile2);
+} catch (err) {
+  errors.push('symlink');
+  assert.ok(0 <= err.message.indexOf(existingFile2));
+}
+
 try {
   ++expected;
   fs.unlinkSync(fn);

Original file line number	Diff line number	Diff line change
`@@ -515,9 +515,9 @@ static void Symlink(const FunctionCallbackInfo<Value>& args) {`
`515`	`515`	`}`
`516`	`516`
`517`	`517`	`if (args[3]->IsFunction()) {`
`518`		`- ASYNC_DEST_CALL(symlink, args[3], dest, dest, *path, flags)`
	`518`	`+ ASYNC_DEST_CALL(symlink, args[3], path, dest, *path, flags)`
`519`	`519`	`} else {`
`520`		`- SYNC_DEST_CALL(symlink, path, dest, dest, path, flags)`
	`520`	`+ SYNC_DEST_CALL(symlink, dest, path, dest, path, flags)`
`521`	`521`	`}`
`522`	`522`	`}`
`523`	`523`