diff --git a/lib/server/socket.js b/lib/server/socket.js index d8ad1b1e..2c1c1a33 100644 --- a/lib/server/socket.js +++ b/lib/server/socket.js @@ -2,7 +2,8 @@ var io = require('socket.io'), exec = require('child_process').exec, - Socket = {}; + Socket = {}, + Win32_b = process.platform === 'win32'; /** * Function listen on servers port @@ -20,9 +21,9 @@ exports.listen = function(pServer){ socket.on('message', function(pCommand) { console.log(pCommand); - /* change code page to unicode and then back to cp866 */ - if(process.platform === 'win32') - pCommand = 'chcp 65001 |' + pCommand + '&& chcp 866'; + /* change code page to unicode */ + if(Win32_b) + pCommand = 'chcp 65001 |' + pCommand; exec(pCommand, getExec); }); @@ -49,41 +50,9 @@ function getExec(error, stdout, stderr) { if (error !== null) { console.log('exec error: ' + error); - } + } + + /* change code page back to cp866 */ + if(Win32_b) + exec('chcp 866'); } - - -// Windows code page 1251 Cyrillic -//var encodings = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\u0402\u0403\u201a\u0453\u201e\u2026\u2020\u2021\u20ac\u2030\u0409\u2039\u040a\u040c\u040b\u040f\u0452\u2018\u2019\u201c\u201d\u2022\u2013\u2014\ufffd\u2122\u0459\u203a\u045a\u045c\u045b\u045f\xa0\u040e\u045e\u0408\xa4\u0490\xa6\xa7\u0401\xa9\u0404\xab\xac\xad\xae\u0407\xb0\xb1\u0406\u0456\u0491\xb5\xb6\xb7\u0451\u2116\u0454\xbb\u0458\u0405\u0455\u0457\u0410\u0411\u0412\u0413\u0414\u0415\u0416\u0417\u0418\u0419\u041a\u041b\u041c\u041d\u041e\u041f\u0420\u0421\u0422\u0423\u0424\u0425\u0426\u0427\u0428\u0429\u042a\u042b\u042c\u042d\u042e\u042f\u0430\u0431\u0432\u0433\u0434\u0435\u0436\u0437\u0438\u0439\u043a\u043b\u043c\u043d\u043e\u043f\u0440\u0441\u0442\u0443\u0444\u0445\u0446\u0447\u0448\u0449\u044a\u044b\u044c\u044d\u044e\u044f', -// Windows code page 1252 -var encoding = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\u20ac\ufffd\u201a\u0192\u201e\u2026\u2020\u2021\u02c6\u2030\u0160\u2039\u0152\ufffd\u017d\ufffd\ufffd\u2018\u2019\u201c\u201d\u2022\u2013\u2014\u02dc\u2122\u0161\u203a\u0153\ufffd\u017e\u0178\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff'; - -function win2unicode(bytes) { - var n= bytes.length; - var chars= new Array(n); - for (var i= 0; i= 0xC0 && code <= 0xFF) return String.fromCharCode(code - 0xC0 + 0x0410) - if(code >= 0x80 && code <= 0xBF) return charmap.charAt(code - 0x80) - return String.fromCharCode(code) - } - var res = "" - for(var i = 0; i < str.length; i++) res = res + code2char(str.charCodeAt(i)) - return res -} \ No newline at end of file