[Husky-cvs]hpt/src scan.c,1.169,1.170

[<mc...@us...>]

Update of /cvsroot/husky/hpt/src
In directory usw-pr-cvs1:/tmp/cvs-serv25683

Modified Files:
	scan.c 
Log Message:
fix tmpfile creation.
Now you need to define token 'tempDir' for scaning echos by command
'hpt scan -f <filename> - scanning echomail from alternative echotoss file'
and if you have defined 'packNetMailOnScan off'


Index: scan.c
===================================================================
RCS file: /cvsroot/husky/hpt/src/scan.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- scan.c	22 Jul 2002 12:35:50 -0000	1.169
+++ scan.c	30 Aug 2002 13:10:13 -0000	1.170
@@ -52,6 +52,7 @@
 #include <fidoconf/common.h>
 #include <fidoconf/xstr.h>
 #include <fidoconf/afixcmd.h>
+#include <fidoconf/temp.h>
 
 #include <fcommon.h>
 #include <pkt.h>
@@ -728,6 +729,11 @@
     char *line = NULL;
     struct stat st;
 
+    if ( !config->tempDir )
+    {
+        exit_hpt( "tempDir not defined in config. scanExport imposible" , 1 );
+    }
+
     w_log( LL_FUNC, "scanExport() begin" );
 
     // zero statScan
@@ -737,15 +743,6 @@
         type & SCN_FILE ? " with -f " :
     type & SCN_NAME ? " with -a " : "");
 
-    if (config->echotosslog)
-    {
-        tmppath = (char *) safe_malloc(strlen(config->echotosslog)+1);
-        memset(tmppath, 0, strlen(config->echotosslog)+1);
-        strncpy(tmppath, config->echotosslog,
-            (strrchr(config->echotosslog, PATH_DELIM) - config->echotosslog));
-        tmplogname = makeUniqueDosFileName(tmppath, "tmp", config);
-        nfree(tmppath);
-    }
 
     w_log( LL_SRCLINE, "%s:%d", __FILE__, __LINE__ );
 
@@ -754,7 +751,7 @@
         {
             f = fopen(config->echotosslog, "r");
             if (f != NULL && config->packNetMailOnScan == 0) {
-                ftmp = fopen(tmplogname, "w");
+                ftmp = createTempTextFile(config , &tmplogname);
                 if (ftmp == NULL) {
                     w_log(LL_ERR, "Can't open file %s for writing : %s", tmplogname, strerror(errno));
                     // close file so all areas will be scanned instead of panic.
@@ -769,7 +766,7 @@
     if (type & SCN_FILE) {
         f = fopen(str, "r");
         if (f != NULL) {
-            ftmp = fopen(tmplogname, "w");
+            ftmp = createTempTextFile(config , &tmplogname);
             if (ftmp == NULL) {
                 w_log(LL_ERR, "Can't open file %s for writing : %s", tmplogname, strerror(errno));
                 // close file so all areas will be scanned instead of panic.