diff options
author | mp <mp@FreeBSD.org> | 2009-07-11 05:35:08 +0000 |
---|---|---|
committer | mp <mp@FreeBSD.org> | 2009-07-11 05:35:08 +0000 |
commit | e5921a6fae9164c5f8ad6bb718db42f3f7a9e455 (patch) | |
tree | b22c970391cc429da340ec007eb76294ea034b89 /contrib/tcsh/sh.exec.c | |
parent | 9b2f8ecbb332eb8e16c52d1731de9082d102e68b (diff) | |
parent | 50eaa69b9f8628c1a960d67f9226b2178e1af1cb (diff) | |
download | FreeBSD-src-e5921a6fae9164c5f8ad6bb718db42f3f7a9e455.zip FreeBSD-src-e5921a6fae9164c5f8ad6bb718db42f3f7a9e455.tar.gz |
Update to tcsh 6.17.00.
Approved by: re (kensmith)
Diffstat (limited to 'contrib/tcsh/sh.exec.c')
-rw-r--r-- | contrib/tcsh/sh.exec.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/contrib/tcsh/sh.exec.c b/contrib/tcsh/sh.exec.c index d5a80fe..ee7a551 100644 --- a/contrib/tcsh/sh.exec.c +++ b/contrib/tcsh/sh.exec.c @@ -1,4 +1,4 @@ -/* $Header: /p/tcsh/cvsroot/tcsh/sh.exec.c,v 3.73 2006/08/24 20:56:31 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/sh.exec.c,v 3.75 2009/06/25 21:15:37 christos Exp $ */ /* * sh.exec.c: Search, find, and execute a command! */ @@ -32,7 +32,7 @@ */ #include "sh.h" -RCSID("$tcsh: sh.exec.c,v 3.73 2006/08/24 20:56:31 christos Exp $") +RCSID("$tcsh: sh.exec.c,v 3.75 2009/06/25 21:15:37 christos Exp $") #include "tc.h" #include "tw.h" @@ -402,9 +402,6 @@ texec(Char *sf, Char **st) */ if ((fd = xopen(f, O_RDONLY|O_LARGEFILE)) != -1) { int nread; -#ifdef O_TEXT - setmode(fd, O_TEXT); -#endif if ((nread = xread(fd, pref, 2)) == 2) { if (!isprint((unsigned char)pref[0]) && (pref[0] != '\n' && pref[0] != '\t')) { @@ -1069,7 +1066,7 @@ find_cmd(Char *cmd, int prt) int hashval, i, ex, rval = 0; if (prt && any(short2str(cmd), '/')) { - xprintf(CGETS(13, 7, "where: / in command makes no sense\n")); + xprintf("%s", CGETS(13, 7, "where: / in command makes no sense\n")); return rval; } @@ -1132,7 +1129,7 @@ find_cmd(Char *cmd, int prt) ex = executable(*pv, sv, 0); #ifdef FASTHASH if (!ex && (hashdebug & 2)) { - xprintf(CGETS(13, 10, "hash miss: ")); + xprintf("%s", CGETS(13, 10, "hash miss: ")); ex = 1; /* Force printing */ } #endif /* FASTHASH */ |