commands: Rename the command functions

[empserver] / src / lib / commands / xdump.c

diff --git a/src/lib/commands/xdump.c b/src/lib/commands/xdump.c
index d758b1d334d344f87da06f480661b3149caf495f..37054155c01d3bd7aa701de91bb8fa4a37ba2d9b 100644 (file)
--- a/src/lib/commands/xdump.c
+++ b/src/lib/commands/xdump.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
  *  xdump.c: Extended dump
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2016
  */
 
 #include <config.h>
@@ -35,55 +35,42 @@
 #include <ctype.h>
 #include "commands.h"
 #include "empobj.h"
-#include "news.h"
 #include "optlist.h"
-#include "version.h"
 #include "xdump.h"
 
 /*
- * Is object P of type TYPE visible to the player?
+ * Is object @p of type @type visible to the player?
  * TODO: Fold this into interators.
  */
 static int
 xdvisible(int type, void *p)
 {
     struct empobj *gp = p;
-    struct trtstr *tp = p;
     struct lonstr *lp = p;
     struct natstr *natp;
     int tlev;
 
+    if (!empobj_in_use(type, p))
+       return 0;
+
     switch (type) {
     case EF_SECTOR:
-    case EF_REALM:
-       return gp->own == player->cnum || player->god;
     case EF_SHIP:
     case EF_PLANE:
     case EF_LAND:
     case EF_NUKE:
     case EF_LOST:
-       return gp->own != 0 && (gp->own == player->cnum || player->god);
-    case EF_NATION:
-       return ((struct natstr *)p)->nat_stat != STAT_UNUSED;
+    case EF_REALM:
+       return gp->own == player->cnum || player->god;
     case EF_COUNTRY:
        return gp->own == player->cnum;
     case EF_NEWS:
-       return ((struct nwsstr *)p)->nws_vrb != 0
-           && (!opt_HIDDEN || player->god); /* FIXME */
-    case EF_TREATY:
-       return tp->trt_status != TS_FREE
-           && (tp->trt_cna == player->cnum || tp->trt_cnb == player->cnum
-               || player->god);
+       return !opt_HIDDEN || player->god; /* FIXME */
     case EF_LOAN:
-       if (lp->l_status == LS_FREE)
-           return 0;
        if (lp->l_status == LS_SIGNED)
            return 1;
        return lp->l_loner == player->cnum || lp->l_lonee == player->cnum
            || player->god;
-    case EF_TRADE:
-    case EF_COMM:
-       return gp->own != 0;
     case EF_SHIP_CHR:
        tlev = ((struct mchrstr *)p)->m_tech;
        goto tech;
@@ -104,8 +91,6 @@ xdvisible(int type, void *p)
                return player->god;
        }
        goto tech;
-    case EF_NEWS_CHR:
-       return ((struct rptstr *)p)->r_newspage != 0;
     case EF_TABLE:
        return ((struct empfile *)p)->cadef != NULL;
     default:
@@ -114,8 +99,8 @@ xdvisible(int type, void *p)
 }
 
 /*
- * Dump meta-data for items of type TYPE to XD.
- * Return RET_SYN when TYPE doesn't have meta-data, else RET_OK.
+ * Dump meta-data for items of type @type to @xd.
+ * Return RET_SYN when @type doesn't have meta-data, else RET_OK.
  */
 static int
 xdmeta(struct xdstr *xd, int type)
@@ -133,7 +118,7 @@ xdmeta(struct xdstr *xd, int type)
     for (i = 0; ca[i].ca_name; i++) {
        if (ca[i].ca_flags & NSC_DEITY && !xd->divine)
            continue;
-       if (ca[i].ca_flags & NSC_EXTRA)
+       if (ca[i].ca_dump == CA_DUMP_NONE)
            continue;
        xdflds(xd, mdchr_ca, &ca[i]);
        xd->pr("\n");
@@ -146,7 +131,7 @@ xdmeta(struct xdstr *xd, int type)
 }
 
 /*
- * Dump items of type TYPE selected by ARG to XD.
+ * Dump items of type @type selected by @arg to @xd.
  * Return RET_OK on success, RET_SYN on error.
  */
 static int
@@ -155,7 +140,7 @@ xditem(struct xdstr *xd, int type, char *arg)
     struct castr *ca;
     struct nstr_item ni;
     int n;
-    char buf[2048];            /* FIXME buffer size? */
+    unsigned char buf[EF_WITH_CADEF_MAX_ENTRY_SIZE];
 
     ca = ef_cadef(type);
     if (!ca)
@@ -182,7 +167,7 @@ xditem(struct xdstr *xd, int type, char *arg)
 
 /* Extended dump command */
 int
-xdump(void)
+c_xdump(void)
 {
     char *p;
     char buf[1024];
@@ -199,7 +184,7 @@ xdump(void)
     if (!p || !*p)
        return RET_SYN;
 
-    xdinit(&xd, player->cnum, 0, pr);
+    xdinit(&xd, player->cnum, 0, 0, pr);
     natp = getnatp(player->cnum);
     type = isdigit(p[0]) ? atoi(p) : ef_byname(p);
     if (type < 0 || type >= EF_MAX)
@@ -211,7 +196,5 @@ xdump(void)
        pr("Access to table %s denied\n", ef_nameof(type));
        return RET_FAIL;
     }
-    if (type == EF_VERSION && !player->argp[2])
-       return xditem(&xd, type, "*"); /* backward compatibility */
     return xditem(&xd, type, player->argp[2]);
 }