diff options
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 9 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ptexmac.h | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ttf2afm.c | 1 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/utils.c | 12 |
4 files changed, 22 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index c3e9d7fa26a..f9cc6792e1c 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,12 @@ +2012-09-03 Peter Breitenlohner <peb@mppmu.mpg.de> + + * utils.c [WIN32] (printID): Convert file names '\\' -> '/'. + +2012-08-25 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ttf2afm.c: Drop '#include <libgen.h>', we use xbasename(). + * ptexmac.h: Avoid C++ style comment. + 2012-08-10 Peter Breitenlohner <peb@mppmu.mpg.de> * ptexmac.h: Drop unused definition of M_PI & Co. diff --git a/Build/source/texk/web2c/pdftexdir/ptexmac.h b/Build/source/texk/web2c/pdftexdir/ptexmac.h index d7ba8b60e84..cbace854592 100644 --- a/Build/source/texk/web2c/pdftexdir/ptexmac.h +++ b/Build/source/texk/web2c/pdftexdir/ptexmac.h @@ -21,7 +21,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. # define PDFTEXMAC # ifdef WIN32 -// Why relying on gmalloc() ??? +/* Why relying on gmalloc() ??? */ # define gmalloc(n) xmalloc(n) # define gfree(p) free(p) # define inline __inline diff --git a/Build/source/texk/web2c/pdftexdir/ttf2afm.c b/Build/source/texk/web2c/pdftexdir/ttf2afm.c index 93fa933b730..5b85b3645ed 100644 --- a/Build/source/texk/web2c/pdftexdir/ttf2afm.c +++ b/Build/source/texk/web2c/pdftexdir/ttf2afm.c @@ -29,7 +29,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <kpathsea/kpathsea.h> #include <time.h> -#include <libgen.h> #include <pdftexdir/ptexmac.h> #include <pdftexdir/writettf.h> #include <string.h> diff --git a/Build/source/texk/web2c/pdftexdir/utils.c b/Build/source/texk/web2c/pdftexdir/utils.c index 965f845b52d..f9012d0d935 100644 --- a/Build/source/texk/web2c/pdftexdir/utils.c +++ b/Build/source/texk/web2c/pdftexdir/utils.c @@ -21,6 +21,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <sys/types.h> #include <regex.h> +#include <kpathsea/config.h> #include <kpathsea/c-proto.h> #include <kpathsea/c-stat.h> #include <kpathsea/c-fopen.h> @@ -767,6 +768,17 @@ void printID(strnumber filename) /* get the file name */ if (getcwd(pwd, sizeof(pwd)) == NULL) pdftex_fail("getcwd() failed (%s), path too long?", strerror(errno)); +#ifdef WIN32 + { + char *p; + for (p = pwd; *p; p++) { + if (*p == '\\') + *p = '/'; + else if (IS_KANJI(p)) + p++; + } + } +#endif file_name = makecstring(filename); md5_append(&state, (const md5_byte_t *) pwd, strlen(pwd)); md5_append(&state, (const md5_byte_t *) "/", 1); |