require improvements, remove global Util

sys/network/samba.lua

@@ -1,5 +1,5 @@
+local Event  = require('event')
 local Socket = require('socket')
-local Event = require('event')
 
 local fileUid = 0
 local fileHandles = { }

sys/network/snmp.lua

@@ -1,6 +1,7 @@
+local Event  = require('event')
+local GPS    = require('gps')
 local Socket = require('socket')
-local GPS = require('gps')
-local Event = require('event')
+local Util   = require('util')
 
 -- move this into gps api
 local gpsRequested

sys/network/telnet.lua

@@ -1,10 +1,13 @@
+local Event  = require('event')
 local Socket = require('socket')
-local Event = require('event')
+local Util   = require('util')
 
 local function telnetHost(socket)
 
-  require = requireInjector(getfenv(1))
+  requireInjector(getfenv(1))
+
   local Event = require('event')
+
   local methods = { 'clear', 'clearLine', 'setCursorPos', 'write', 'blit',
                     'setTextColor', 'setTextColour', 'setBackgroundColor',
                     'setBackgroundColour', 'scroll', 'setCursorBlink', }

sys/network/trust.lua

@@ -1,6 +1,8 @@
-local Socket = require('socket')
-local Event  = require('event')
-local Crypto = require('crypto')
+local Crypto   = require('crypto')
+local Event    = require('event')
+local Security = require('security')
+local Socket   = require('socket')
+local Util     = require('util')
 
 Event.addRoutine(function()
 
@@ -12,7 +14,7 @@ Event.addRoutine(function()
 
     local data = socket:read(2)
     if data then
-      local password = os.getPassword()
+      local password = Security.getPassword()
       if not password then
         socket:write({ msg = 'No password has been set' })
       else

sys/network/vnc.lua

@@ -1,5 +1,6 @@
-local Socket = require('socket')
 local Event  = require('event')
+local Socket = require('socket')
+local Util   = require('util')
 
 local function wrapTerm(socket, termInfo)
   local methods = { 'blit', 'clear', 'clearLine', 'setCursorPos', 'write',