Changeset 3007 for trunk/gsdl/src/recpt/statusaction.cpp

Timestamp:

2002-02-27T11:50:16+13:00 (22 years ago)

Author:

jrm21

Message:

Replaced old code to get file descriptors from ofstreams for locking with
c-style open() functions instead. Now works with gcc3.

File:

• trunk/gsdl/src/recpt/statusaction.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/statusaction.cpp

@@ -32 +32 @@
 #include "gsdltools.h"
 #include <assert.h>
-
+#include <stdio.h>
+#include <fcntl.h> // for open() stuff
 
 void statusaction::output_frameset (cgiargsclass &/*args*/, displayclass &disp, 
@@ -885 +886 @@
   text_t cfgfile = filename_cat(gsdlhome, "etc", "main.cfg");
   char *cfgfilec = cfgfile.getcstr();
-#ifdef __WIN32__
-  ofstream cfg_out (cfgfilec, ios::binary);
-#else
-  ofstream cfg_out (cfgfilec);
+
+  int fd=open(cfgfilec, O_WRONLY | O_CREAT | O_TRUNC
+#if defined(__WIN32__)
+          | O_BINARY
 #endif
-  
-  if (cfg_out) {
-    // lock the file
-    int fd = GSDL_GET_FILEDESC(cfg_out);
+          );
+
+  if (fd != -1) {
+
     int lock_val = 1;
     GSDL_LOCK_FILE (fd);
     if (lock_val != 0) {
       logout << "statusaction::change_maincfg: Error: Couldn't lock file " << cfgfilec << "\n";
-      cfg_out.close();
       textout << outconvert << disp << "_status:changemaincfgfail_";
-      
+      close (fd);
     } else {
-      
       outconvertclass text_t2ascii;
-      cfg_out << text_t2ascii << args["cfgfile"];
+      text_t2ascii << args["cfgfile"];
+      size_t buffersize=args["cfgfile"].size();
+      char *buffer=new char[buffersize];
+      size_t num_chars;
+      convertclass::status_t status;
+      text_t2ascii.convert(buffer, buffersize, num_chars, status);
+      // ignore status - assume it is "finished" as buffer is big enough
+      write(fd, buffer, num_chars);
       GSDL_UNLOCK_FILE (fd);
-      cfg_out.close();
+      delete buffer;
+      close (fd);
       textout << outconvert << disp << "_status:changemaincfgsuccess_";
     }
@@ -913 +920 @@
     textout << outconvert << disp << "_status:changemaincfgfail_";
   }
+  delete cfgfilec;
 }