1. Fixed compiler warning

2. Added appLocation() to service-manager

modules/clipboard.js

@@ -32,7 +32,7 @@ function nativeAddModule(name)
             ret += ('memcpy_s(_' + name.split('-').join('') + ' + ' + i + ', ' + (tmp.length - i) + ', "' + chunk + '", ' + chunk.length + ');\n');
             i += chunk.length;
         }
-        ret += ('ILibBase64DecodeEx(_' + name.split('-').join('') + ', ' + tmp.length + ', _' + name.split('-').join('') + ' + ' + tmp.length + ');\n');
+        ret += ('ILibBase64DecodeEx((unsigned char*)_' + name.split('-').join('') + ', ' + tmp.length + ', (unsigned char*)_' + name.split('-').join('') + ' + ' + tmp.length + ');\n');
         ret += ('duk_push_global_object(ctx);duk_get_prop_string(ctx, -1, "addModule");duk_swap_top(ctx, -2);duk_push_string(ctx, "' + name + '");duk_push_string(ctx, _' + name.split('-').join('') + ' + ' + tmp.length + ');\n');
         ret += ('duk_pcall_method(ctx, 2); duk_pop(ctx);\n');
         ret += ('free(_' + name.split('-').join('') + ');\n');

modules/service-manager.js

@@ -190,6 +190,13 @@ function serviceManager()
                     require('events').inherits(retVal);
                     retVal.on('~', function () { this._proxy.CloseServiceHandle(this); this._proxy.CloseServiceHandle(this._scm); });
                     retVal.name = name;
+
+                    retVal.appLocation = function ()
+                    {
+                        var reg = require('win-registry');
+                        var imagePath = reg.QueryKey(reg.HKEY.LocalMachine, 'SYSTEM\\CurrentControlSet\\Services\\' + this.name, 'ImagePath').toString();
+                        return (imagePath.split('.exe')[0] + '.exe');
+                    };
                     retVal.isRunning = function ()
                     {
                         var bytesNeeded = this._GM.CreateVariable(this._GM.PointerSize);
@@ -255,6 +262,23 @@ function serviceManager()
                         if ((platform == 'init' && require('fs').existsSync('/etc/init.d/' + name)) ||
                             (platform == 'upstart' && require('fs').existsSync('/etc/init/' + name + '.conf')))
                         {
+                            ret.appLocation = function appLocation()
+                            {
+                                var child = require('child_process').execFile('/bin/sh', ['sh']);
+                                child.stdout.str = '';
+                                child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
+                                if(appLocation.platform == 'init')
+                                {
+                                    child.stdin.write("cat /etc/init.d/" + this.name + " | grep 'SCRIPT=' | awk -F= '{print $2}'\nexit\n");
+                                }
+                                else
+                                {
+                                    child.stdin.write("cat /etc/init/" + this.name + ".conf | grep 'exec ' | awk '{print $2}'\nexit\n");
+                                }
+                                child.waitExit();
+                                return (child.stdout.str.trim());
+                            };
+                            ret.appLocation.platform = platform;
                             ret.isRunning = function isRunning()
                             {
                                 var child = require('child_process').execFile('/bin/sh', ['sh']);
@@ -305,6 +329,22 @@ function serviceManager()
                         if (require('fs').existsSync('/lib/systemd/system/' + name + '.service') ||
                             require('fs').existsSync('/usr/lib/systemd/system/' + name + '.service'))
                         {
+                            ret.appLocation = function ()
+                            {
+                                var child = require('child_process').execFile('/bin/sh', ['sh']);
+                                child.stdout.str = '';
+                                child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
+                                if (require('fs').existsSync('/lib/systemd/system/' + this.name + '.service'))
+                                {
+                                    child.stdin.write("cat /lib/systemd/system/" + this.name + ".service | grep 'WorkingDirectory=' | awk -F= '{print $2}'\n\exit\n");
+                                }
+                                else
+                                {
+                                    child.stdin.write("cat /usr/lib/systemd/system/" + this.name + ".service | grep 'WorkingDirectory=' | awk -F= '{print $2}'\n\exit\n");
+                                }
+                                child.waitExit();
+                                return (child.stdout.str.trim() + '/' + this.name);
+                            };
                             ret.isRunning = function isRunning()
                             {
                                 var child = require('child_process').execFile('/bin/sh', ['sh']);
@@ -656,6 +696,10 @@ function serviceManager()
             switch (this.getServiceType())
             {
                 case 'init':
+                case 'upstart':
+                    if (require('fs').existsSync('/etc/init.d/' + name))
+                    {
+                        // init.d service
                         this._update = require('child_process').execFile('/bin/sh', ['sh']);
                         this._update.stdout.on('data', function (chunk) { });
                         this._update.stdin.write('service ' + name + ' stop\n');
@@ -670,23 +714,24 @@ function serviceManager()
                         catch (e) {
                             console.log(name + ' could not be uninstalled', e)
                         }
-                    break;
+                    }
-                case 'upstart':
+                    if (require('fs').existsSync('/etc/init/' + name + '.conf'))
+                    {
+                        // upstart service
                         this._update = require('child_process').execFile('/bin/sh', ['sh']);
                         this._update.stdout.on('data', function (chunk) { });
                         this._update.stdin.write('service ' + name + ' stop\n');
                         this._update.stdin.write('exit\n');
                         this._update.waitExit();
-                    try
+                        try {
-                    {
                             require('fs').unlinkSync('/etc/init/' + name + '.conf');
                             require('fs').unlinkSync('/usr/local/mesh_services/' + name + '/' + name);
                             console.log(name + ' uninstalled');
                         }
-                    catch (e)
+                        catch (e) {
-                    {
                             console.log(name + ' could not be uninstalled', e)
                         }
+                    }
                     break;
                 case 'systemd':
                     this._update = require('child_process').execFile('/bin/sh', ['sh'], { type: require('child_process').SpawnTypes.TERM });