summaryrefslogtreecommitdiff
path: root/usr.bin/patch
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>1997-03-22 03:38:03 +0000
committerlukem <lukem@NetBSD.org>1997-03-22 03:38:03 +0000
commit0c81e588689b50adeba691e1e24589ce9984c4d2 (patch)
tree4cff3f91ffcd250b27b94d56407db138925077d4 /usr.bin/patch
parent789002a23e540eefe3c20d8f05efa3adde600b2c (diff)
use mkstemp() instead of mktemp() to create the tempfile
Diffstat (limited to 'usr.bin/patch')
-rw-r--r--usr.bin/patch/common.h4
-rw-r--r--usr.bin/patch/patch.c20
2 files changed, 15 insertions, 9 deletions
diff --git a/usr.bin/patch/common.h b/usr.bin/patch/common.h
index 66096503338..e7a0045c14a 100644
--- a/usr.bin/patch/common.h
+++ b/usr.bin/patch/common.h
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.5 1996/09/19 06:27:08 thorpej Exp $ */
+/* $NetBSD: common.h,v 1.6 1997/03/22 03:38:03 lukem Exp $ */
#define DEBUGGING
@@ -17,7 +17,6 @@
#define Fclose (void)fclose
#define Fflush (void)fflush
#define Sprintf (void)sprintf
-#define Mktemp (void)mktemp
#define Strcpy (void)strcpy
#define Strcat (void)strcat
@@ -167,7 +166,6 @@ char *getenv();
char *strcpy();
char *strcat();
char *rindex();
-char *mktemp();
#if 0 /* This can cause a prototype conflict. */
#ifdef CHARSPRINTF
char *sprintf();
diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c
index 0faecb883e4..48853e9c63d 100644
--- a/usr.bin/patch/patch.c
+++ b/usr.bin/patch/patch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: patch.c,v 1.4 1996/09/19 06:27:13 thorpej Exp $ */
+/* $NetBSD: patch.c,v 1.5 1997/03/22 03:38:06 lukem Exp $ */
/* patch - a program to apply diffs to original files
*
@@ -9,7 +9,7 @@
*/
#ifndef lint
-static char rcsid[] = "$NetBSD: patch.c,v 1.4 1996/09/19 06:27:13 thorpej Exp $";
+static char rcsid[] = "$NetBSD: patch.c,v 1.5 1997/03/22 03:38:06 lukem Exp $";
#endif /* not lint */
#include "INTERN.h"
@@ -83,22 +83,30 @@ char **argv;
TMPOUTNAME = (char *) malloc (tmpname_len);
strcpy (TMPOUTNAME, tmpdir);
strcat (TMPOUTNAME, "/patchoXXXXXX");
- Mktemp(TMPOUTNAME);
+ if ((i = mkstemp(TMPOUTNAME)) < 0)
+ pfatal2("can't create %s", TMPOUTNAME);
+ Close(i);
TMPINNAME = (char *) malloc (tmpname_len);
strcpy (TMPINNAME, tmpdir);
strcat (TMPINNAME, "/patchiXXXXXX");
- Mktemp(TMPINNAME);
+ if ((i = mkstemp(TMPINNAME)) < 0)
+ pfatal2("can't create %s", TMPINNAME);
+ Close(i);
TMPREJNAME = (char *) malloc (tmpname_len);
strcpy (TMPREJNAME, tmpdir);
strcat (TMPREJNAME, "/patchrXXXXXX");
- Mktemp(TMPREJNAME);
+ if ((i = mkstemp(TMPREJNAME)) < 0)
+ pfatal2("can't create %s", TMPREJNAME);
+ Close(i);
TMPPATNAME = (char *) malloc (tmpname_len);
strcpy (TMPPATNAME, tmpdir);
strcat (TMPPATNAME, "/patchpXXXXXX");
- Mktemp(TMPPATNAME);
+ if ((i = mkstemp(TMPPATNAME)) < 0)
+ pfatal2("can't create %s", TMPPATNAME);
+ Close(i);
}
{