Changeset 1864

Timestamp:

2001-01-26T10:29:32+13:00 (23 years ago)

Author:

sjboddie

Message:

Fixed a couple of minor things to get it compiling on windows again

Location:

trunk/gsdl

Files:

• lib/cnfgator.h (modified) (1 diff)
• lib/fileutil.cpp (modified) (2 diffs)
• src/recpt/cgiwrapper.cpp (modified) (3 diffs)

trunk/gsdl/lib/cnfgator.h

@@ -1 @@
-#include <vector.h>
+#if defined(GSDL_USE_OBJECTSPACE)
+#  include <ospace/std/vector>
+#  include <ospace/std/vector>
+#elif defined(GSDL_USE_IOS_H)
+#  include <vector.h>
+#else
+#  include <vector>
+#endif
 
 #include "cfgread.h"

trunk/gsdl/lib/fileutil.cpp

@@ -346 +346 @@
 // For current needs it's fine though.
 // -- Pass a linelength of 0 to use the default linelength (256 chars).
+// -- The maximum value of linelength is MAXLINELENGTH
 text_t file_tail (const text_t &filename, int numlines, int linelength) {
 
+#define MAXLINELENGTH 2048
+
   if (numlines < 1) numlines = 1;
-  if (linelength == 0) linelength = 256;
-  
+  if (linelength < 1) linelength = 256;
+  if (linelength > MAXLINELENGTH) linelength = MAXLINELENGTH;
+
   streampos numchars = linelength*numlines;
 
@@ -357 +361 @@
 
   char *filenamec = filename.getcstr();
-  char linec[linelength];
+  char linec[MAXLINELENGTH];
   ifstream file_in (filenamec);
   delete filenamec;

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -30 +30 @@
 #include <stdlib.h>
 #include <assert.h>
-#include <iostream.h>
 
 #if defined(GSDL_USE_OBJECTSPACE)
@@ -282 +281 @@
 
   outconvertclass text_t2ascii;
-  recptconf &configinfo = recpt.get_configinfo ();
+  const recptconf &configinfo = recpt.get_configinfo ();
   text_t etc_dir = filename_cat (configinfo.gsdlhome, "etc");
 
@@ -449 +448 @@
   int numrequests = 0;
   bool debug = false;
-  recptconf configinfo = recpt.get_configinfo ();
+  const recptconf &configinfo = recpt.get_configinfo ();
 
   // find out whether this is being run as a cgi-script