mirror of
https://github.com/coderaiser/cloudcmd.git
synced 2026-01-24 03:05:41 +00:00
minor changes
This commit is contained in:
parent
0e68a5fd93
commit
4aa887dff6
1 changed files with 24 additions and 2 deletions
|
|
@ -40,14 +40,14 @@ exports.listen = function(pServer){
|
|||
function getExec(error, stdout, stderr) {
|
||||
if(stdout){
|
||||
if(Win32_b)
|
||||
stdout = win2unicode(stdout);
|
||||
stdout = win2unicode2(stdout);
|
||||
|
||||
console.log(stdout);
|
||||
Socket.send(stdout);
|
||||
}
|
||||
if(stderr){
|
||||
if(Win32_b)
|
||||
stderr = win2unicode(stderr);
|
||||
stderr = win2unicode2(stderr);
|
||||
|
||||
console.log('stderr: ' + stderr);
|
||||
Socket.send(stderr);
|
||||
|
|
@ -70,4 +70,26 @@ function win2unicode(bytes) {
|
|||
for (var i= 0; i<n; i++)
|
||||
chars[i]= encoding.charAt(bytes.charCodeAt(i));
|
||||
return chars.join('');
|
||||
}
|
||||
|
||||
/**
|
||||
* Windows-1251 to Unicode converter
|
||||
* Useful when having to use GET query parameters.
|
||||
* e.g. unescaped "%F2%E5%EA%F1%F2", "òåêñò" becomes "текст"
|
||||
* Source: http://xpoint.ru/know-how/JavaScript/PoleznyieFunktsii?38#PerekodirovkaIzWindows1251IKOI
|
||||
*/
|
||||
function win2unicode2(str) {
|
||||
var charmap = unescape(
|
||||
"%u0402%u0403%u201A%u0453%u201E%u2026%u2020%u2021%u20AC%u2030%u0409%u2039%u040A%u040C%u040B%u040F"+
|
||||
"%u0452%u2018%u2019%u201C%u201D%u2022%u2013%u2014%u0000%u2122%u0459%u203A%u045A%u045C%u045B%u045F"+
|
||||
"%u00A0%u040E%u045E%u0408%u00A4%u0490%u00A6%u00A7%u0401%u00A9%u0404%u00AB%u00AC%u00AD%u00AE%u0407"+
|
||||
"%u00B0%u00B1%u0406%u0456%u0491%u00B5%u00B6%u00B7%u0451%u2116%u0454%u00BB%u0458%u0405%u0455%u0457")
|
||||
var code2char = function(code) {
|
||||
if(code >= 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
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue