From 4c26e61448f4c8045ff18de745ef0f8e7cf769ee Mon Sep 17 00:00:00 2001
From: Quinn Evans <heddwch@lambdaos.org>
Date: Sun, 27 Sep 2015 02:50:30 -0600
Subject: [PATCH] Move handling of "rest" argument colon to IRC-MSG, delete
 extra colon.

---
 IRC-MSG.COB | 17 ++++++++++++-----
 WOPO.COB    |  5 +----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/IRC-MSG.COB b/IRC-MSG.COB
index bc7134d..b75aa2f 100644
--- a/IRC-MSG.COB
+++ b/IRC-MSG.COB
@@ -3,7 +3,7 @@
 
        DATA DIVISION.
        WORKING-STORAGE SECTION.
-       01 PREFIX-WORK PIC X(96).
+       01 WORK PIC X(480).
        01 MSG-POINTER PIC 9(3).
 
        LINKAGE SECTION.
@@ -21,9 +21,11 @@
            03 PARAMETERS.
                05 TARGET PIC X(50).
                05 REST PIC X(480).
+	       05 REST-PREFIX REDEFINES REST PIC X.
+	           88 REST-PARAM VALUE ":".
 
        PROCEDURE DIVISION USING BUFFER, IRC-MESSAGE.
-           INITIALIZE IRC-MESSAGE, PREFIX-WORK, MSG-POINTER.
+           INITIALIZE IRC-MESSAGE, WORK, MSG-POINTER.
            IF HAS-PREFIX THEN
                PERFORM WITH-PREFIX
            ELSE
@@ -33,17 +35,22 @@
                INTO COMMAND, TARGET
                WITH POINTER MSG-POINTER.
            UNSTRING MSG-BODY,
-               DELIMITED BY "  ",
                INTO REST,
                WITH POINTER MSG-POINTER.
+	   IF REST-PARAM THEN
+	       MOVE REST TO WORK
+	       MOVE 2 TO MSG-POINTER
+	       UNSTRING WORK
+		 INTO REST
+		 WITH POINTER MSG-POINTER.
 
        WITH-PREFIX.
            MOVE 2 TO MSG-POINTER.
            UNSTRING MSG-BODY,
                DELIMITED BY SPACES,
-               INTO PREFIX-WORK,
+               INTO WORK,
                WITH POINTER MSG-POINTER.
-           UNSTRING PREFIX-WORK,
+           UNSTRING WORK,
                DELIMITED BY "!" OR "@",
                INTO NICK,
                     IDENT,
diff --git a/WOPO.COB b/WOPO.COB
index 081b68b..7d76448 100644
--- a/WOPO.COB
+++ b/WOPO.COB
@@ -55,7 +55,6 @@
            03 WORK PIC X(50).
            03 WORK-PREFIX REDEFINES WORK PIC X.
                88 IS-COMMAND VALUE "$".
-               88 REST-PARAM VALUE ":".
            03 PARAM PIC X(50) OCCURS 5 TIMES.
 	   03 REG PIC X(50) OCCURS 5 TIMES.
 
@@ -168,8 +167,6 @@
                PARAM(4)
                PARAM(5).
            MOVE PARAM(1) TO WORK.
-           IF REST-PARAM THEN
-               UNSTRING WORK DELIMITED BY ":" INTO PARAM(1), PARAM(1).
 
        VALIDATE-USER.
            MOVE NICK TO USER-NAME.
@@ -267,7 +264,7 @@
 
        HANDLE-SOURCE.
            PERFORM BEGIN-REPLY.
-           STRING ":HTTPS://GITHUB.COM/HEDDWCH/WOPO"
+           STRING "HTTPS://GITHUB.COM/HEDDWCH/WOPO"
                   INTO MSG-BODY
                   WITH POINTER MSG-LENGTH.
            PERFORM SEND-LINE.