From 1afc0c9e86025693a157df935edbe72d7296055d Mon Sep 17 00:00:00 2001
From: Brendan Ashworth <brendan.ashworth@me.com>
Date: Wed, 1 Jul 2015 08:14:52 -0700
Subject: [PATCH] fs: fix error on bad listener type

When the listener was truthy but NOT a function, fs.watchFile would
throw an error through the EventEmitter. This caused a problem because
it would only be thrown after the listener was started, which left the
listener on.

There should be no backwards compatability issues because the error was
always thrown, just in a different manner.

Also adds tests for this and other basic functionality.

PR-URL: https://github.com/nodejs/io.js/pull/2093
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 lib/fs.js                          | 15 +++++++--------
 test/parallel/test-fs-watchfile.js | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 test/parallel/test-fs-watchfile.js

diff --git a/lib/fs.js b/lib/fs.js
index 58704e529747b2..9c13a82c41e5b1 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -1305,13 +1305,12 @@ StatWatcher.prototype.stop = function() {
 
 const statWatchers = new Map();
 
-fs.watchFile = function(filename) {
+fs.watchFile = function(filename, options, listener) {
   nullCheck(filename);
   filename = pathModule.resolve(filename);
   var stat;
-  var listener;
 
-  var options = {
+  var defaults = {
     // Poll interval in milliseconds. 5007 is what libev used to use. It's
     // a little on the slow side but let's stick with it for now to keep
     // behavioral changes to a minimum.
@@ -1319,14 +1318,14 @@ fs.watchFile = function(filename) {
     persistent: true
   };
 
-  if (arguments[1] !== null && typeof arguments[1] === 'object') {
-    options = util._extend(options, arguments[1]);
-    listener = arguments[2];
+  if (options !== null && typeof options === 'object') {
+    options = util._extend(defaults, options);
   } else {
-    listener = arguments[1];
+    listener = options;
+    options = defaults;
   }
 
-  if (!listener) {
+  if (typeof listener !== 'function') {
     throw new Error('watchFile requires a listener function');
   }
 
diff --git a/test/parallel/test-fs-watchfile.js b/test/parallel/test-fs-watchfile.js
new file mode 100644
index 00000000000000..a64858ce0f7154
--- /dev/null
+++ b/test/parallel/test-fs-watchfile.js
@@ -0,0 +1,17 @@
+'use strict';
+
+const fs = require('fs');
+const assert = require('assert');
+
+// Basic usage tests.
+assert.throws(function() {
+  fs.watchFile('./some-file');
+}, /watchFile requires a listener function/);
+
+assert.throws(function() {
+  fs.watchFile('./another-file', {}, 'bad listener');
+}, /watchFile requires a listener function/);
+
+assert.throws(function() {
+  fs.watchFile(new Object(), function() {});
+}, /Path must be a string/);