Changeset 22174 for main/trunk/greenstone2/runtime-src/src

Timestamp:

2010-05-26T00:01:29+12:00 (14 years ago)

Author:

davidb

Message:

Syntax errors corrected

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

• os_process_unix.cpp (modified) (12 diffs)
• os_process_unix.h (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/os_process_unix.cpp

@@ -44 +44 @@
 #define WRITE_PIPE_INDEX 1
 
+#define FD_STDIN 0
+#define FD_STDOUT 1
+#define FD_STDERR 2
 
 osprocessunix::osprocessunix(char* cmdline)
@@ -50 +53 @@
 
 osprocessunix::osprocessunix(char* cmdline, OSProcessPipeMode mode)
-  : child_stdout_read_(NULL), child_stdin_write_(NULL),
+  : child_stdout_read_(-1), child_stdin_write_(-1),
     osprocess(cmdline,mode)
 {
@@ -89 +92 @@
     // Sort out input pipe
     //   child has no buisness accessing write end of input pipe => close
-    close(child_stdin_write_);   
+    ::close(child_stdin_write_);   
 
     if ((mode == uniWrite) || (mode == biReadWrite)) {
@@ -99 +102 @@
       // in the child reading any input from the parent)
       // => child input remains coming from stdin
-      close(child_stdin_read);
+      ::close(child_stdin_read);
     }
 
     // Sort out output pipe
     //   child has no buisness accessing read end of output pipe => close
-    close(child_stdout_read_);
+    ::close(child_stdout_read_);
     if ((mode == uniRead) || (mode == biReadWrite)) {
       //   wire up child's stdout write so it is send down the pipe to the parent
@@ -113 +116 @@
       // in any output produced by the child process)
       // => child output remains going to stdout
-      close(child_stdout_write);
-    }
-
+      ::close(child_stdout_write);
+    }
+
+    /*
     // execve ...
     int rv = CreateProcess(NULL,    // no application name
@@ -130 +134 @@
       fprintf(stderr,"os_process_windows(): Error creating process");
     }
+    */
+
     
   }
@@ -137 +143 @@
     // Sort out input pipe
     //    parent has no buisness accessing read end of input pipe => close
-    close(child_stdin_read);
+    ::close(child_stdin_read);
 
     // Sort out output pipe
     //    parent has no buisness accessing write end of output pipe => close
-    close(child_stdout_write);
+    ::close(child_stdout_write);
 
 
@@ -147 +153 @@
     {
       case uniRead:
-    close(child_stdin_write_);
+    ::close(child_stdin_write_);
     break;
       case uniWrite:
-    close(child_stdout_read_);
+    ::close(child_stdout_read_);
     break;
       case biReadWrite:
@@ -157 +163 @@
     break;
       case noPipe:
-    close(child_stdin_write_);
-    close(child_stdout_read_);
+    ::close(child_stdin_write_);
+    ::close(child_stdout_read_);
     break;
     }
@@ -178 +184 @@
 {
 
-  int actual_write_len = write(child_stdin_write_, buffer, buffer_len);
-  
-  if (data_written<0) {
+  int actual_write_len = ::write(child_stdin_write_, buffer, buffer_len);
+  
+  if (actual_write_len<0) {
     cerr << "osproessunix::write() Error: failed to write data" << endl;
   }
@@ -189 +195 @@
 int osprocessunix::read(char* buffer, const int buffer_len)
 {
-  int actual_read_len = read(child_stdout_read_, buffer, buffer_len);
+  int actual_read_len = ::read(child_stdout_read_, buffer, buffer_len);
 
   if (actual_read_len<0) {
@@ -201 +207 @@
   
 bool osprocessunix::close()
-{}
+{
+  return true;
+}
 
 bool osprocessunix::close(OSProcessPipeMode mode)
-{}
-
-
-int main()  {
- int  pipe_fd[2];
- pipe(pipe_fd);
-
- if (fork() == 0)  {                     /* create child process          */
-  char *av[3] = { "ls", "-c1", 0};       /* parameters for command        */ 
-  close(pipe_fd[0]);                     /* close read end of pipe        */  
-  close(1);                              /* close standard output         */
-  dup(pipe_fd[1]);                       /* attach write end of pipe      */
-                                         /* stdout is lowest available fd */ 
-  execve("/bin/ls", av, 0);              /* run the ls code               */
- }
- else  {                                 /* in the parent process         */
-  int files;
-  char ch;
-  close(pipe_fd[1]);                     /* close write end of pipe       */
-  files = 0;                             /* counter for number of files   */
-        
-  while ( 0 != read(pipe_fd[0], &ch, 1) )/* read from pipe until eof      */
-   if (ch == '\n')                       /* each newline represents a file*/
-    ++files;        
-   cout<< "There are " << files << " files\n";
-  }
-}
+{
+  return true;
+}
+
+
 
 #endif

main/trunk/greenstone2/runtime-src/src/recpt/os_process_unix.h

@@ -38 +38 @@
    
  public:
-  osprocessunix(const char* cmd);
-  osprocessunix(const char* cmd, const OSProcessPipeMode mode);
-  virutal ~osprocessunix();
+  osprocessunix(char* cmd);
+  osprocessunix(char* cmd, OSProcessPipeMode mode);
+  virtual ~osprocessunix();
   
-  virtual eop();                  // end of pipe
-  virtual eop(OSProcessPipeMode); // end of pipe, for named pipe
+  /*
+  virtual bool eop();                  // end of pipe
+  virtual bool eop(OSProcessPipeMode); // end of pipe, for designated pipe
+  */
 
   virtual int read(char* buffer, const int buffer_len);
-  virtual bool write(char* buffer, const int buffer_len);
+  virtual int write(char* buffer, const int buffer_len);
   
   virtual bool close();
@@ -52 +54 @@
 
  protected:
-  File* read_fd_;
-  File* write_fd_;
+  int child_stdin_write_;
+  int child_stdout_read_;
 };