Fixed read tag merge issue.

.gitignore

@@ -0,0 +1,3 @@
+*.o
+*~
+testjet

JetCore.txt

@@ -8,3 +8,6 @@ modifications. Data contained within the tags may modify their
 containers before placing any output. The space taken by the tag
 itself is not passwed to the output and will not appear in the output.
 
+Skip Blank Lines options on containers will skip passing any blank
+lines or line containing only whitespace to the output. 
+

Tag.cpp

@@ -7,6 +7,7 @@
 #include "__if.h"
 #include "__read.h"
 #include "__set.h"
+#include "__call.h"
 #include "__jet.h"
 #include "__while.h"
 #include <iostream>
@@ -114,6 +115,9 @@ namespace jet {
 	    } else if(ifTagName(in, "set")) {
 	       __set _set(in, out, global);
 	       continue;
+	    } else if(ifTagName(in, "call")) {
+	       __call _set(in, out, global);
+	       continue;
 	    } else if(ifTagName(in, "while")) {
 	       __while _while(in, out, global);
 	       continue;

__call.cpp

@@ -0,0 +1,37 @@
+#include "__call.h"
+#include "Exception.h"
+#include "MString.h"
+#include <limits.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+namespace jet {
+   
+   __call::__call(coreutils::ZString &in, coreutils::MString &out, Global &global) : Tag(in, out, global) {
+      if(hasContainer)
+	throw coreutils::Exception("call cannot have a container.");	
+      if(!variableDefined(coreutils::ZString("pgm")))
+	throw coreutils::Exception("pgm keyword must be specified.");
+      pipe[fd]; // TODO: Get these pipes to work with name and input keywords.
+      dup2(0);
+      if(pid != fork()) {
+	 argv[0] = variables["pgm"]; // TODO: Need to peel off the program name only and pass as argv[0].	   
+	 for(ix = 1; ix <= ARG_MAX; ++ix) {    
+	    coreutils::MString arg("arg");
+	    arg << ix;
+	    if(variableDefined(arg))
+	      argv[ix] = variables[arg].c_str();
+	    else
+	      break;
+	 }
+	 argv[ix] == NULL;
+	 execve(variables["pgm"].c_str(), argv, NULL);	 
+	 exit(-1);
+      }
+      waitpid(&status);
+      
+   }
+   
+}

__call.h

@@ -0,0 +1,24 @@
+#ifndef ____call_h__
+#define ____call_h__
+
+#include "Tag.h"
+
+namespace jet {
+   
+   class __call : public Tag {
+   
+    public:
+      __call(coreutils::ZString &in, coreutils::MString &out, Global &global);
+
+    private:
+      int pid;
+      int status;
+      int ix;
+      int fd[2];
+      char *argv[25];
+      
+   };
+      
+}
+
+#endif

__comment.cpp

@@ -0,0 +1,12 @@
+#include "__cpmment.h"
+#include "Exception.h"
+
+namespace jet {
+   
+   __comment::__comment(coreutils::ZString &in, coreutils::MString &out, Global &global) : Tag(in, out, global) {
+      if(!hasContainer)
+	throw coreutils::Exception("comment must have a container.");	
+      output = false;
+   }
+   
+}

__comment.h

@@ -0,0 +1,17 @@
+#ifndef ____comment_h__
+#define ____comment_h__
+
+#include "Tag.h"
+
+namespace jet {
+   
+   class __comment : public Tag {
+   
+    public:
+      __comment(coreutils::ZString &in, coreutils::MString &out, Global &global);
+      
+   };
+      
+}
+
+#endif

__read.cpp

@@ -1,17 +1,21 @@
 #include "__read.h"
 #include "Exception.h"
+#include <fcntl.h>
+#include <stdio.h>
 
 namespace jet {
    
    __read::__read(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
       if(!variableDefined(coreutils::ZString("file")))
 	throw coreutils::Exception("file keyword must be specified.");
-      
       if(hasContainer)
-	throw coreutils::Exception("Missing / at end of tag definition. Not a container tag.");
+	throw coreutils::Exception("read tag does not have a container.");
-
+      fd = open(variables["file"], O_RDONLY);
-      // process file request here.
+      while(len = read(fd, &buffer, sizeof(buffer - 1))) {
-      
+	 buffer[len] = 0;
+	 out << buffer;
+      }      
+      close(fd);      
    }
 
 }

__read.h

@@ -10,6 +10,11 @@ namespace jet {
     public:
       __read(coreutils::ZString &in, coreutils::MString &parent, Global &global);
 
+    private:
+      int fd;
+      int len;
+      char buffer[4096];
+      
    };
       
 }

gitignore

@@ -1,2 +0,0 @@
-*.o
-*~