Merge branch 'master' of ssh://gitrg/RedGreen/horrible-harry

hh/ghost.ans

@@ -19,5 +19,5 @@
 栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩
 栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩
 栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩
-栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩
-栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩
+   By:栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩
+ Beanzilla栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩栩

mystic.cpp

@@ -715,7 +715,8 @@ int mangle(int fd, const char *buffer, int len) {
           int r;
           char display[100] = "";
           const char *phrasing[] = {"^R1Haha^P1ha^P1ha", "Poof!", "Got U",
-                                    "Anyone there?", "^R1Knock, ^P1Knock"};
+                                    "Anyone there?", "^R1Knock, ^P1Knock",
+                                    "^G0101^C07^S6Segmentation Fault ^P1^S9(core ^C12^C24dumped^C07)^P2"};
           static LastSeen last_phrasing(2);
 
           ZF_LOGI("mangle(ANSI_CLS)");
@@ -728,6 +729,7 @@ int mangle(int fd, const char *buffer, int len) {
           // Add in random text, plus color!
           do {
             r = random() % ((sizeof(phrasing) / sizeof(char *)) - 1);
+            // Does this drop the last element in phrasing? (Seems like it takes awhile to get Seg Fault spoof, might be why)
           } while (last_phrasing.seen_before(r));
 
           int color = random() % 15 + 1;
@@ -753,8 +755,8 @@ int mangle(int fd, const char *buffer, int len) {
 
           // sprintf(display, "^P1^S3^C%02d%s^S0^R0%s^P1", color, phrasing[r],
           // restore_color);
-          // ZF_LOGI("mangle(ANSI_CLS): Inserted (%02d) %s", color,
-          // phrasing[r]);
+          // Added debug statement so we can identify what was sent... color, number picked and what that is
+          ZF_LOGD("mangle(ANSI_CLS): Inserted color=%02d r=%d phrase='%s'", color, r, phrasing[r]);
           ZF_LOGI_MEM(play, len, "mangle(ANSI_CLS) :");
 
           // Move the buffer so there's room for the display string.

render.cpp

@@ -1,8 +1,8 @@
-#include <unistd.h> // usleep
+#include <ctype.h>
 #include <stdio.h>
-#include <time.h>
 #include <string.h>
-#include <ctype.h>
+#include <time.h>
+#include <unistd.h> // usleep
 
 #include "render.h"
 #include "terminal.h"
@@ -41,7 +41,6 @@ void render_sleep(void) {
   }
 }
 
-
 /*
 Well SNAP!  Mystic numbers don't remotely match ANSI color codes.
 
@@ -448,7 +447,7 @@ void render(int fd, const char *string_out, int len) {
   // Check our time from time to time.
   // If we start running long, disable sleeps.
 
-  while ((trigger = strnstr(cp, len - (cp - trigger), TRIGGER)) != NULL) {
+  while ((trigger = strnstr(cp, len - (cp - string_out), TRIGGER)) != NULL) {
     // There is special things to handle in here.
     while (cp != trigger) {
       elapsed = time(NULL) - start;