diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2010-06-04 10:58:25 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2010-06-04 10:58:25 +0000 |
| commit | 2812aa7b991f88489f57958cf4fcc213895e660f (patch) | |
| tree | a2198d460597fcfc4b7aed74a2e61d3c31b6e72b /Build/source | |
| parent | 2300ccb10e93ce75ca3e3dcf2b26bd4600761a47 (diff) | |
texmfmp.c: include kpathsea/concatn.h.
git-svn-id: svn://tug.org/texlive/trunk@18716 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/texk/web2c/lib/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/web2c/lib/texmfmp.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index 6e4cc6f6186..3479a239a1f 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,3 +1,8 @@ +2010-06-04 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * texmfmp.c: include kpathsea/concatn.h and remove cast + for concatn (). + 2010-05-24 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * texmfmp.c: on win32, all restricted shell escape commands are diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index 6bfe2ea1338..0c62e00bb5b 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -19,6 +19,7 @@ #include <kpathsea/variable.h> #include <kpathsea/absolute.h> #include <kpathsea/recorder.h> +#include <kpathsea/concatn.h> #include <time.h> /* For `struct tm'. */ #if defined (HAVE_SYS_TIME_H) @@ -416,16 +417,16 @@ shell_cmd_is_allowed (const char *cmd, char **safecmd, char **cmdname) while (*r && !Isspace(*r)) r++; if (*r == '\0') - q = (char *) concatn ("\"", p, "/", *safecmd, "\"", NULL); + q = concatn ("\"", p, "/", *safecmd, "\"", NULL); else { *r = '\0'; r++; while (*r && Isspace(*r)) r++; if (*r) - q = (char *) concatn ("\"", p, "/", *safecmd, "\" ", r, NULL); + q = concatn ("\"", p, "/", *safecmd, "\" ", r, NULL); else - q = (char *) concatn ("\"", p, "/", *safecmd, "\"", NULL); + q = concatn ("\"", p, "/", *safecmd, "\"", NULL); } free (p); free (*safecmd); |