From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 30 18:45:11 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CCC411065672;
	Sat, 30 Jan 2010 18:45:10 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A33318FC0A;
	Sat, 30 Jan 2010 18:45:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UIjADS075808;
	Sat, 30 Jan 2010 18:45:10 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UIjAMb075804;
	Sat, 30 Jan 2010 18:45:10 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001301845.o0UIjAMb075804@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 30 Jan 2010 18:45:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203214 - in projects/capabilities8/lib/csu: amd64
	common i386-elf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2010 18:45:11 -0000

Author: rwatson
Date: Sat Jan 30 18:45:10 2010
New Revision: 203214
URL: http://svn.freebsd.org/changeset/base/203214

Log:
  Merge c170545 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Some CSU cleanup
  
  Submitted by:	Jonathan Anderson <jonathan.anderson at cl.cam.ac.uk>

Modified:
  projects/capabilities8/lib/csu/amd64/crt1.c
  projects/capabilities8/lib/csu/common/crtbrand.c
  projects/capabilities8/lib/csu/i386-elf/crt1_c.c

Modified: projects/capabilities8/lib/csu/amd64/crt1.c
==============================================================================
--- projects/capabilities8/lib/csu/amd64/crt1.c	Sat Jan 30 18:43:54 2010	(r203213)
+++ projects/capabilities8/lib/csu/amd64/crt1.c	Sat Jan 30 18:45:10 2010	(r203214)
@@ -44,7 +44,6 @@ typedef void (*fptr)(void);
 extern void _fini(void);
 extern void _init(void);
 extern int main(int, char **, char **);
-extern int cap_main(int, char **, char **) __attribute__((weak));
 extern void _start(char **, void (*)(void));
 extern void _capstart(char **, void (*)(void));
 

Modified: projects/capabilities8/lib/csu/common/crtbrand.c
==============================================================================
--- projects/capabilities8/lib/csu/common/crtbrand.c	Sat Jan 30 18:43:54 2010	(r203213)
+++ projects/capabilities8/lib/csu/common/crtbrand.c	Sat Jan 30 18:45:10 2010	(r203214)
@@ -54,11 +54,14 @@ static const struct {
 
 
 
-int cap_main(int argc, char **argv, char **env)
+extern int cap_main(int, char **, char **) __attribute__((weak));
+int cap_main(__unused int argc, __unused char **argv, __unused char **env)
 {
 	const char warning[] =
 		"ERROR: attempting to run a regular binary in capability mode!\n\nIf you want to run a binary in a sandbox, you must provide a cap_main() function, which takes the same arguments as main().\n";
 
 	write(2, warning, sizeof(warning));
+
+	return -1;
 }
 

Modified: projects/capabilities8/lib/csu/i386-elf/crt1_c.c
==============================================================================
--- projects/capabilities8/lib/csu/i386-elf/crt1_c.c	Sat Jan 30 18:43:54 2010	(r203213)
+++ projects/capabilities8/lib/csu/i386-elf/crt1_c.c	Sat Jan 30 18:45:10 2010	(r203214)
@@ -45,7 +45,6 @@ typedef void (*fptr)(void);
 extern void _fini(void);
 extern void _init(void);
 extern int main(int, char **, char **);
-extern int cap_main(int, char **, char **) __attribute__((weak));
 extern void _start(char *, ...);
 extern void _capstart(char *, ...);
 
@@ -130,8 +129,8 @@ _capstart(char *ap, ...)
 #endif
 	atexit(_fini);
 #ifdef GCRT
-	monstartup(&eprol, &etext);
-__asm__("eprol:");
+/*	monstartup(&eprol, &etext);
+__asm__("eprol:");*/
 #endif
 	_init();
 	exit( cap_main(argc, argv, env) );