From 3def3fe132a136db08e99401b60e01595d970eeb Mon Sep 17 00:00:00 2001 From: "Kenneth D. Merry" Date: Tue, 28 Sep 1999 02:01:46 +0000 Subject: [PATCH] Use mkstemp(3) instead of tmpnam(3) when creating temporary files for mode page editing. Submitted by: roberto Reviewed by: imp, ken --- sbin/camcontrol/modeedit.c | 9 ++++++--- sbin/camcontrol/util.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c index 811c42f62562..74fbb0819909 100644 --- a/sbin/camcontrol/modeedit.c +++ b/sbin/camcontrol/modeedit.c @@ -291,10 +291,13 @@ edit_done(void) static void edit_init(void) { + int fd; + edit_rewind(); - if (tmpnam(edit_name) == 0) - errx(1, "tmpnam failed"); - if ((edit_file = fopen(edit_name, "w")) == 0) + strlcpy(edit_name, "/tmp/camXXXXXX", sizeof(edit_name)); + if ((fd = mkstemp(edit_name)) == -1) + errx(1, "mkstemp failed"); + if ((edit_file = fdopen(fd, "w")) == 0) err(1, "%s", edit_name); edit_opened = 1; diff --git a/sbin/camcontrol/util.c b/sbin/camcontrol/util.c index 811c42f62562..74fbb0819909 100644 --- a/sbin/camcontrol/util.c +++ b/sbin/camcontrol/util.c @@ -291,10 +291,13 @@ edit_done(void) static void edit_init(void) { + int fd; + edit_rewind(); - if (tmpnam(edit_name) == 0) - errx(1, "tmpnam failed"); - if ((edit_file = fopen(edit_name, "w")) == 0) + strlcpy(edit_name, "/tmp/camXXXXXX", sizeof(edit_name)); + if ((fd = mkstemp(edit_name)) == -1) + errx(1, "mkstemp failed"); + if ((edit_file = fdopen(fd, "w")) == 0) err(1, "%s", edit_name); edit_opened = 1;