blob: 781ea1693057d5efd60456da740a11c1b4f9ff36 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
--- runjob.c.orig 2000-06-20 23:12:18 UTC
+++ runjob.c
@@ -39,26 +39,14 @@ static int
temp_file()
/* Open a temporary file and return its file descriptor */
{
- const int max_retries = 50;
- char *name;
- int fd, i;
+ int fd;
+ char name[] = "/tmp/anacron.XXXXXX";
- i = 0;
- name = NULL;
- do
- {
- i++;
- free(name);
- name = tempnam(NULL, NULL);
- if (name == NULL) die("Can't find a unique temporary filename");
- fd = open(name, O_RDWR | O_CREAT | O_EXCL | O_APPEND,
- S_IRUSR | S_IWUSR);
- /* I'm not sure we actually need to be so persistent here */
- } while (fd == -1 && errno == EEXIST && i < max_retries);
-
+ fd = mkstemp(name);
+
if (fd == -1) die_e("Can't open temporary file");
if (unlink(name)) die_e("Can't unlink temporary file");
- free(name);
+
fcntl(fd, F_SETFD, 1); /* set close-on-exec flag */
return fd;
}
@@ -84,7 +72,7 @@ username()
}
static void
-xputenv(const char *s)
+xputenv(char *s)
{
if (putenv(s)) die_e("Can't set the environment");
}
|