Changeset 703 for trunk/guitools/shared/rxrpclib.vrs

Timestamp:

Jun 13, 2012, 12:08:42 PM (13 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: Updates in EVFSGUI/SMBMON/Shared code

File:

• trunk/guitools/shared/rxrpclib.vrs (modified) (11 diffs)

trunk/guitools/shared/rxrpclib.vrs

@@ -19 +19 @@
     password = arg(3)
 
+    call VRSet VRWindow(), 'Pointer', 'Wait'
     say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumdomgroups" 'debuglevel' '
     address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumdomgroups" 'debuglevel' >'samba.!msg
+    call VRSet VRWindow(), 'Pointer', '<default>'
 
     rpc.enumdomgroups. = ""
@@ -75 +77 @@
     password = arg(3)
 
+    call VRSet VRWindow(), 'Pointer', 'Wait'
     say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumdomusers" 'debuglevel' '
     address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="enumdomusers" 'debuglevel' >'samba.!msg
+    call VRSet VRWindow(), 'Pointer', '<default>'
 
     rpc.enumdomusers. = ""
@@ -133 +137 @@
     usercred = '--user='username'%'password
 
+    call VRSet VRWindow(), 'Pointer', 'Wait'
     say     '  'samba.!rpcclientexe' 'server' 'usercred' --command="enumprinters" 'debuglevel' '
     address cmd samba.!rpcclientexe' 'server' 'usercred' --command="enumprinters" 'debuglevel' >'samba.!msg
+    call VRSet VRWindow(), 'Pointer', '<default>'
 
     rpc.enumprinters. = ""
@@ -183 +189 @@
     password = arg(3)
 
+    call VRSet VRWindow(), 'Pointer', 'Wait'
     say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="netshareenum" 'debuglevel' '
     address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="netshareenum" 'debuglevel' >'samba.!msg
+    call VRSet VRWindow(), 'Pointer', '<default>'
 
     rpc.netshareenum. = ""
@@ -235 +243 @@
     share    = arg(4)
 
+    call VRSet VRWindow(), 'Pointer', 'Wait'
     say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="netsharegetinfo 'share'" 'debuglevel' '
     address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="netsharegetinfo 'share'" 'debuglevel' >'samba.!msg
+    call VRSet VRWindow(), 'Pointer', '<default>'
 
     rpc.netsharegetinfo. = ""
@@ -343 +353 @@
     userrid  = arg(4)
 
+    call VRSet VRWindow(), 'Pointer', 'Wait'
     say '  'samba.!rpcclientexe' 'server' --user='username'%'password' --command="queryuser 'userrid'" 'debuglevel' '
     address cmd samba.!rpcclientexe' 'server' --user='username'%'password' --command="queryuser 'userrid'" 'debuglevel' >'samba.!msg
+    call VRSet VRWindow(), 'Pointer', '<default>'
 
     rpc.queryuser. = ""
@@ -390 +402 @@
 /*:VRX         _rpcsrvinfo
 */
-_rpcsrvinfo:  procedure expose rpc. samba. options.  debuglevel
+_rpcsrvinfo:  procedure expose rpc. samba. options.  debuglevel tempdir
     IF options.!debug == 1 THEN SAY time()" _rpcsrvinfo() started"
     server   = arg(1)
     username = arg(2)
     password = arg(3)
+
+    /* Initialize temporary files */    
+    rpcinfo.!msg = SysTempFileName(TempDir||"rpcinfo_msg.???")
+    rpcinfo.!err = SysTempFileName(TempDir||"rpcinfo_err.???")
+    ok = stream(rpcinfo.!msg,'c','close')
+    ok = stream(rpcinfo.!err,'c','close')
+    ok = SysFileDelete(rpcinfo.!msg)
+    ok = SysFileDelete(rpcinfo.!err)
 
     usercred = '--user='username'%'password
     if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
 
-    say     '  'samba.!rpcclientexe' 'server' 'usercred' --command="srvinfo" 'debuglevel' 2>'samba.!error' 1>'samba.!msg
-    address cmd samba.!rpcclientexe' 'server' 'usercred' --command="srvinfo" 'debuglevel' 2>'samba.!error' 1>'samba.!msg
+    call VRSet VRWindow(), 'Pointer', 'Wait'
+    say     '  'samba.!rpcclientexe' 'server' 'usercred' --command="srvinfo" 'debuglevel' 2>'rpcinfo.!err' 1>'rpcinfo.!msg
+    address cmd samba.!rpcclientexe' 'server' 'usercred' --command="srvinfo" 'debuglevel' 2>'rpcinfo.!err' 1>'rpcinfo.!msg
+    call VRSet VRWindow(), 'Pointer', '<default>'
 
     rpc.srvinfo. = ""
 
     Failure = 0
-    do while lines(samba.!error) > 0
-        rpcline = linein(samba.!error)
-        say "  "samba.!error":"rpcline
-        if pos("UNSUCCESSFUL", rpcline) > 0 then do
-            ok = stream(samba.!error,'c','close')
-            ok = SysFileDelete(samba.!error)
+    do while lines(rpcinfo.!err) > 0
+        rpcline = linein(rpcinfo.!err)
+        IF options.!debug == 1 THEN say "  "rpcinfo.!err': "'rpcline'"'
+        if pos("UNSUCCESSFUL", translate(rpcline)) > 0 | pos("CANNOT CONNECT", translate(rpcline)) > 0 then do
+            ok = stream(rpcinfo.!msg,'c','close')
+            ok = stream(rpcinfo.!err,'c','close')
+            ok = SysFileDelete(rpcinfo.!msg)
+            ok = SysFileDelete(rpcinfo.!err)
             Failure = 1
             retval = 0
@@ -421 +445 @@
 
     SIGNAL ON SYNTAX NAME RPCERROR
-    do until lines(samba.!msg) = 0
-        rpcline = linein(samba.!msg)
+    do until lines(rpcinfo.!msg) = 0
+        rpcline = linein(rpcinfo.!msg)
         if pos("creating default valid table",rpcline) <> 0 then iterate
 
@@ -444 +468 @@
             rpc.srvinfo.CAPABILITIES = ""
             do I = 1 to words(rpc.srvinfo.SERVERSTRING)
-                say "Word "I":"word(rpc.srvinfo.SERVERSTRING,I)
+                /* say "Word "I":"word(rpc.srvinfo.SERVERSTRING,I) */
                 if length(word(rpc.srvinfo.SERVERSTRING,I)) >=4 then leave
                 if length(word(rpc.srvinfo.SERVERSTRING,I)) = 2 | length(word(rpc.srvinfo.SERVERSTRING,I)) = 3 then do
@@ -460 +484 @@
     SIGNAL OFF SYNTAX
 
-    ok = stream(samba.!msg,'c','close')
-    ok = SysFileDelete(samba.!msg)
+    ok = stream(rpcinfo.!msg,'c','close')
+    ok = stream(rpcinfo.!err,'c','close')
+    ok = SysFileDelete(rpcinfo.!msg)
+    ok = SysFileDelete(rpcinfo.!err)
 
     if Failure = 0 then do
@@ -477 +503 @@
 
 RPCERROR:
-    ok = stream(samba.!msg,'c','close')
-    ok = SysFileDelete(samba.!msg)
+    ok = stream(rpcinfo.!msg,'c','close')
+    ok = stream(rpcinfo.!err,'c','close')
+    ok = SysFileDelete(rpcinfo.!msg)
+    ok = SysFileDelete(rpcinfo.!err)
+
     say "  rpc parsing error in line "sigl": "strip(sourceline(sigl))
     retval = -1