DistRen Changeset - 49749aac184e · protofusion repositories

Changeset - 49749aac184e

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Nathan Brink (binki) - 17 years ago 2009-02-28 11:55:40
ohnobinki@ohnopublishing.net

fixed execio's call to dup2, updated distren.c's test code

3 files changed with 68 insertions and 19 deletions:

src/client/distren.c

src/common/execio.c

src/common/execio.h

0 comments (0 inline, 0 general)

src/client/distren.c

➞

Show inline comments

@@ @@ -22,26 +22,42 @@ @@
 #include "options.h"
 #include "execio.h"
 int main(int argc, char *argv[])
+{
   char buf[10];
   struct execio *testrem;
   char *execargv[] =
+    {
       "ssh",
       "protofusion.org",
       "sh",
       "-c",
-      "\"echo hello from ${HOSTNAME} 1>&2\"",
       "\"echo hello from ${HOSTNAME}\"",
       (char *)NULL
     };
   size_t readlen;
   fprintf(stderr, "testing execio (It shouldn't work) :-)\n");
   fprintf(stderr, "execio_open returns %d\n", execio_open(&testrem, "ssh", execargv));
   fprintf(stderr, "execio_open returns %d\n", execio_open(&testrem, "ssh", execargv));
   buf[9] = '\0';
   while(!execio_read(testrem, buf, 9, &readlen))
+    {
       if(readlen > 9)
+	{
 	  fprintf(stderr, "execio_read doesn't set readlen correctly or read() is messed up\n");
 	  return 1;
+	}
       buf[readlen] = '\0';
       fprintf(stderr, "read \"%s\"\n", buf);
+    }
   return 0;
 };
 /* this function should probably not exist. asprintf should be used instead of sprintf */
 size_t intstrlen(size_t theint)

src/common/execio.c

➞

Show inline comments

@@ @@ -21,12 +21,13 @@ @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>
 #include <malloc.h>
 #include <fcntl.h>
 #include <stdio.h>
 int execio_open(struct execio **rem, const char *progname, char *const argv[])
+{
   /* pipe used to write to child */
   int pipe_write[2];
@@ @@ -49,24 +50,28 @@ int execio_open(struct execio **rem, con @@
+    {
       close(pipe_write[0]);
       close(pipe_write[1]);
       return 1;
+    }
   /* make our side of the pipes nonblocking? I'll consider this type of stuff later and just keep this code in a comment like I always do... */
   //fcntl(pipe_write[1], F_SETFD, fcntl(pipe_write[1], F_GETFD) | O_NONBLOCK);
   //fucntl(pipe_read[0], F_SETFD, fcntl(pipe_read[0], F_GETFD) | O_NONBLOCK);
   /* parent */
   child = fork();
   if(child == -1)
+    {
       close(pipe_write[0]);
       close(pipe_write[1]);
       close(pipe_read[0]);
       close(pipe_read[1]);
       return 1;
+    }
   if(child)
     /* the parent proc: */
+    {
       /* close sides of pipe we won't use */
       close(pipe_write[0]);
       close(pipe_read[1]);
       /* setup execio struct */
@@ @@ -97,14 +102,20 @@ int execio_open(struct execio **rem, con @@
       close(pipe_write[1]);
       close(pipe_read[0]);
       /*
 	reset stdin, stdout, and stderr to the appropriate files. OK, not stderr :-)
       */
       dup2(pipe_read[1], 0);
       dup2(pipe_write[0], 1);
       dup2(pipe_read[1], STDOUT_FILENO);
       dup2(pipe_write[0], STDIN_FILENO);
       /*
 	close the fds that were dup'd
        */
       close(pipe_read[1]);
       close(pipe_write[0]);
       /*
 	 close all other file descriptors. We want to keep 0, 1, and 2 open. We don't know that the last open() or pipe() always gives the highest fd number. However, I will assume that it does. Maybe this is a bad idea:
        */
       counter = pipe_write[0];
       if(counter < pipe_write[1])
 	counter = pipe_write[1];
@@ @@ -131,53 +142,75 @@ int execio_open(struct execio **rem, con @@
       return 1; /* this line should never be reached because we exec -- unless if the exec returns something bad. Then we'd have to tell execio over the pipe about that somehow... */
       /* in fact, maybe we should abort() here because if we returned, a monster of a distren client would exist! */
+    }
+}
 size_t execio_read(struct execio *eio, void *buf, size_t len)
 /*
   returns 1 if child has exited,
   returns 0 if child is still alive
  */
 int _execio_checkpid(struct execio *eio)
+{
   int toreturn;
   int childstatus;
   waitpid(eio->child, &childstatus, WNOHANG);
   /* perror()? */
   return WIFEXITED(childstatus);
+}
 int execio_read(struct execio *eio, void *buf, size_t len, size_t *bytesread)
+{
   /*
     TODO: detect NULL eio?
     TODO: errno?
     update status of eio for execio_status/to be able to cleanup subproc??
     whenever read() returns 0, it means EOF
    */
   toreturn = read(eio->pipe_read, buf, len);
   if(!toreturn)
   (*bytesread) = read(eio->pipe_read, buf, len);
   if(!*bytesread)
+    {
     /* should also be able to figure out if is bad fd and should set EXECIO_STATE_ERROR instead of _EOF */
     eio->state = EXECIO_STATE_EOF;
   return toreturn;
       return 1;
+}
 size_t execio_write(struct execio *eio, void *buf, size_t len)
   return 0;
+}
 int execio_write(struct execio *eio, void *buf, size_t len, size_t *bytesread)
+{
   int toreturn;
   /*
     TODO: errno handling
    */
   toreturn = write(eio->pipe_write, buf, len);
   if(!toreturn)
   (*bytesread) = write(eio->pipe_write, buf, len);
   if(!*bytesread)
     eio->state = EXECIO_STATE_ERROR;
-   return toreturn;
+  return 0;
+}
 enum execio_state execio_state(struct execio *eio)
+{
   return eio->state;
+}
 int execio_close(struct execio *eio)
+{
   int childstatus;
   close(eio->pipe_read);
   close(eio->pipe_write);
   /* maybe we should just kill the child */
   kill(eio->child, SIGTERM);
   /* the waitpid(2) seems to indicate that only when the child is terminated will this wait return. */
   waitpid(eio->child, &childstatus, 0);
   return 0;
+}

src/common/execio.h

➞

Show inline comments

@@ @@ -48,17 +48,17 @@ struct execio @@
   returns nonzsero return on error
 */
 int execio_open(struct execio **rem, const char *progname, char *const argv[]);
 /*
    blocks,
    returns 0 if len is 0. Otherwise, only returns 0 on error/EOF: use execio_state() to determine
    doesn't block,
    returns 0 on success, 1 on failure
 */
 size_t execio_read(struct execio *eio, void *buf, size_t len);
 size_t execio_write(struct execio *eio, void *buf, size_t len);
 int execio_read(struct execio *eio, void *buf, size_t len, size_t *bytesread);
 int execio_write(struct execio *eio, void *buf, size_t len, size_t *bytesread);
 enum execio_state execio_state(struct execio *eio);
 /* nonzero return on error */
 int execio_close(struct execio *eio);

0 comments (0 inline, 0 general)