Connection: always assume UTF-8 for directory listings (for now)

Author: mscdex

lib/connection.js

@@ -4,7 +4,8 @@ var fs = require('fs'),
     Socket = require('net').Socket,
     EventEmitter = require('events').EventEmitter,
     inherits = require('util').inherits,
-    inspect = require('util').inspect;
+    inspect = require('util').inspect,
+    StringDecoder = require('string_decoder').StringDecoder;
 
 var Parser = require('./parser');
 var XRegExp = require('xregexp').XRegExp;
@@ -432,13 +433,16 @@ FTP.prototype.list = function(path, zcomp, cb) {
     }
 
     var sockerr, done = false, replies = 0, entries, buffer = '', source = sock;
+    var decoder = new StringDecoder('utf8');
 
     if (zcomp) {
       source = zlib.createInflate();
       sock.pipe(source);
     }
 
-    source.on('data', function(chunk) { buffer += chunk.toString('binary'); });
+    source.on('data', function(chunk) {
+      buffer += decoder.write(chunk);
+    });
     source.once('error', function(err) {
       if (!sock.aborting)
         sockerr = err;
@@ -447,6 +451,10 @@ FTP.prototype.list = function(path, zcomp, cb) {
     source.once('close', ondone);
 
     function ondone() {
+      if (decoder) {
+        buffer += decoder.end();
+        decoder = null;
+      }
       done = true;
       final();
     }