added global var tmp_path (used by temp_file())

diff --git a/convert-fcrontab.c b/convert-fcrontab.c
index 5d6e66f9ba0d2be971836d9d6fe30f1fced6e946..24b1c041f69f35d825233fe9e8c0b941bacc766e 100644 (file)
--- a/convert-fcrontab.c
+++ b/convert-fcrontab.c
@@ -22,12 +22,12 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* $Id: convert-fcrontab.c,v 1.3 2001-05-05 19:08:51 thib Exp $ */
+ /* $Id: convert-fcrontab.c,v 1.4 2001-05-17 00:53:41 thib Exp $ */
 
 
 #include "convert-fcrontab.h"
 
-char rcs_info[] = "$Id: convert-fcrontab.c,v 1.3 2001-05-05 19:08:51 thib Exp $";
+char rcs_info[] = "$Id: convert-fcrontab.c,v 1.4 2001-05-17 00:53:41 thib Exp $";
 
 void info(void);
 void usage(void);
@@ -42,6 +42,8 @@ char *prog_name = NULL;
 char foreground = 1;
 pid_t daemon_pid = 0;
 
+/* used in temp_file() (so needed by subs.c)  */
+char *tmp_path = "/tmp/";
 
 void
 info(void)

diff --git a/fcron.c b/fcron.c
index 030af86d9fb49ca556382d0cbbc9116820fae4a4..c71ba88465c5801d0363c5e0a5d83d2b55cafd37 100644 (file)
--- a/fcron.c
+++ b/fcron.c
@@ -21,11 +21,11 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* $Id: fcron.c,v 1.44 2001-05-15 00:45:09 thib Exp $ */
+ /* $Id: fcron.c,v 1.45 2001-05-17 00:53:02 thib Exp $ */
 
 #include "fcron.h"
 
-char rcs_info[] = "$Id: fcron.c,v 1.44 2001-05-15 00:45:09 thib Exp $";
+char rcs_info[] = "$Id: fcron.c,v 1.45 2001-05-17 00:53:02 thib Exp $";
 
 void main_loop(void);
 void check_signal(void);
@@ -54,6 +54,9 @@ char foreground = 0; /* set to 1 when we are on foreground, else 0 */
 
 time_t save_time = SAVE;
 
+/* used in temp_file() : create it in current dir (normally spool dir) */
+char *tmp_path = "";
+
 /* process identity */
 pid_t daemon_pid;
 mode_t saved_umask;           /* default root umask */

diff --git a/subs.c b/subs.c
index a0786ee45d95f8b7c254138450d665f7b8710597..f0f930092f62ec3a5aed45e6012e40fdc4aa7f8f 100644 (file)
--- a/subs.c
+++ b/subs.c
@@ -22,12 +22,12 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* $Id: subs.c,v 1.7 2001-05-15 00:50:24 thib Exp $ */
+ /* $Id: subs.c,v 1.8 2001-05-17 00:53:55 thib Exp $ */
 
 #include "global.h"
 #include "subs.h"
 
-extern void die_e(char *fmt, ...);
+extern char *tmp_path;
 
 int
 remove_blanks(char *str)
@@ -77,7 +77,9 @@ temp_file(char **name)
 {
     int fd;
 #ifdef HAVE_MKSTEMP
-    char name_local[PATH_LEN] = "/tmp/fcr-XXXXXX";
+    char name_local[PATH_LEN] = "";
+    strcpy(name_local, tmp_path);
+    strcat(name_local, "fcr-XXXXXX");
     if ( (fd = mkstemp(name_local)) == -1 )
        die_e("Can't find a unique temporary filename");
     /* we must set the file mode to 600 (some version of mkstemp may set it