No unistd.h in windows

[gssweb.git] / json_gssapi / main.cpp

diff --git a/json_gssapi/main.cpp b/json_gssapi/main.cpp
index eb6beae..0729b13 100644 (file)
--- a/json_gssapi/main.cpp
+++ b/json_gssapi/main.cpp
@@ -1,12 +1,15 @@
 #include <commands/GSSImportName.h>
-#include <commands/GSSCreateSecContextCommand.h>
+#include <commands/GSSInitSecContext.h>
 #include <commands/GSSAcquireCred.h>
 #include <datamodel/GSSBuffer.h>
 #include <exception>
 #include <iostream>
 #include <string>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <util_json.h>
+#include <GSSRequest.h>
 
 
 using std::cin;
@@ -17,16 +20,10 @@ using std::string;
 
 int main(int argc, char **argv) {
   /* Variables */
-  string method, output;
-  const char* c_str;
+  string output;
   char *input;
-  JSONObject json;
-  JSONObject *result;
-  json_error_t jsonErr;
-  GSSCommand *cmd;
   int len;
   ssize_t readTotal, readThisRound, readRemaining;
-  std::streamsize threeTwoBits = 32 / sizeof(string::size_type);
   
   /* Error checking */
   
@@ -35,87 +32,40 @@ int main(int argc, char **argv) {
   /* Main processing */
   do 
   {
-    try 
+    // Read 32 bit length
+    len = 0;
+    readThisRound = readTotal = 0;
+    while(4 != readTotal)
     {
-      len = 0;
-      readThisRound = 0;
-      while(0 == readThisRound)
-        readThisRound = fread(&len, 4, 1, stdin);
-      
-      input = new char[len + 1];
-      readTotal = readThisRound = 0;
-      while (readTotal < len)
-      {
-        readRemaining = len - readTotal;
-        readThisRound = fread( &(input[readTotal]), 1, readRemaining, stdin );
-        if (-1 == readThisRound)
-          readTotal = len;
-        else
-          readTotal += readThisRound;
-      }
-      input[len] = '\0';
-      
-      JSONObject json = JSONObject::load(input, 0, &jsonErr);
-      delete[] input;
-      
-      // Oh, how I wish I could simply use: switch(json.get("method"))
-      c_str = json.get("method").string();
-      method = c_str;
-      if ("gss_import_name" == method)
-      {
-        cmd = new GSSImportName(&json);
-      }
-      else if ("gss_create_sec_context" == method)
-      {
-        cmd = new GSSCreateSecContextCommand(&json);
-      }
-      else if ("gss_acquire_cred" == method)
-      {
-        cmd = new GSSAcquireCred(&json);
-      }
-      else 
-      {
-        JSONObject response;
-        response.set("method", "unknown");
-        response.set("error_message", "Did not find a valid method to execute.");
-       output = response.dump();
-       len = output.length();
-       cout.write((char *)&len, threeTwoBits);
-        cout << output << endl;
-      
-        continue;
-      }
-
-      cmd->execute();
-      result = cmd->toJSON();
-      delete cmd;
-      
-      output = result->dump();
-      len = output.length();
-      
-      cout.write((char *)&len, threeTwoBits);
-      cout << output;
-      cout.flush();
-
+      readThisRound = read(0, ((&len) + readTotal), 4 - readTotal);
+      readTotal += readThisRound;
     }
-    catch ( std::bad_alloc& e )
+    
+    // Reads the number of bytes indicated by the above read
+    input = new char[len + 1];
+    readTotal = readThisRound = 0;
+    while (readTotal < len)
     {
-      JSONObject response;
-      JSONObject error;
-      response.set("method", "unknown");
-      response.set("error_message", "Could not parse the input JSON");
-      response.set("original message", input);
-      error.set("text", jsonErr.text);
-      error.set("source", jsonErr.source);
-      error.set("line", jsonErr.line);
-      error.set("column", jsonErr.column);
-      error.set("position", jsonErr.position);
-      response.set("error", error);
-      output = response.dump();
-      len = output.length();
-      cout.write((char *)&len, threeTwoBits);
-      cout << output << endl;
+      readRemaining = len - readTotal;
+      readThisRound = read( 0, &(input[readTotal]), readRemaining);
+      if (-1 == readThisRound)
+        break;
+      else
+        readTotal += readThisRound;
     }
+    // ... and null-terminate it
+    input[len] = '\0';
+    
+    
+    GSSRequest *req = new GSSRequest(string(input));
+    req->execute();
+    output = req->getResponse();
+    len = output.length();
+    
+    cout.write((char *)&len, 4);
+    cout << output;
+    cout.flush();
+    
   } while(1);
   
   return 0;