X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=src%2Fbox.c;h=7bff340ce85cbb993c5ebc0e7dba8d8a584f15c7;hb=24a6e512fa3427c0f7f3003723093ff38ec11637;hp=b72c0595b01309efd0eaa6c5d865d48c2388f3ce;hpb=81f60f3c309cf87db8a5ffcb320d181e8c3f99e2;p=eval.git

diff --git a/src/box.c b/src/box.c
index b72c059..7bff340 100644
--- a/src/box.c
+++ b/src/box.c
@@ -78,7 +78,7 @@ die(char *msg, ...)
 }
 
 static void __attribute__((format(printf,1,2)))
-log(char *msg, ...)
+msg(char *msg, ...)
 {
   va_list args;
   va_start(args, msg);
@@ -132,7 +132,7 @@ valid_filename(unsigned long addr)
     }
   while (*p++);
 
-  log("[%s] ", namebuf);
+  msg("[%s] ", namebuf);
   if (file_access >= 3)
     return;
   if (!strchr(namebuf, '/') && strcmp(namebuf, ".."))
@@ -264,11 +264,11 @@ valid_syscall(struct user *u)
       return allow_times;
     case __NR_kill:
       if (u->regs.ebx == box_pid)
-	die("Commited suicide by signal %d", (int)u->regs.ecx);
+	die("Committed suicide by signal %d", (int)u->regs.ecx);
       return 0;
     case __NR_tgkill:
       if (u->regs.ebx == box_pid && u->regs.ecx == box_pid)
-	die("Commited suicide by signal %d", (int)u->regs.edx);
+	die("Committed suicide by signal %d", (int)u->regs.edx);
       return 0;
     default:
       return 0;
@@ -421,10 +421,10 @@ boxkeeper(void)
 		die("ptrace(PTRACE_GETREGS): %m");
 	      stop_count++;
 	      if (!stop_count)			/* Traceme request */
-		log(">> Traceme request caught\n");
+		msg(">> Traceme request caught\n");
 	      else if (stop_count & 1)		/* Syscall entry */
 		{
-		  log(">> Syscall %3ld (%08lx,%08lx,%08lx) ", u.regs.orig_eax, u.regs.ebx, u.regs.ecx, u.regs.edx);
+		  msg(">> Syscall %3ld (%08lx,%08lx,%08lx) ", u.regs.orig_eax, u.regs.ebx, u.regs.ecx, u.regs.edx);
 		  syscall_count++;
 		  if (!valid_syscall(&u))
 		    {
@@ -441,12 +441,12 @@ boxkeeper(void)
 		    }
 		}
 	      else					/* Syscall return */
-		log("= %ld\n", u.regs.eax);
+		msg("= %ld\n", u.regs.eax);
 	      ptrace(PTRACE_SYSCALL, box_pid, 0, 0);
 	    }
 	  else if (sig != SIGSTOP && sig != SIGXCPU && sig != SIGXFSZ)
 	    {
-	      log(">> Signal %d\n", sig);
+	      msg(">> Signal %d\n", sig);
 	      ptrace(PTRACE_SYSCALL, box_pid, 0, sig);
 	    }
 	  else
@@ -462,7 +462,7 @@ box_inside(int argc, char **argv)
 {
   struct rlimit rl;
   char *args[argc+1];
-  char *env[1] = { NULL };
+  char *env[] = { "LIBC_FATAL_STDERR_=1", NULL };
 
   memcpy(args, argv, argc * sizeof(char *));
   args[argc] = NULL;