(marc, navi): Permit any whitespace between route and optional

argument for radar, lookout, sonar, not just spaces.

diff --git a/src/lib/commands/marc.c b/src/lib/commands/marc.c
index 7b34d1c581dd4e699324122dc489e57007029616..3baa6e442c54875780916f8a2565f89d2458da55 100644 (file)
--- a/src/lib/commands/marc.c
+++ b/src/lib/commands/marc.c
@@ -80,7 +80,7 @@ march(void)
     }
 
     while (!QEMPTY(&land_list)) {
     }
 
     while (!QEMPTY(&land_list)) {

-       s_char *bp, dp[80];
+       char *bp, dp[80];

 
        if (cp == 0 || *cp == '\0' || stopping) {
            stopping = 0;
 
        if (cp == 0 || *cp == '\0' || stopping) {
            stopping = 0;


@@ -140,18 +140,15 @@ march(void)
            }
            continue;
        } else if (*cp == 'r' || *cp == 'l') {
            }
            continue;
        } else if (*cp == 'r' || *cp == 'l') {

-           bp = ++cp;
-           while ((*bp != ' ') && (*bp))
-               bp++;
-           while ((*bp == ' ') && (*bp))
-               bp++;
-           if ((bp != (s_char *)0) && (*bp))
+           for (bp = cp + 1; *bp && !isspace(bp); bp++) ;
+           for (; *bp && isspace(bp); bp++) ;
+           if (*bp)

                player->argp[1] = bp;
            else {
                sprintf(dp, "%d", lnd->lnd_uid);
                player->argp[1] = dp;
            }
                player->argp[1] = bp;
            else {
                sprintf(dp, "%d", lnd->lnd_uid);
                player->argp[1] = dp;
            }

-           if (cp[-1] == 'r') {
+           if (*cp++ == 'r') {

                player->argp[0] = "lradar";
                rada();
                skip = 1;
                player->argp[0] = "lradar";
                rada();
                skip = 1;

diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index 785f8a99d5af55fdc0c7ec61a1ea343f0f2a80fb..9eaad1361db460cb833cb4b3877f7451c7306cf8 100644 (file)
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -86,7 +86,7 @@ navi(void)
 
     *pt = '\0';
     while (!QEMPTY(&ship_list)) {
 
     *pt = '\0';
     while (!QEMPTY(&ship_list)) {

-       s_char *bp, dp[80];
+       char *bp, dp[80];

 
        if (cp == 0 || *cp == '\0' || stopping) {
            stopping = 0;
 
        if (cp == 0 || *cp == '\0' || stopping) {
            stopping = 0;


@@ -161,18 +161,15 @@ navi(void)
            }
            continue;
        } else if (*cp == 'r' || *cp == 'l' || *cp == 's') {
            }
            continue;
        } else if (*cp == 'r' || *cp == 'l' || *cp == 's') {

-           bp = ++cp;
-           while ((*bp != ' ') && (*bp))
-               bp++;
-           while ((*bp == ' ') && (*bp))
-               bp++;
-           if ((bp != (s_char *)0) && (*bp))
+           for (bp = cp + 1; *bp && !isspace(*bp); bp++) ;
+           for (; *bp && isspace(*bp); bp++) ;
+           if (*bp)

                player->argp[1] = bp;
            else {
                sprintf(dp, "%d", shp->shp_uid);
                player->argp[1] = dp;
            }
                player->argp[1] = bp;
            else {
                sprintf(dp, "%d", shp->shp_uid);
                player->argp[1] = dp;
            }

-           if (cp[-1] == 'r') {
+           if (*cp++ == 'r') {

                rada();
                skip = 1;
            } else if (cp[-1] == 'l')
                rada();
                skip = 1;
            } else if (cp[-1] == 'l')