Changeset 12794

Timestamp:

2006-09-20T15:26:17+12:00 (18 years ago)

Author:

davidb

Message:

Changes to make depositor action work under Windows. Main change is to
make sure 'standard input' is in binary mode before MIME multi-part posts
are parsed.

Location:

trunk/gsdl/src/recpt

Files:

• cgiutils.cpp (modified) (8 diffs)
• cgiwrapper.cpp (modified) (2 diffs)
• depositoraction.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/cgiutils.cpp

@@ -81 +81 @@
       break;
     }
+
     first++;
   }
+
   return first;
 }
@@ -109 +111 @@
       text_t tmp_name = md5data(filedata);
       tmp_name = filename_cat(gsdlhome, "tmp", tmp_name);
+
       char *tmp_name_c = tmp_name.getcstr();
 
@@ -133 +136 @@
       // size has yet to be implemented
       fu.size = filedata.size();
+
       fu.tmp_name = tmp_name;
       fileuploads[argname] = fu;
@@ -155 +159 @@
   if (findword(content_type_begin, content_type_end, "multipart/form-data") == content_type_end) {
     // a simple post request
+
     return raw_post_data;
 
@@ -179 +184 @@
     // first get the boundary from content-type
     text_t::iterator boundary_begin = findword(content_type_begin, content_type_end, "boundary=");
-    if (boundary_begin+9 < content_type_end) boundary_begin += 9;
+    if (boundary_begin+9 < content_type_end) 
+      {
+    // skip over "boundary=" part of string
+    boundary_begin += 9;
+      }
     else {
       // error
+      cerr << "Error: malformed boundary? '" <<  boundary_begin << "'" << endl;
       return "";
     }
     text_t boundary = substr(boundary_begin, getline(boundary_begin, content_type_end, false));
     int boundary_len = boundary.size();
+
 
     text_t argname, argdata, filename, filedata, filetype;
@@ -195 +206 @@
       // get the next available line (including the trailing <CRLF>
       text_t line = substr(data_here, getline(data_here, data_end, true));
+
       data_here += line.size();
       text_t::iterator line_begin = line.begin();
@@ -245 +257 @@
     else argdata += line;
       }
+
     }
 
@@ -672 +685 @@
     const cgiarginfo *info = argsinfo.getarginfo((*this_file).first);
     if (info != NULL) {
+
       if ((*info).fileupload && (file_exists((*this_file).second.tmp_name))) {
+
     args.setargfile((*this_file).first, (*this_file).second);
       }

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -24 +24 @@
  *********************************************************************/
 
+#include <stdio.h>
+#ifdef __WIN32__
+#include <fcntl.h>
+#endif
+
 #include "gsdlconf.h"
 #include "cgiwrapper.h"
@@ -507 +512 @@
       long content_length = (content_length_str ? atoi(content_length_str) : 0);
       if (content_length > 0) {
+#ifdef __WIN32__
+    // On Windows it is important that standard input be read in binary
+    // mode, otherwise end of line "<CR><LF>" is turned into <LF> only
+    // which breaks the MIME standard (and our parsing code!)
+
+    int result = _setmode( _fileno( stdin ), _O_BINARY );
+    if( result == -1 ) {
+      cerr << "Warning: Failed to set standard input to binary mode." << endl;
+      cerr << "         Parsing of multi-part MIME will most likely fail" << endl;
+    }
+#endif
+
     long length = content_length;
     unsigned char * buffer = new unsigned char[content_length];
-    char c;
-    int i=0;
-    do {
-      cin.get(c);
-      if (cin.eof()) break;
-      buffer[i] = c;
-      ++i;
-      --length;
-    } while (length > 0);
-    
+
+    int chars_read = fread(buffer,1,content_length,stdin);
+
+    if (chars_read != content_length) {
+      cerr << "Warning: mismatch between CONTENT_LENGTH and data read from standard in" << endl;
+    }
+
     argstr.setcarr((char *)buffer, content_length);     
+
     text_t content_type;
     char *content_type_str = getenv("CONTENT_TYPE");

trunk/gsdl/src/recpt/depositoraction.cpp

@@ -270 +270 @@
 
   fileupload_t *fileupload = args.getargfile("di1userfileinfo");
+
   if (fileupload != NULL) {
+
     if (!(*fileupload).tmp_name.empty() && file_exists((*fileupload).tmp_name)) {
       // create the timestamp
       time_t timestamp = time(NULL);
       text_t timestamp_str(timestamp); 
+
       args["di1timestamp"] = timestamp_str;
 
@@ -634 +637 @@
     cerr << "Unable to copy " << tmpfile << " to " << filename << endl; 
       }
-      cerr << "*** filename = " << filename_textt << endl;
       
       //write the metadata file