(news, fina): Report bad conditionals as syntax error. Closes #775475.

diff --git a/src/lib/commands/fina.c b/src/lib/commands/fina.c
index 9ca0383e695109feff5ce3027a6079ad00f9ea7b..0998b92c0e4d1371413dfa953ebd52a7b6760cff 100644 (file)
--- a/src/lib/commands/fina.c
+++ b/src/lib/commands/fina.c
@@ -57,13 +57,14 @@ fina(void)
        pr("Loans are not enabled.\n");
        return RET_FAIL;
     }
+    if (!snxtitem(&ni, EF_LOAN, "*"))
+       return RET_SYN;
     (void)time(&now);
     pr("\n");
     pr("             -= Empire Financial Status Report =- \n");
     pr("                  ");
     prdate();
     pr("Loan       From            To        Rate   Dur     Paid      Total\n");
-    snxtitem(&ni, EF_LOAN, "*");
     while (nxtitem(&ni, &loan)) {
        if (loan.l_status != LS_SIGNED)
            continue;

diff --git a/src/lib/commands/news.c b/src/lib/commands/news.c
index 0350a9ab16e73119ab3f1a8a1b38872fcde530ca..2dc2bce3ea96994ca7f695d094ddc2cb104d7b4a 100644 (file)
--- a/src/lib/commands/news.c
+++ b/src/lib/commands/news.c
@@ -65,6 +65,8 @@ news(void)
     s_char num[128];
     s_char *verb;
 
+    if (!snxtitem(&nstr, EF_NEWS, "*"))
+       return RET_SYN;
     memset(page_has_news, 0, sizeof(page_has_news));
     memset(sectors_taken, 0, sizeof(sectors_taken));
     (void)head();
@@ -86,7 +88,6 @@ news(void)
 /*     if (then < now - days(3))
                then = now - days(3);
 */
-    snxtitem(&nstr, EF_NEWS, "*");
     pr("\nThe details of Empire news since %s", ctime(&then));
     while (nxtitem(&nstr, (s_char *)&nws)) {
        if (nws.nws_when < then)