diff options
| -rw-r--r-- | usr.bin/mail/cmd2.c | 31 | ||||
| -rw-r--r-- | usr.bin/mail/cmdtab.c | 5 | ||||
| -rw-r--r-- | usr.bin/mail/collect.c | 10 | ||||
| -rw-r--r-- | usr.bin/mail/extern.h | 5 |
4 files changed, 8 insertions, 43 deletions
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c index 8eaaa029ab3..1637ea475ae 100644 --- a/usr.bin/mail/cmd2.c +++ b/usr.bin/mail/cmd2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd2.c,v 1.15 2004/09/15 22:21:40 deraadt Exp $ */ +/* $OpenBSD: cmd2.c,v 1.16 2009/07/28 16:05:04 martynas Exp $ */ /* $NetBSD: cmd2.c,v 1.7 1997/05/17 19:55:10 pk Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static const char sccsid[] = "@(#)cmd2.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$OpenBSD: cmd2.c,v 1.15 2004/09/15 22:21:40 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: cmd2.c,v 1.16 2009/07/28 16:05:04 martynas Exp $"; #endif #endif /* not lint */ @@ -346,33 +346,6 @@ undeletecmd(void *v) } /* - * Interactively dump core on "core" - */ -int -core(void *v) -{ - pid_t pid; - extern int wait_status; - - switch (pid = vfork()) { - case -1: - warn("vfork"); - return(1); - case 0: - abort(); - _exit(1); - } - fputs("Okie dokie", stdout); - fflush(stdout); - wait_child(pid); - if (WIFSIGNALED(wait_status) && WCOREDUMP(wait_status)) - puts(" -- Core dumped."); - else - puts(" -- Can't dump core."); - return(0); -} - -/* * Add the given header fields to the retained list. * If no arguments, print the current list of retained fields. */ diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c index 93d1fbead74..9f2b8f13838 100644 --- a/usr.bin/mail/cmdtab.c +++ b/usr.bin/mail/cmdtab.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmdtab.c,v 1.11 2008/08/03 14:30:48 martynas Exp $ */ +/* $OpenBSD: cmdtab.c,v 1.12 2009/07/28 16:05:04 martynas Exp $ */ /* $NetBSD: cmdtab.c,v 1.7 1996/12/28 07:10:59 tls Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static const char sccsid[] = "@(#)cmdtab.c 8.2 (Berkeley) 4/20/95"; #else -static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.11 2008/08/03 14:30:48 martynas Exp $"; +static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.12 2009/07/28 16:05:04 martynas Exp $"; #endif #endif /* not lint */ @@ -121,7 +121,6 @@ const struct cmd cmdtab[] = { #if 0 { "Header", { Header }, STRLIST, 0, 1000 }, #endif - { "core", { core }, M|NOLIST, 0, 0 }, { "#", { null }, M|NOLIST, 0, 0 }, { "inc", { inc }, T|NOLIST, 0, 0 }, { "new", { marknew }, MSGLIST, 0, MMNDEL }, diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c index 25c4e47c551..04be18e3a53 100644 --- a/usr.bin/mail/collect.c +++ b/usr.bin/mail/collect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: collect.c,v 1.30 2008/11/03 15:42:35 martynas Exp $ */ +/* $OpenBSD: collect.c,v 1.31 2009/07/28 16:05:04 martynas Exp $ */ /* $NetBSD: collect.c,v 1.9 1997/07/09 05:25:45 mikel Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static const char sccsid[] = "@(#)collect.c 8.2 (Berkeley) 4/19/94"; #else -static const char rcsid[] = "$OpenBSD: collect.c,v 1.30 2008/11/03 15:42:35 martynas Exp $"; +static const char rcsid[] = "$OpenBSD: collect.c,v 1.31 2009/07/28 16:05:04 martynas Exp $"; #endif #endif /* not lint */ @@ -178,12 +178,6 @@ cont: } puts("Unknown tilde escape."); break; - case 'C': - /* - * Dump core. - */ - core(NULL); - break; case '!': /* * Shell escape, send the balance of the diff --git a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h index 67381e9eea4..5255f6529ad 100644 --- a/usr.bin/mail/extern.h +++ b/usr.bin/mail/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.26 2008/07/15 19:23:26 martynas Exp $ */ +/* $OpenBSD: extern.h,v 1.27 2009/07/28 16:05:04 martynas Exp $ */ /* $NetBSD: extern.h,v 1.7 1997/07/09 05:22:00 mikel Exp $ */ /*- @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/20/95 - * $OpenBSD: extern.h,v 1.26 2008/07/15 19:23:26 martynas Exp $ + * $OpenBSD: extern.h,v 1.27 2009/07/28 16:05:04 martynas Exp $ */ struct name; @@ -99,7 +99,6 @@ int cmatch(char *, char *); int collabort(void); void commands(void); int copycmd(void *); -int core(void *); int count(struct name *); int deletecmd(void *); int delm(int *); |