summaryrefslogtreecommitdiff
path: root/games/xnethack/files/patch-util-makedefs.c
diff options
context:
space:
mode:
Diffstat (limited to 'games/xnethack/files/patch-util-makedefs.c')
-rw-r--r--games/xnethack/files/patch-util-makedefs.c71
1 files changed, 71 insertions, 0 deletions
diff --git a/games/xnethack/files/patch-util-makedefs.c b/games/xnethack/files/patch-util-makedefs.c
new file mode 100644
index 000000000000..13d38f3bfba0
--- /dev/null
+++ b/games/xnethack/files/patch-util-makedefs.c
@@ -0,0 +1,71 @@
+--- util/makedefs.c.orig 2021-03-22 22:28:14 UTC
++++ util/makedefs.c
+@@ -116,6 +116,7 @@ static struct version_info version;
+ #define MAXFNAMELEN 600
+
+ static char filename[MAXFNAMELEN];
++static char tempfilename[MAXFNAMELEN];
+
+ #ifdef FILE_PREFIX
+ /* if defined, a first argument not starting with - is
+@@ -229,6 +230,12 @@ main(int argc, char *argv[])
+ return 1;
+ }
+
++ if (snprintf(tempfilename, sizeof(tempfilename), "%s.%d", "grep.tmp", getpid()) >= sizeof(tempfilename)) {
++ Fprintf(stderr, "Cannot create temporary filename.");
++ (void) fflush(stderr);
++ return 1;
++ }
++
+ #ifdef FILE_PREFIX
+ if (argc >= 2 && argv[1][0] != '-') {
+ file_prefix = argv[1];
+@@ -964,12 +971,12 @@ do_rnd_access_file(const char* fname, const char* defl
+ more likely to be picked than normal but it's nothing to worry about */
+ (void) fputs(xcrypt(deflt_content), ofp);
+
+- tfp = getfp(DATA_TEMPLATE, "grep.tmp", WRTMODE, FLG_TEMPFILE);
++ tfp = getfp(DATA_TEMPLATE, tempfilename, WRTMODE, FLG_TEMPFILE);
+ grep0(ifp, tfp, FLG_TEMPFILE);
+ #ifndef HAS_NO_MKSTEMP
+ ifp = tfp;
+ #else
+- ifp = getfp(DATA_TEMPLATE, "grep.tmp", RDTMODE, 0);
++ ifp = getfp(DATA_TEMPLATE, tempfilename, RDTMODE, 0);
+ #endif
+ while ((line = fgetline(ifp)) != 0) {
+ if (line[0] != '#' && line[0] != '\n')
+@@ -980,7 +987,7 @@ do_rnd_access_file(const char* fname, const char* defl
+ Fclose(ofp);
+
+ #ifdef HAS_NO_MKSTEMP
+- delete_file(DATA_TEMPLATE, "grep.tmp");
++ delete_file(DATA_TEMPLATE, templfilename);
+ #endif
+ return;
+ }
+@@ -1758,12 +1765,12 @@ do_dungeon(void)
+ }
+ Fprintf(ofp, "%s", Dont_Edit_Data);
+
+- tfp = getfp(DATA_TEMPLATE, "grep.tmp", WRTMODE, FLG_TEMPFILE);
++ tfp = getfp(DATA_TEMPLATE, tempfilename, WRTMODE, FLG_TEMPFILE);
+ grep0(ifp, tfp, FLG_TEMPFILE);
+ #ifndef HAS_NO_MKSTEMP
+ ifp = tfp;
+ #else
+- ifp = getfp(DATA_TEMPLATE, "grep.tmp", RDTMODE, 0);
++ ifp = getfp(DATA_TEMPLATE, tempfilename, RDTMODE, 0);
+ #endif
+ while ((line = fgetline(ifp)) != 0) {
+ SpinCursor(3);
+@@ -1779,7 +1786,7 @@ do_dungeon(void)
+ Fclose(ofp);
+
+ #ifdef HAS_NO_MKSTEMP
+- delete_file(DATA_TEMPLATE, "grep.tmp");
++ delete_file(DATA_TEMPLATE, tempfilename);
+ #endif
+ return;
+ }