diff options
| author | Dmitry Chagin <dchagin@FreeBSD.org> | 2023-01-29 20:46:19 +0000 |
|---|---|---|
| committer | Dmitry Chagin <dchagin@FreeBSD.org> | 2023-01-29 20:46:19 +0000 |
| commit | 143ef44f06822f82a8358d4c02f07102d963fe5f (patch) | |
| tree | f9080b8a265dd926053ee7ae187e8fa46f3fb5e0 /sh.exec.c | |
| parent | 174d8b60324d7e8754709f7155e13ca95220b48c (diff) | |
Diffstat (limited to 'sh.exec.c')
| -rw-r--r-- | sh.exec.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sh.exec.c b/sh.exec.c index d327e3e6e519..4b111a0a9c4d 100644 --- a/sh.exec.c +++ b/sh.exec.c @@ -972,7 +972,7 @@ tellmewhat(struct wordent *lexp, Char **str) if (str == NULL) { if (aliased) prlex(lexp); - xprintf(CGETS(13, 5, "%S: shell built-in command.\n"), + xprintf(CGETS(13, 5, "%" TCSH_S ": shell built-in command.\n"), sp->word); flush(); } @@ -988,7 +988,7 @@ tellmewhat(struct wordent *lexp, Char **str) if (str == NULL) { if (aliased) prlex(lexp); - xprintf(CGETS(13, 5, "%S: shell built-in command.\n"), + xprintf(CGETS(13, 5, "%" TCSH_S ": shell built-in command.\n"), sp->word); flush(); } @@ -1042,7 +1042,8 @@ tellmewhat(struct wordent *lexp, Char **str) if (str == NULL) { if (aliased) prlex(lexp); - xprintf(CGETS(13, 6, "%S: Command not found.\n"), sp->word); + xprintf(CGETS(13, 6, "%" TCSH_S ": Command not found.\n"), + sp->word); flush(); } else @@ -1074,7 +1075,7 @@ dowhere(Char **v, struct command *c) found &= find_cmd(*v, 1); /* Make status nonzero if any command is not found. */ if (!found) - setcopy(STRstatus, STR1, VAR_READWRITE); + setstatus(1); } int @@ -1095,7 +1096,7 @@ find_cmd(Char *cmd, int prt) if (prt && adrof1(cmd, &aliases)) { if ((var = adrof1(cmd, &aliases)) != NULL) { - xprintf(CGETS(13, 8, "%S is aliased to "), cmd); + xprintf(CGETS(13, 8, "%" TCSH_S " is aliased to "), cmd); if (var->vec != NULL) blkpr(var->vec); xputchar('\n'); @@ -1109,7 +1110,7 @@ find_cmd(Char *cmd, int prt) if (eq(cmd, str2short(bptr->bname))) { rval = 1; if (prt) - xprintf(CGETS(13, 9, "%S is a shell built-in\n"), cmd); + xprintf(CGETS(13, 9, "%" TCSH_S " is a shell built-in\n"), cmd); else return rval; } @@ -1119,7 +1120,7 @@ find_cmd(Char *cmd, int prt) if (eq(cmd, str2short(bptr->bname))) { rval = 1; if (prt) - xprintf(CGETS(13, 9, "%S is a shell built-in\n"), cmd); + xprintf(CGETS(13, 9, "%" TCSH_S " is a shell built-in\n"), cmd); else return rval; } @@ -1159,8 +1160,8 @@ retry: if (ex) { rval = 1; if (prt) { - xprintf("%S/", *pv); - xprintf("%S\n", cmd); + xprintf("%" TCSH_S "/", *pv); + xprintf("%" TCSH_S "\n", cmd); } else return rval; |