diff -ruNpd dash-0.5.5.1/src/Makefile.am dash-0.5.5.1-patched/src/Makefile.am --- dash-0.5.5.1/src/Makefile.am 2009-01-14 01:37:13.000000000 +0200 +++ dash-0.5.5.1-patched/src/Makefile.am 2009-03-20 17:26:28.000000000 +0200 @@ -19,14 +19,14 @@ bin_PROGRAMS = dash dash_CFILES = \ alias.c arith_yacc.c arith_yylex.c cd.c error.c eval.c exec.c expand.c \ - histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \ + histedit.c input.c jobs.c main.c memalloc.c miscbltin.c \ mystring.c options.c parser.c redir.c show.c trap.c output.c \ bltin/printf.c system.c bltin/test.c bltin/times.c var.c dash_SOURCES = \ $(dash_CFILES) \ alias.h arith_yacc.h bltin/bltin.h cd.h error.h eval.h exec.h \ expand.h hetio.h \ - init.h input.h jobs.h machdep.h mail.h main.h memalloc.h miscbltin.h \ + init.h input.h jobs.h machdep.h main.h memalloc.h miscbltin.h \ myhistedit.h mystring.h options.h output.h parser.h redir.h shell.h \ show.h system.h trap.h var.h dash_LDADD = builtins.o init.o nodes.o signames.o syntax.o diff -ruNpd dash-0.5.5.1/src/Makefile.in dash-0.5.5.1-patched/src/Makefile.in --- dash-0.5.5.1/src/Makefile.in 2009-01-14 01:37:31.000000000 +0200 +++ dash-0.5.5.1-patched/src/Makefile.in 2009-03-20 17:26:28.000000000 +0200 @@ -51,7 +51,7 @@ am__objects_1 = alias.$(OBJEXT) arith_ya arith_yylex.$(OBJEXT) cd.$(OBJEXT) error.$(OBJEXT) \ eval.$(OBJEXT) exec.$(OBJEXT) expand.$(OBJEXT) \ histedit.$(OBJEXT) input.$(OBJEXT) jobs.$(OBJEXT) \ - mail.$(OBJEXT) main.$(OBJEXT) memalloc.$(OBJEXT) \ + main.$(OBJEXT) memalloc.$(OBJEXT) \ miscbltin.$(OBJEXT) mystring.$(OBJEXT) options.$(OBJEXT) \ parser.$(OBJEXT) redir.$(OBJEXT) show.$(OBJEXT) trap.$(OBJEXT) \ output.$(OBJEXT) printf.$(OBJEXT) system.$(OBJEXT) \ @@ -172,7 +172,7 @@ COMPILE_FOR_BUILD = \ dash_CFILES = \ alias.c arith_yacc.c arith_yylex.c cd.c error.c eval.c exec.c expand.c \ - histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \ + histedit.c input.c jobs.c main.c memalloc.c miscbltin.c \ mystring.c options.c parser.c redir.c show.c trap.c output.c \ bltin/printf.c system.c bltin/test.c bltin/times.c var.c @@ -180,7 +180,7 @@ dash_SOURCES = \ $(dash_CFILES) \ alias.h arith_yacc.h bltin/bltin.h cd.h error.h eval.h exec.h \ expand.h hetio.h \ - init.h input.h jobs.h machdep.h mail.h main.h memalloc.h miscbltin.h \ + init.h input.h jobs.h machdep.h main.h memalloc.h miscbltin.h \ myhistedit.h mystring.h options.h output.h parser.h redir.h shell.h \ show.h system.h trap.h var.h @@ -275,7 +275,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/histedit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/input.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memalloc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/miscbltin.Po@am__quote@ diff -ruNpd dash-0.5.5.1/src/mail.c dash-0.5.5.1-patched/src/mail.c --- dash-0.5.5.1/src/mail.c 2009-01-14 01:37:13.000000000 +0200 +++ dash-0.5.5.1-patched/src/mail.c 1970-01-01 02:00:00.000000000 +0200 @@ -1,112 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * Copyright (c) 1997-2005 - * Herbert Xu . All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Kenneth Almquist. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Routines to check for mail. (Perhaps make part of main.c?) - */ -#include -#include -#include - -#include "shell.h" -#include "nodes.h" -#include "exec.h" /* defines padvance() */ -#include "var.h" -#include "output.h" -#include "memalloc.h" -#include "error.h" -#include "mail.h" -#include "mystring.h" - - -#define MAXMBOXES 10 - -/* times of mailboxes */ -static time_t mailtime[MAXMBOXES]; -/* Set if MAIL or MAILPATH is changed. */ -static int changed; - - - -/* - * Print appropriate message(s) if mail has arrived. If changed is set, - * then the value of MAIL has changed, so we just update the values. - */ - -void -chkmail(void) -{ - const char *mpath; - char *p; - char *q; - time_t *mtp; - struct stackmark smark; - struct stat64 statb; - - setstackmark(&smark); - mpath = mpathset() ? mpathval() : mailval(); - for (mtp = mailtime; mtp < mailtime + MAXMBOXES; mtp++) { - p = padvance(&mpath, nullstr); - if (p == NULL) - break; - if (*p == '\0') - continue; - for (q = p ; *q ; q++); -#ifdef DEBUG - if (q[-1] != '/') - abort(); -#endif - q[-1] = '\0'; /* delete trailing '/' */ - if (stat64(p, &statb) < 0) { - *mtp = 0; - continue; - } - if (!changed && statb.st_mtime != *mtp) { - outfmt( - &errout, snlfmt, - pathopt ? pathopt : "you have mail" - ); - } - *mtp = statb.st_mtime; - } - changed = 0; - popstackmark(&smark); -} - - -void -changemail(const char *val) -{ - changed++; -} diff -ruNpd dash-0.5.5.1/src/mail.h dash-0.5.5.1-patched/src/mail.h --- dash-0.5.5.1/src/mail.h 2009-01-14 01:37:13.000000000 +0200 +++ dash-0.5.5.1-patched/src/mail.h 1970-01-01 02:00:00.000000000 +0200 @@ -1,38 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * Copyright (c) 1997-2005 - * Herbert Xu . All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Kenneth Almquist. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)mail.h 8.2 (Berkeley) 5/4/95 - */ - -void chkmail(void); -void changemail(const char *); diff -ruNpd dash-0.5.5.1/src/main.c dash-0.5.5.1-patched/src/main.c --- dash-0.5.5.1/src/main.c 2009-01-14 01:37:13.000000000 +0200 +++ dash-0.5.5.1-patched/src/main.c 2009-03-20 17:26:28.000000000 +0200 @@ -41,7 +41,7 @@ #include "shell.h" #include "main.h" -#include "mail.h" +//#include "mail.h" #include "options.h" #include "output.h" #include "parser.h" @@ -220,7 +220,7 @@ cmdloop(int top) inter = 0; if (iflag && top) { inter++; - chkmail(); + //chkmail(); } n = parsecmd(inter); /* showtree(n); DEBUG */ diff -ruNpd dash-0.5.5.1/src/var.c dash-0.5.5.1-patched/src/var.c --- dash-0.5.5.1/src/var.c 2009-01-14 01:37:13.000000000 +0200 +++ dash-0.5.5.1-patched/src/var.c 2009-03-20 17:26:28.000000000 +0200 @@ -48,7 +48,7 @@ #include "exec.h" #include "syntax.h" #include "options.h" -#include "mail.h" +//#include "mail.h" #include "var.h" #include "memalloc.h" #include "error.h" @@ -83,8 +83,8 @@ struct var varinit[] = { #else { 0, VSTRFIXED|VTEXTFIXED|VUNSET, "IFS\0", 0 }, #endif - { 0, VSTRFIXED|VTEXTFIXED|VUNSET, "MAIL\0", changemail }, - { 0, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH\0", changemail }, + { 0, VSTRFIXED|VTEXTFIXED|VUNSET, "MAIL\0", 0 }, + { 0, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH\0", 0 }, { 0, VSTRFIXED|VTEXTFIXED, defpathvar, changepath }, { 0, VSTRFIXED|VTEXTFIXED, "PS1=$ ", 0 }, { 0, VSTRFIXED|VTEXTFIXED, "PS2=> ", 0 },