Changeset 1136

Timestamp:

Sep 1, 2008, 9:22:31 AM (17 years ago)

Author:

John Small

Message:

Add/improve error handling.

Location:

trunk

Files:

• ReleaseEdit.cmd (modified) (3 diffs)
• ReleaseTool.cmd (modified) (2 diffs)
• cfgmgr.cmd (modified) (4 diffs, 1 prop)

trunk/ReleaseEdit.cmd

@@ -15 +15 @@
  *
 */
+
+signal on Error
+signal on FAILURE name Error
+signal on Halt
+signal on NOTREADY name Error
+signal on NOVALUE name Error
+signal on SYNTAX name Error
+/*
+signal on novalue             /* for debugging */
+*/
+
 parse arg ver file .
-if ver = '' | stream(file, 'c', 'query exists') = '' then
-   signal Usage                 /* and exit */
+if ver = '' | file = '' then
+   call Usage 0                 /* and exit */
+else if stream(file, 'c', 'query exists') = '' then
+   call Usage 2                 /* and exit */
 parse var ver major '.' minor '.' CSDLevel
 if CSDlevel = '' then
@@ -63 +76 @@
 
 Usage:
+   parse arg plus
         say;say;say
-        lastline = sigl - 3
+        lastline = sigl - (14 + plus)
         do i = 1 to lastline
                 say sourceline(i)
@@ -70 +84 @@
 exit
 
+/*=== Error() Report ERROR, FAILURE etc. and exit ===*/
+
+Error:
+  say
+  parse source . . cmd
+  say 'CONDITION'('C') 'signaled at' cmd 'line' SIGL'.'
+  if 'CONDITION'('D') \= '' then
+    say 'REXX reason =' 'CONDITION'('D')'.'
+  if 'CONDITION'('C') == 'SYNTAX' & 'SYMBOL'('RC') == 'VAR' then
+    say 'REXX error =' RC '-' 'ERRORTEXT'(RC)'.'
+  else if 'SYMBOL'('RC') == 'VAR' then
+    say 'RC =' RC'.'
+  say 'Source =' 'SOURCELINE'(SIGL)
+
+  if 'CONDITION'('I') \== 'CALL' | 'CONDITION'('C') == 'NOVALUE' | 'CONDITION'('C') == 'SYNTAX' then do
+    trace '?A'
+    say 'Exiting.'
+    call 'SYSSLEEP' 2
+    exit 'CONDITION'('C')
+  end
+
+  return
+
+novalue:
+   say 'Uninitialized variable: ' || condition('D') || ' on line: 'sigl
+   say 'Line text: 'sourceline(sigl)
+   cfg.errorcode = 3
+   signal ErrorExit
+
+

trunk/ReleaseTool.cmd

@@ -23 +23 @@
 n = setlocal()
 
-signal on novalue
+signal on Error
+signal on FAILURE name Error
+signal on Halt
+signal on NOTREADY name Error
+signal on NOVALUE name Error
+signal on SYNTAX name Error
+/*
+signal on novalue             /* for debugging */
+*/
+
 
 globals = 'cmd prompt editor editorcmds'
@@ -472 +481 @@
 return
 
-/*
-                          Upload Information Template for Hobbes.nmsu.edu
-                          ===============================================
-
-        Archive Filename: fm2-3-12-0.wpi
-       Short Description: Mark Kimes FM/2 File Manager 3.12.0
-        Long Description: The package contains a warpin package for installing FM2.
-                          The FM2 source code is available on netlabs.
-      Proposed directory
-           for placement: os2/util/browser
-
-               Your name: Gregg Young
-           Email address: ygk@qwest.net
-    Program contact name: (same)
-   Program contact email: (same)
-             Program URL: http://svn.netlabs.org/fm2
-
-      Would you like the
-   contact email address
-    included in listings? yes
-
-Operating System/Version: OS/2 Warp 3.0 and up.
- Additional requirements:
-
-                Replaces: fm2-3-11-0.wpi
-*/
-/*
-                        do 11
-                                line = linein(HobbesTxtFilename)
-                        end
-                        name = strip(substr(line, wordpos(line, 3)))
-                        line = linein(HobbesTxtFilename)
-                        email = strip(substr(line, wordpos(line, 3)))
-                        do 7
-                                line = linein(HobbesTxtFilename)
-                        end
-                        OKtoListEmail = strip(substr(line, wordpos(line, 4)))
-                        do 5
-                                line = linein(HobbesTxtFilename)
-                        end
-                        replaced_wpi = word(line, 2)
-*/
-
+/*=== Error() Report ERROR, FAILURE etc. and exit ===*/
+
+Error:
+  say
+  parse source . . cmd
+  say 'CONDITION'('C') 'signaled at' cmd 'line' SIGL'.'
+  if 'CONDITION'('D') \= '' then
+    say 'REXX reason =' 'CONDITION'('D')'.'
+  if 'CONDITION'('C') == 'SYNTAX' & 'SYMBOL'('RC') == 'VAR' then
+    say 'REXX error =' RC '-' 'ERRORTEXT'(RC)'.'
+  else if 'SYMBOL'('RC') == 'VAR' then
+    say 'RC =' RC'.'
+  say 'Source =' 'SOURCELINE'(SIGL)
+
+  if 'CONDITION'('I') \== 'CALL' | 'CONDITION'('C') == 'NOVALUE' | 'CONDITION'('C') == 'SYNTAX' then do
+    trace '?A'
+    say 'Exiting.'
+    call 'SYSSLEEP' 2
+    exit 'CONDITION'('C')
+  end
+
+  return
+
+novalue:
+   say 'Uninitialized variable: ' || condition('D') || ' on line: 'sigl
+   say 'Line text: 'sourceline(sigl)
+   cfg.errorcode = 3
+   signal ErrorExit
+
+

trunk/cfgmgr.cmd

@@ -1 +1 @@
 /*
-::      $Id: $
+::      $Id$
 
    CFGMGR.CMD - manage installation, maintenance and deinstallation
@@ -30 +30 @@
 
 n = setlocal()
-t = time('e')
-signal on novalue                 /* for debugging */
+
+signal on Error
+signal on FAILURE name Error
+signal on Halt
+signal on NOTREADY name Error
+signal on NOVALUE name Error
+signal on SYNTAX name Error
+/*
+signal on novalue             /* for debugging */
+*/
 
 call RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
@@ -477 +485 @@
    say 'through the FM2USER group on Yahoo.'
 exit
-
-novalue:
-   say 'Uninitialized variable: ' || condition('D') || ' on line: 'sigl
-   say 'Line text: 'sourceline(sigl)
-   cfg.errorcode = 3
-   signal ErrorExit
 
 CfgAction: procedure expose (globals)
@@ -638 +640 @@
 return
 
+/*=== Error() Report ERROR, FAILURE etc. and exit ===*/
+
+Error:
+  say
+  parse source . . cmd
+  say 'CONDITION'('C') 'signaled at' cmd 'line' SIGL'.'
+  if 'CONDITION'('D') \= '' then
+    say 'REXX reason =' 'CONDITION'('D')'.'
+  if 'CONDITION'('C') == 'SYNTAX' & 'SYMBOL'('RC') == 'VAR' then
+    say 'REXX error =' RC '-' 'ERRORTEXT'(RC)'.'
+  else if 'SYMBOL'('RC') == 'VAR' then
+    say 'RC =' RC'.'
+  say 'Source =' 'SOURCELINE'(SIGL)
+
+  if 'CONDITION'('I') \== 'CALL' | 'CONDITION'('C') == 'NOVALUE' | 'CONDITION'('C') == 'SYNTAX' then do
+    trace '?A'
+    say 'Exiting.'
+    call 'SYSSLEEP' 2
+    exit 'CONDITION'('C')
+  end
+
+  return
+
+/* end Error */
+
+novalue:
+   say 'Uninitialized variable: ' || condition('D') || ' on line: 'sigl
+   say 'Line text: 'sourceline(sigl)
+   cfg.errorcode = 3
+   signal ErrorExit
+
+