From owner-p4-projects@FreeBSD.ORG Mon Jun 19 06:35:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D598416A47A; Mon, 19 Jun 2006 06:35:47 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B1B5116A474 for ; Mon, 19 Jun 2006 06:35:47 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C7B143D45 for ; Mon, 19 Jun 2006 06:35:47 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5J6ZloU021827 for ; Mon, 19 Jun 2006 06:35:47 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5J6Zl1M021824 for perforce@freebsd.org; Mon, 19 Jun 2006 06:35:47 GMT (envelope-from als@FreeBSD.org) Date: Mon, 19 Jun 2006 06:35:47 GMT Message-Id: <200606190635.k5J6Zl1M021824@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 99585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jun 2006 06:35:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=99585 Change 99585 by als@als_head on 2006/06/19 06:35:43 Whitespace cleanup. use sysexits(3). Affected files ... .. //depot/projects/jail2/j2_tools/jdisk/jdisk.c#2 edit Differences ... ==== //depot/projects/jail2/j2_tools/jdisk/jdisk.c#2 (text+ko) ==== @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -19,48 +20,46 @@ int main(int argc, char **argv) { - int ch; + int ch; char *error; struct jail_2 j; - int ret; -/* int limit; */ - - /* options descriptor */ - static struct option longopts[] = { - { "ctx", required_argument, NULL, C_CTX }, - { "vroot", required_argument, NULL, C_VROOT }, - { NULL, 0, NULL, 0 } - }; + int ret; + + /* options descriptor */ + static struct option longopts[] = { + {"ctx", required_argument, NULL, C_CTX}, + {"vroot", required_argument, NULL, C_VROOT}, + {NULL, 0, NULL, 0} + }; j.version = 2; j.ctx_id = 0; j.data = NULL; j.cmd = 0; - while ((ch = getopt_long(argc, argv, "", longopts, NULL)) != -1) - { - switch( ch ) { + while ((ch = getopt_long(argc, argv, "", longopts, NULL)) != -1) { + switch (ch) { case C_CTX: - j.ctx_id = strtol(optarg,&error,10); - if( *error != '\0' ) - errx(1,"Error in context identifyer"); + j.ctx_id = strtol(optarg, &error, 10); + if (*error != '\0') + errx(1, "Error in context identifyer"); break; case C_VROOT: j.cmd = C_VROOT; - j.data=optarg; + j.data = optarg; ret = jail(&j); - if(ret != 0) + if (ret != 0) err(2, "%s", "Set vroot"); break; default: usage(); - errx(100,"Unknow command"); + errx(100, "Unknow command"); } } - return( 0 ); + return (EX_OK); } static void usage(void) { - exit(1); + exit(EX_USAGE); }