socsvn commit: r253794 - soc2013/dpl/head/contrib/bzip2

[dpl at FreeBSD.org]

Author: dpl
Date: Mon Jul  1 15:12:05 2013
New Revision: 253794
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253794

Log:

Modified:
  soc2013/dpl/head/contrib/bzip2/bzip2.c

Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c
==============================================================================
--- soc2013/dpl/head/contrib/bzip2/bzip2.c	Mon Jul  1 14:49:23 2013	(r253793)
+++ soc2013/dpl/head/contrib/bzip2/bzip2.c	Mon Jul  1 15:12:05 2013	(r253794)
@@ -240,7 +240,7 @@
    io[0].iov_base = buf;
    io[0].iov_len = 1;
 
-   msg.msg_name = 0;
+   msg.msg_name = NULL;
    msg.msg_namelen = 0;
    msg.msg_iov = io;
    msg.msg_iovlen = 1;
@@ -252,7 +252,6 @@
    cmsg.cmsg_type = SCM_RIGHTS;
    *(int *)CMSG_DATA(&cmsg) = fd;
    printf("sendmsg(%d, %p, 0)\n",s, &msg);
-   /* Bad address in args */
    if( (ret = sendmsg(s, &msg, 0)) <= 0){
       printf("sendmsg() returned: %d\n", ret);
       return -1;
@@ -1402,7 +1401,7 @@
        exit(exitValue);
 
      case ( 0 ):
-	   if ((close(sv[0])) < 0){
+	   if ((close(sv[1])) < 0){
 		 fprintf ( stderr, "%s: Couldn't close socket: %s.\n", 
 					 progName, strerror(errno) );
 		 setExit(1);
@@ -1410,14 +1409,14 @@
 	   }
          printf("About to recv infd\n");
          sleep(1);
-       if ((infd = recvfd(sv[1])) < 0){
+       if ((infd = recvfd(sv[0])) < 0){
          fprintf ( stderr, "%s: Couldn't get infd: %s.\n", 
                      progName, strerror(errno) );
          setExit(1);
          exit(exitValue);
        }
 		 printf("About to recv outfd\n");
-       if ((outfd = recvfd(sv[1])) < 0){
+       if ((outfd = recvfd(sv[0])) < 0){
          fprintf ( stderr, "%s: Couldn't get outfd: %s.\n", 
                      progName, strerror(errno) );
          setExit(1);
@@ -1459,14 +1458,14 @@
 	  default:
 	    printf("Parent: infd:%d, outfd:%d\n", infd, outfd);
 		printf("Child's pid: %d\n", forkpid);
-      if ((close(sv[1])) < 0){
+      if ((close(sv[0])) < 0){
          fprintf ( stderr, "%s: Couldn't close fd: %s.\n", 
                      progName, strerror(errno) );
          wait(NULL);
          setExit(1);
          exit(exitValue);
       }
-       if (sendfd(sv[0], infd) < 0){
+      if (sendfd(sv[1], infd) < 0){
          fprintf ( stderr, "%s: Couldn't send infd: %s.\n", 
                      progName, strerror(errno) );
 		 if (signal(forkpid, SIGTERM) < 0)
@@ -1474,16 +1473,16 @@
          wait(NULL);
          setExit(1);
          exit(exitValue);
-       }
-       if (sendfd(sv[0], outfd) < 0){
+      }
+      if (sendfd(sv[1], outfd) < 0){
          fprintf ( stderr, "%s: Couldn't send outfd: %s.\n", 
                      progName, strerror(errno) );
          wait(NULL);
          setExit(1);
          exit(exitValue);
-       }
-       wait(NULL);
-       return;
+      }
+      wait(NULL);
+      return;
    }
 #  endif
 }
@@ -2136,8 +2135,7 @@
 #    endif
    }
 
-#  if CAPSICUM
-   
+#  if CAPSICUM   
    if ( socketpair(PF_LOCAL, SOCK_STREAM, 0, sv) < 0 ){
      fprintf (stderr, "%s: Can't create socket: %s.\n", 
 	               progName, strerror(errno) );
@@ -2145,7 +2143,6 @@
      exit(exitValue);
    }
    printf("socketpair(): sv[0]:%d sv[1]:%d\n", sv[0], sv[1]);
-
 #  endif
 
    if (opMode == OM_Z) {