Various %c weirdness

(cherry picked from commit 393db0fc7dd7c7a40a834aeac49846f33c4f9757)

diff --git a/src/bsd.c b/src/bsd.c
index e77af917e244967fecaa137786946ff5c0f3dfb8..36be4a32cbee483bb99be8150062c71045dfdc3a 100644 (file)
--- a/src/bsd.c
+++ b/src/bsd.c
@@ -3544,6 +3544,7 @@ announce_connect(dbref player, int isnew, int num)
     global_eval_context.wnxt[j] = NULL;
   for (j = 0; j < NUMQ; j++)
     global_eval_context.rnxt[j] = NULL;
+  strcpy(global_eval_context.ccom, "");
 
   /* do the person's personal connect action */
   (void) queue_attribute(player, "ACONNECT", player);

diff --git a/src/console.c b/src/console.c
index 00933c996d6e88b6e4c085c45f482e1684a9f02a..5e06c3d2c79b43f821a5b248e1b13d0d3e50a666 100644 (file)
--- a/src/console.c
+++ b/src/console.c
@@ -2826,6 +2826,7 @@ announce_connect(dbref player, int isnew, int num)
     global_eval_context.wnxt[j] = NULL;
   for (j = 0; j < NUMQ; j++)
     global_eval_context.rnxt[j] = NULL;
+  strcpy(global_eval_context.ccom, "");
 
   /* do the person's personal connect action */
   (void) queue_attribute(player, "ACONNECT", player);
@@ -2896,6 +2897,7 @@ announce_disconnect(dbref player)
       global_eval_context.wnxt[j] = NULL;
     for (j = 0; j < NUMQ; j++)
       global_eval_context.rnxt[j] = NULL;
+    strcpy(global_eval_context.ccom, "");
 
     /* Setup all connect information as info to pass */
     (void) queue_attribute(player, "ADISCONNECT", player);

diff --git a/src/cque.c b/src/cque.c
index b370bd9e46a767af25c7c36c89da24ae5eba5376..300970ea298f0d46c825ea82f07b66aedd337642 100644 (file)
--- a/src/cque.c
+++ b/src/cque.c
@@ -650,8 +650,10 @@ do_top(int ncom)
 
   for (i = 0; i < ncom; i++) {
 
-    if (!qfirst)
+    if (!qfirst) {
+      strcpy(global_eval_context.ccom, "");
       return i;
+    }
     /* We must dequeue before execution, so that things like
      * queued @kick or @ps get a sane queue image.
      */

diff --git a/src/timer.c b/src/timer.c
index e66fa4fb71002d47ed87e86d68aa3e8f591751d2..9ddc82eab8e1aadaa1713955247a01dd15b114fa 100644 (file)
--- a/src/timer.c
+++ b/src/timer.c
@@ -234,6 +234,7 @@ dispatch(void)
     global_eval_context.cplr = NOTHING;
     strcpy(global_eval_context.ccom, "purge");
     purge();
+    strcpy(global_eval_context.ccom, "");
   }
 
   if (options.dbck_counter <= mudtime) {
@@ -242,6 +243,7 @@ dispatch(void)
     global_eval_context.cplr = NOTHING;
     strcpy(global_eval_context.ccom, "dbck");
     dbck();
+    strcpy(global_eval_context.ccom, "");
   }
 
   if (idle_counter <= mudtime) {
@@ -257,6 +259,7 @@ dispatch(void)
     global_eval_context.cplr = NOTHING;
     strcpy(global_eval_context.ccom, "dump");
     fork_and_dump(1);
+    strcpy(global_eval_context.ccom, "");
     flag_broadcast(0, "ON-VACATION", "%s",
                   T
                   ("Your ON-VACATION flag is set! If you're back, clear it."));
@@ -274,6 +277,7 @@ dispatch(void)
     global_eval_context.cplr = NOTHING;
     strcpy(global_eval_context.ccom, "warnings");
     run_topology();
+    strcpy(global_eval_context.ccom, "");
   }
 #ifdef MUSHCRON
   if((mudtime % 60) == 0)