[dcms-cvs] cvs commit: pcms/libdiff diff3.c

[Jonathan S. Shapiro]

shap        01/12/06 14:48:43

  Modified:    libdiff  diff3.c
  Log:
  Suppress the complaint about unsafe use of tmpnam() by replacing it with
  mkstemp().

Revision  Changes    Path
1.3       +9 -0      pcms/libdiff/diff3.c

Index: diff3.c
===================================================================
RCS file: /users/bigdisk/cvs/pcms/libdiff/diff3.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- diff3.c	2000/12/10 13:50:03	1.2
+++ diff3.c	2001/12/06 19:48:43	1.3
@@ -1261,7 +1261,12 @@
   char const *argv[7];
   char horizon_arg[17 + INT_STRLEN_BOUND (int)];
   char const **ap;
+  /* #define BAD_TMPNAM */
+#ifdef BAD_TMPNAM
   char *diffout;
+#else
+  char diffout[] = "/tmp/pcmsXXXXXX\0\0\0";
+#endif
 
   ap = argv;
   *ap++ = "diff";
@@ -1274,7 +1279,11 @@
   *ap++ = fileb;
   *ap = 0;
 
+#ifdef BAD_TMPNAM
   diffout = tmpnam(NULL);
+#else
+  close(mkstemp(diffout));
+#endif
 
   outfile_hold = outfile;
   callbacks_hold = callbacks;