Changeset 606 for trunk/gsdl/src/recpt/receptionist.cpp

Timestamp:

1999-09-21T23:28:45+12:00 (25 years ago)

Author:

sjboddie

Message:

tidied up file locking

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (5 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.32  1999/09/21 11:28:45  sjboddie
+   tidied up file locking
+
    Revision 1.31  1999/09/16 21:38:17  sjboddie
    added some file locking stuff for logging. Windows still needs to
@@ -179 +182 @@
 #include <fstream.h>
 
-
+#if defined (__WIN32_)
+#include "wincgiutils.h"
+#endif
 
 void recptconf::clear () {
@@ -543 +548 @@
   outconverter->reset();
 
-
   // check the main cgi arguments
   if (!check_mainargs (args, logout)) return false;
@@ -673 +677 @@
   }
 
-  int fd = log.filedesc();
+  int fd = GSDL_GET_FILEDESC(log);
+
   // lock_val is set to 0 if file is locked successfully
   int lock_val = 1;
-  WRITELOCK_FILE (fd);
+  GSDL_LOCK_FILE (fd);
   if (lock_val == 0) {
     log << text_t2utf8 << logstr;
-    UNLOCK_FILE (fd);
-  } else 
+    GSDL_UNLOCK_FILE (fd);
+  } else {
     logout << "Error: Couldn't lock file " << lfile << "\n";
+    log.close();
+    delete lfile;
+    return false;
+  }
 
   log.close();
@@ -1065 +1074 @@
   disp.setmacro ("httpimg", "Global", configinfo.httpimg);
   disp.setmacro ("httpprefix", "Global", configinfo.httpprefix);
-  disp.setmacro("compressedoptions", "Global", get_compressed_arg(args, logout));
+  disp.setmacro ("compressedoptions", "Global", get_compressed_arg(args, logout));
 
   // set _cgiargX_ macros for each cgi argument