svn commit: r203214 - in projects/capabilities8/lib/csu: amd64 common i386-elf

[Robert Watson]

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) );