From owner-svn-soc-all@FreeBSD.ORG Tue Jun 25 19:14:42 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A46354F2 for ; Tue, 25 Jun 2013 19:14:42 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) by mx1.freebsd.org (Postfix) with ESMTP id 8655F1EF8 for ; Tue, 25 Jun 2013 19:14:42 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5PJEfgQ053177 for ; Tue, 25 Jun 2013 19:14:41 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5PJEfxQ053175 for svn-soc-all@FreeBSD.org; Tue, 25 Jun 2013 19:14:41 GMT (envelope-from dpl@FreeBSD.org) Date: Tue, 25 Jun 2013 19:14:41 GMT Message-Id: <201306251914.r5PJEfxQ053175@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253495 - soc2013/dpl/head/contrib/bzip2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jun 2013 19:14:42 -0000 Author: dpl Date: Tue Jun 25 19:14:41 2013 New Revision: 253495 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253495 Log: Rewrite socketpair(), and open correctly the files (only compressing). Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c ============================================================================== --- soc2013/dpl/head/contrib/bzip2/bzip2.c Tue Jun 25 18:44:15 2013 (r253494) +++ soc2013/dpl/head/contrib/bzip2/bzip2.c Tue Jun 25 19:14:41 2013 (r253495) @@ -221,7 +221,7 @@ FILE *outputHandleJustInCase; Int32 workFactor; -#if CAPSICUM == 1 +#if CAPSICUM int sv[2], len; int sendfd(int, int); @@ -1316,6 +1316,7 @@ break; case SM_F2O: + inStr = fopen ( inName, "rb" ); outStr = stdout; if ( isatty ( fileno ( stdout ) ) ) { fprintf ( stderr, @@ -1323,7 +1324,6 @@ progName ); fprintf ( stderr, "%s: For help, type: `%s --help'.\n", progName, progName ); - inStr = fopen ( inName, "rb" ); if ( inStr != NULL ) fclose ( inStr ); setExit(1); return; @@ -1337,11 +1337,11 @@ break; case SM_F2F: + inStr = fopen ( inName, "rb" ); outStr = fopen_output_safely ( outName, "wb" ); if ( outStr == NULL) { fprintf ( stderr, "%s: Can't create output file %s: %s.\n", progName, outName, strerror(errno) ); - inStr = fopen ( inName, "rb" ); if ( inStr != NULL ) fclose ( inStr ); setExit(1); return; @@ -1367,13 +1367,10 @@ } # if CAPSICUM - fprintf(stderr,"infd: %d\n", fileno(inStr)); infd = fileno(inStr); - fprintf(stderr,"infd: %d\n", infd); outfd = fileno(outStr); - fprintf(stderr,"outfd: %d\n", outfd); - /*cap_rights_limit(infd, CAP_READ);*/ - /*cap_rights_limit(outfd, CAP_WRITE);*/ + cap_rights_limit(infd, CAP_READ); + cap_rights_limit(outfd, CAP_WRITE); if(fclose(inStr) < 0){ fprintf ( stderr, "%s: Couldn't close inStr: %s.\n", @@ -1388,14 +1385,18 @@ exit(exitValue); } - printf("About to fork()"); + printf("About to fork()\n"); /* Pass the limited file descriptors with a unix domain socket. */ switch( forkpid = fork() ) { + case ( -1 ): + fprintf ( stderr, "%s: Couldn't fork: %s.\n", progName, strerror(errno) ); + setExit(1); + exit(exitValue); + case ( 0 ): - sleep(1); printf("Child\n"); if ((infd = recvfd(sv[1])) <= 0){ - fprintf ( stderr, "%s: Couldn't get fd: %s.\n", + fprintf ( stderr, "%s: Couldn't get fd infd: %s.\n", progName, strerror(errno) ); setExit(1); exit(exitValue); @@ -1404,7 +1405,7 @@ inStr = fdopen(infd, "rb"); if ((outfd = recvfd(sv[1])) <= 0){ - fprintf ( stderr, "%s: Couldn't get fd: %s.\n", + fprintf ( stderr, "%s: Couldn't get fd outfd: %s.\n", progName, strerror(errno) ); setExit(1); exit(exitValue); @@ -1442,15 +1443,20 @@ # if CAPSICUM break; - case ( -1 ): - fprintf ( stderr, "%s: Couldn't fork: %s.\n", progName, strerror(errno) ); - setExit(1); - exit(exitValue); - default: - sendfd(sv[0], infd); - sendfd(sv[0], outfd); - printf("Waiting\n"); + printf("infd:%d, outfd:%d\n", infd, outfd); + if (sendfd(sv[0], infd) < 0){ + fprintf ( stderr, "%s: Couldn't send fd infd: %s.\n", + progName, strerror(errno) ); + setExit(1); + exit(exitValue); + } + if (sendfd(sv[0], outfd) < 0){ + fprintf ( stderr, "%s: Couldn't send fd outfd: %s.\n", + progName, strerror(errno) ); + setExit(1); + exit(exitValue); + } wait(0); return; } @@ -2105,6 +2111,17 @@ # endif } +# if CAPSICUM + + if ( socketpair(PF_LOCAL, SOCK_STREAM, 0, sv) < 0 ){ + fprintf (stderr, "%s: Can't create socket: %s.\n", + progName, strerror(errno) ); + setExit(1); + exit(exitValue); + } + +# endif + if (opMode == OM_Z) { if (srcMode == SM_I2O) { compress ( NULL );