Remove the @ps command

Author: gtaylor

src/mux/commands/command.c

@@ -175,12 +175,6 @@ NameTable pose_sw[] = {{"default", 1, CA_PUBLIC, 0},
                        {"nospace", 1, CA_PUBLIC, SAY_NOSPACE},
                        {nullptr, 0, 0, 0}};
 
-NameTable ps_sw[] = {{"all", 1, CA_PUBLIC, PS_ALL | SW_MULTIPLE},
-                     {"brief", 1, CA_PUBLIC, PS_BRIEF},
-                     {"long", 1, CA_PUBLIC, PS_LONG},
-                     {"summary", 1, CA_PUBLIC, PS_SUMM},
-                     {nullptr, 0, 0, 0}};
-
 NameTable set_sw[] = {{"quiet", 1, CA_PUBLIC, SET_QUIET}, {nullptr, 0, 0, 0}};
 
 NameTable stats_sw[] = {{"all", 1, CA_PUBLIC, STAT_ALL},
@@ -506,7 +500,6 @@ CMDENT command_table[] = {
      CS_TWO_ARG | CS_UNPARSE,
      {.invoke = do_pemit}},
     {"@power", nullptr, CA_WIZARD, 0, CS_TWO_ARG, {.invoke = do_power}},
-    {"@ps", ps_sw, CA_WIZARD, 0, CS_ONE_ARG | CS_INTERP, {.invoke = do_ps}},
     {"@readcache", nullptr, CA_WIZARD, 0, CS_NO_ARGS, {.invoke = do_readcache}},
     {"@robot",
      nullptr,

src/mux/commands/command.h

@@ -97,7 +97,6 @@ void do_password(CommandInvocation *invocation); /* Change my password */
 void do_pcreate(CommandInvocation *invocation);
 void do_pemit(CommandInvocation *invocation); /* Message a specific object. */
 void do_power(CommandInvocation *invocation); /* Sets powers */
-void do_ps(CommandInvocation *invocation);    /* List contents of queue */
 void do_kick(CommandInvocation *invocation);  /* Force queue processing */
 void do_quit(CommandInvocation *invocation);  /* Disconnect this session */
 void do_readcache(CommandInvocation *invocation); /* Reread text file cache */

src/mux/commands/command_queue.c

@@ -988,160 +988,6 @@ int do_top(CommandQueue *queue, int ncmds) {
   return count;
 }
 
-/*
- * ---------------------------------------------------------------------------
- * * do_ps: tell player what commands they have pending in the queue
- */
-
-static void show_que(EvaluationContext *evaluation, DbRef player, int key,
-                     BQUE *queue, RuntimeClock *clock, int *qent,
-                     const char *header) {
-  BQUE *tmp;
-  char *bp, *bufp;
-  int i;
-
-  for (tmp = queue; tmp; tmp = tmp->next) {
-    (*qent)++;
-    if (key == PS_SUMM)
-      continue;
-    if (*qent == 1)
-      notify_printf(evaluation, player, "----- %s Queue -----", header);
-
-    bufp = unparse_object(evaluation->world->database, evaluation, player,
-                          tmp->player, 0);
-    if (!(key & PS_ALL))
-      if ((player !=
-           game_object_owner(evaluation->world->database, tmp->player)))
-        continue;
-    if ((tmp->waittime > 0) &&
-        is_good_obj(evaluation->world->database, tmp->sem))
-      notify_printf(evaluation, player, "[#%ld/%ld]%s:%s", tmp->sem,
-                    tmp->waittime - clock->now, bufp, tmp->comm);
-    else if (tmp->waittime > 0)
-      notify_printf(evaluation, player, "[%ld]%s:%s",
-                    tmp->waittime - clock->now, bufp, tmp->comm);
-    else if (is_good_obj(evaluation->world->database, tmp->sem))
-      notify_printf(evaluation, player, "[#%ld]%s:%s", tmp->sem, bufp,
-                    tmp->comm);
-    else
-      notify_printf(evaluation, player, "%s:%s", bufp, tmp->comm);
-
-    bp = bufp;
-    if (key == PS_LONG) {
-      for (i = 0; i < (tmp->nargs); i++) {
-        if (tmp->env[i] != nullptr) {
-          safe_str("; Arg", bufp, &bp);
-          safe_chr((char)(i + '0'), bufp, &bp);
-          safe_str("='", bufp, &bp);
-          safe_str(tmp->env[i], bufp, &bp);
-          safe_chr('\'', bufp, &bp);
-        }
-      }
-      *bp = '\0';
-      bp = unparse_object(evaluation->world->database, evaluation, player,
-                          tmp->cause, 0);
-      notify_printf(evaluation, player, "   Enactor: %s%s", bp, bufp);
-      free_lbuf(bp);
-    }
-    free_lbuf(bufp);
-  }
-  return;
-}
-
-void do_ps(CommandInvocation *invocation) {
-  EvaluationContext *evaluation = &invocation->context->evaluation;
-  DbRef player = invocation->player;
-  int key = invocation->key;
-  char *target = invocation->first;
-  CommandQueue *queue = invocation->context->runtime->commands;
-  DbRef player_targ, obj_targ;
-  int pqent, pqtot, wqent, wqtot, sqent, sqtot;
-  OBJQE *objq;
-  int tempkey;
-
-  /*
-   * Figure out what to list the queue for
-   */
-
-  if ((key & PS_ALL) && !is_wizard(queue->world->database, player)) {
-    notify(evaluation, player, "Permission denied.");
-    return;
-  }
-  if (!target || !*target) {
-    obj_targ = NOTHING;
-    if (key & PS_ALL) {
-      player_targ = NOTHING;
-    } else {
-      player_targ = game_object_owner(queue->world->database, player);
-      if (typeof_obj(queue->world->database, player) != TYPE_PLAYER)
-        obj_targ = player;
-    }
-  } else {
-    player_targ = game_object_owner(queue->world->database, player);
-    obj_targ = match_controlled(&invocation->context->match, player, target);
-    if (obj_targ == NOTHING)
-      return;
-    if (key & PS_ALL) {
-      notify(evaluation, player, "Can't specify a target and /all");
-      return;
-    }
-    if (typeof_obj(queue->world->database, obj_targ) == TYPE_PLAYER) {
-      player_targ = obj_targ;
-      obj_targ = NOTHING;
-    }
-  }
-  tempkey = key;
-  key = key & ~PS_ALL;
-  switch (key) {
-  case PS_BRIEF:
-  case PS_SUMM:
-  case PS_LONG:
-    break;
-  default:
-    notify(evaluation, player, "Illegal combination of switches.");
-    return;
-  }
-
-  /*
-   * Go do it
-   */
-  pqent = 0;
-  pqtot = 0;
-  if (player_targ == NOTHING) {
-    objq = queue->head;
-    while (objq && (objq = objq->next) != nullptr) {
-      pqent = 0;
-      show_que(evaluation, player, tempkey, objq->cque, queue->clock, &pqent,
-               "PLAYAH");
-      pqtot += pqent;
-    }
-  } else {
-    pqent = 0;
-    objq = cque_find(queue, player_targ);
-    if (objq) {
-      show_que(evaluation, player, tempkey, objq->cque, queue->clock, &pqent,
-               "PLAYAH");
-    }
-  }
-
-  wqent = 0;
-  sqent = 0;
-  wqtot = 0;
-  sqtot = 0;
-  show_que(evaluation, player, tempkey, queue->wait, queue->clock, &wqent,
-           "Wait");
-  show_que(evaluation, player, tempkey, queue->semaphore_first, queue->clock,
-           &sqent, "Semaphore");
-
-  /*
-   * Display stats
-   */
-
-  notify_printf(evaluation, player,
-                "Totals: Player...%d/%d  Wait...%d/%d  Semaphore...%d/%d",
-                pqent, pqtot, wqent, wqtot, sqent, sqtot);
-}
-
 /*
  * ---------------------------------------------------------------------------
  * * do_kick: Queue management

src/mux/server/server_api.h

@@ -199,10 +199,6 @@ constexpr int PEMIT_CONTENTS = 8; /* Send to contents (additive) */
 constexpr int PEMIT_HERE = 16;    /* Send to location (@femit, additive) */
 constexpr int PEMIT_ROOM = 32;    /* Send to containing rm (@femit, additive) */
 constexpr int PEMIT_LIST = 64;    /* Send to a list */
-constexpr int PS_BRIEF = 0;       /* Short PS report */
-constexpr int PS_LONG = 1;        /* Long PS report */
-constexpr int PS_SUMM = 2;        /* Queue counts only */
-constexpr int PS_ALL = 4;         /* List entire queue */
 constexpr int SAY_SAY = 1;        /* say in current room */
 constexpr int SAY_NOSPACE = 1;    /* OR with xx_EMIT to get nospace form */
 constexpr int SAY_POSE = 2;       /* pose in current room */