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

[dpl at FreeBSD.org]

Author: dpl
Date: Sun Jun 30 12:04:11 2013
New Revision: 253727
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253727

Log:
  Changes in debugging messages.
  

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

Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c
==============================================================================
--- soc2013/dpl/head/contrib/bzip2/bzip2.c	Sun Jun 30 10:38:20 2013	(r253726)
+++ soc2013/dpl/head/contrib/bzip2/bzip2.c	Sun Jun 30 12:04:11 2013	(r253727)
@@ -233,13 +233,14 @@
 {
    struct msghdr msg;   
    struct cmsghdr cmsg;
-   char buf = { "!" };
    struct iovec io[1];
+   char buf = { "!" };
+   int ret;
 
    io[0].iov_base = buf;
    io[0].iov_len = 1;
 
-   msg.msg_name = NULL;
+   msg.msg_name = 0;
    msg.msg_namelen = 0;
    msg.msg_iov = io;
    msg.msg_iovlen = 1;
@@ -250,8 +251,12 @@
    cmsg.cmsg_level = SOL_SOCKET;
    cmsg.cmsg_type = SCM_RIGHTS;
    *(int *)CMSG_DATA(&cmsg) = fd;
-   if(sendmsg(s, &msg, 0) <= 0)
+   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;
+   }
    return 0;
 }
 
@@ -1397,12 +1402,12 @@
        exit(exitValue);
 
      case ( 0 ):
-       /*if ((close(sv[0])) < 0){
-         fprintf ( stderr, "%s: Couldn't close socket: %s.\n", 
-                     progName, strerror(errno) );
-         setExit(1);
-         exit(exitValue);
-       }*/
+	   if ((close(sv[0])) < 0){
+		 fprintf ( stderr, "%s: Couldn't close socket: %s.\n", 
+					 progName, strerror(errno) );
+		 setExit(1);
+		 exit(exitValue);
+	   }
          printf("About to recv infd\n");
          sleep(1);
        if ((infd = recvfd(sv[1])) < 0){
@@ -1418,7 +1423,7 @@
          setExit(1);
          exit(exitValue);
        }
-	    printf("Child: infd:%d, outfd:%d\n", infd, outfd);
+    printf("Child: infd:%d, outfd:%d\n", infd, outfd);
        inStr = fdopen(infd, "rb");
        outStr = fdopen(outfd, "wb");
        
@@ -1453,16 +1458,19 @@
 
 	  default:
 	    printf("Parent: infd:%d, outfd:%d\n", infd, outfd);
-       /*if ((close(sv[1])) < 0){
+		printf("Child's pid: %d\n", forkpid);
+      if ((close(sv[1])) < 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){
          fprintf ( stderr, "%s: Couldn't send infd: %s.\n", 
                      progName, strerror(errno) );
+		 if (signal(forkpid, SIGTERM) < 0)
+            printf("Couldn't kill the child process, please press ^C\n");
          wait(NULL);
          setExit(1);
          exit(exitValue);
@@ -2136,7 +2144,7 @@
      setExit(1);
      exit(exitValue);
    }
-   printf("socketpair() ended fine: sv[0]:%d sv[1]:%d\n", sv[0], sv[1]);
+   printf("socketpair(): sv[0]:%d sv[1]:%d\n", sv[0], sv[1]);
 
 #  endif