On 2002-05-22, Thomas Esser wrote > > 1. Edit some files. Here are diffs between the modified and "pure" src > > directories: > > Can you please resend using "diff -u" (preferred) or "diff -c"?
OK, here it is: diff -u teTeX-src-beta-20020402-gcc-mod/texk/ps2pkm \ teTeX-src-beta-20020402/texk/ps2pkm diff -u teTeX-src-beta-20020402-gcc-mod/texk/ps2pkm/basics.c teTeX-src-beta-2002 0402/texk/ps2pkm/basics.c --- teTeX-src-beta-20020402-gcc-mod/texk/ps2pkm/basics.c Wed May 15 09:16 :07 2002 +++ teTeX-src-beta-20020402/texk/ps2pkm/basics.c Thu Jan 31 20:50:44 2002 @@ -8,7 +8,6 @@ #include <stdio.h> #include <stdlib.h> #include <sys/types.h> -/* #define DECC */ #include <sys/stat.h> /* stat() */ #ifdef WIN32 #include <win32lib.h> @@ -56,7 +55,7 @@ #ifdef WIN32 int (__cdecl * pstat)(const char *, struct stat *) = win32_stat; #else -/* int (*pstat)(const char *, struct stat *) = stat; */ +int (*pstat)(const char *, struct stat *) = stat; #endif /* verbose stat function */ diff -u teTeX-src-beta-20020402-gcc-mod/texk/ps2pkm/basics.h teTeX-src-beta-2002 0402/texk/ps2pkm/basics.h --- teTeX-src-beta-20020402-gcc-mod/texk/ps2pkm/basics.h Wed May 15 09:15 :33 2002 +++ teTeX-src-beta-20020402/texk/ps2pkm/basics.h Tue Mar 16 08:15:27 1999 @@ -98,5 +98,5 @@ #include <sys/types.h> /* struct stat */ #include <sys/stat.h> /* stat() */ -extern int (*stat)(const char *, struct stat *); +extern int (*pstat)(const char *, struct stat *); int my_stat(const char *path, struct stat *buf); diff -u teTeX-src-beta-20020402-gcc-mod/texk/ps2pkm/flisearch.c teTeX-src-beta-2 0020402/texk/ps2pkm/flisearch.c --- teTeX-src-beta-20020402-gcc-mod/texk/ps2pkm/flisearch.c Wed May 15 09:16 :17 2002 +++ teTeX-src-beta-20020402/texk/ps2pkm/flisearch.c Sat Jan 24 13:11:28 1998 @@ -22,7 +22,7 @@ path = argv[1]; fontname = argv[2]; dpi = atoi(argv[3]); /* find <file> in <path> */ - stat = my_stat; pfopen = my_fopen; + pstat = my_stat; pfopen = my_fopen; fn = search_flipath(path, matching); if (fn == NULL) msg("%s at %d dpi not found\n", fontname, dpi); else msg("%s: %s at %d dpi found\n", fn, fontname, dpi); diff -u teTeX-src-beta-20020402-gcc-mod/texk/ps2pkm/ps2pk.c teTeX-src-beta-20020 402/texk/ps2pkm/ps2pk.c --- teTeX-src-beta-20020402-gcc-mod/texk/ps2pkm/ps2pk.c Wed May 15 09:16:48 2002 +++ teTeX-src-beta-20020402/texk/ps2pkm/ps2pk.c Sat Feb 6 23:00:17 1999 @@ -273,7 +273,7 @@ break; case 'd': debug = 1; - stat = my_stat; + pstat = my_stat; break; case 'e': if (*++argv[0] == '\0') { diff -u teTeX-src-beta-20020402-gcc-mod/texk/ps2pkm/psearch.c teTeX-src-beta-200 20402/texk/ps2pkm/psearch.c --- teTeX-src-beta-20020402-gcc-mod/texk/ps2pkm/psearch.c Wed May 15 09:16 :32 2002 +++ teTeX-src-beta-20020402/texk/ps2pkm/psearch.c Sat Jan 24 13:11:28 1998 @@ -138,7 +138,7 @@ /* Check if we have found <file> */ if (tail == NULL || *tail == '\0') { sprintf(fn, "%s%c%s", head, DIRSEP, file); - if (stat(fn, &status) == 0) { + if (pstat(fn, &status) == 0) { res = malloc(strlen(fn)+1); if (res == NULL) fatal("Out of memory\n"); strcpy(res, fn); @@ -159,7 +159,7 @@ /* Check if we have a directory */ sprintf(fn, "%s%c%s", head, DIRSEP, de->d_name); - (void) stat(fn, &status); + (void) pstat(fn, &status); if (!S_ISDIR(status.st_mode)) { /* if we are looking for a file with an extension and we find * files with the same or a different extension we may consider @@ -227,7 +227,7 @@ struct stat status; if (path == NULL || *path == '\0' || absname(file)) { - if (stat(file, &status) == 0) return file; + if (pstat(file, &status) == 0) return file; if (terminate) fatal("File <%s> not found\n", file); return NULL; } @@ -447,7 +447,7 @@ /* try filename after replacing placeholders */ substitute(pe, "%b%m%f%d%p", _bdpi, _mode, texfont, dpi+del, "pk"); - if (stat(pe, &status) == 0) { + if (pstat(pe, &status) == 0) { pkname = malloc(strlen(pe)+1); if (pkname == NULL) fatal("Out of memory\n"); strcpy(pkname, pe); @@ -459,7 +459,7 @@ } else { sprintf(ppe, "%c%s.%dpk", DIRSEP, texfont, dpi+del); - if (stat(pe, &status) == 0) { + if (pstat(pe, &status) == 0) { pkname = malloc(strlen(pe)+1); if (pkname == NULL) fatal("Out of memory\n"); strcpy(pkname, pe); Regards, Svend Tollak Munkejord