Index: head/mail/emil/files/patch-Makefile.in =================================================================== --- head/mail/emil/files/patch-Makefile.in (revision 415041) +++ head/mail/emil/files/patch-Makefile.in (revision 415042) @@ -1,81 +1,81 @@ ---- Makefile.in.orig 1996-06-04 13:54:32.000000000 +0200 -+++ Makefile.in 2013-12-29 21:24:36.000000000 +0100 +--- Makefile.in.orig 1996-06-04 11:54:32 UTC ++++ Makefile.in @@ -41,9 +41,10 @@ exec_prefix = @exec_prefix@ #manprefix = bindir = @bindir@ +datadir = @datadir@ libdir = @libdir@ mandir = @mandir@ -manext = 8 +manext = 1 MAINCF = $(libdir)/emil.cf CHARFILE = $(libdir)/charsets.cpl @@ -213,14 +214,14 @@ test: install: installdirs @if test -f emil ; then \ - if test -f $(bindir)/emil ; then \ + if test -f $(DESTDIR)$(bindir)/emil ; then \ echo " " ;\ echo "Saving $(bindir)/emil in $(bindir)/emil.bak" ; \ - mv $(bindir)/emil $(bindir)/emil.bak ; \ + mv $(DESTDIR)$(bindir)/emil $(DESTDIR)$(bindir)/emil.bak ; \ fi ; \ echo " " ;\ echo "Installing emil as $(bindir)/emil" ; \ - $(INSTALL_PROGRAM) emil $(bindir)/emil ; \ + $(INSTALL_PROGRAM) emil $(DESTDIR)$(bindir)/emil ; \ fi ; @if test -f emil.cf ; then \ if test -f $(MAINCF) ; then \ @@ -237,35 +238,41 @@ install: installdirs else \ echo " " ;\ echo "Installing emil.cf as $(MAINCF)" ; \ - $(INSTALL_DATA) emil.cf $(MAINCF) ; \ + $(INSTALL_DATA) emil.cf $(DESTDIR)$(MAINCF) ; \ fi ; \ fi ; @if test -f charset/charsets.cpl ; then \ - if test -f $(CHARFILE) ; then \ + if test -f $(DESTDIR)$(CHARFILE) ; then \ echo " " ;\ echo "Keeping $(CHARFILE) as is" ; \ else \ echo " " ;\ echo "Installing charset/charsets.cpl as $(CHARFILE)";\ - $(INSTALL_DATA) charset/charsets.cpl $(CHARFILE); \ - chmod 444 $(CHARFILE) ; \ + $(INSTALL_DATA) charset/charsets.cpl $(DESTDIR)$(CHARFILE); \ + chmod 444 $(DESTDIR)$(CHARFILE) ; \ fi ; \ fi ; @if test -f emil.$(manext) ; then \ echo " " ;\ echo "Installing emil.$(manext) in $(mandir)/man$(manext)";\ - $(INSTALL_DATA) emil.$(manext) $(mandir)/man$(manext); \ + $(INSTALL_DATA) emil.$(manext) $(DESTDIR)$(mandir)/man$(manext); \ fi ; @if test -f emil.cf.$(manext) ; then \ echo " " ;\ echo "Installing emil.cf.$(manext) in $(mandir)/man$(manext)";\ - $(INSTALL_DATA) emil.cf.$(manext) $(mandir)/man$(manext); \ + $(INSTALL_DATA) emil.cf.$(manext) $(DESTDIR)$(mandir)/man$(manext); \ fi ; @echo " " ; +.if !defined(NOPORTDOCS) + $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/doc/emil + @echo "Installing doc files in $(datadir)/doc/emil" ; + @$(INSTALL_DATA) $(DOCS) $(DESTDIR)$(datadir)/doc/emil/ +.endif + @echo " " ; @echo "Installation done." ; installdirs: - $(srcdir)/mkinstalldirs $(bindir) $(libdir) $(mandir)/man$(manext) + $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(mandir)/man$(manext) uninstall: if test -f $(bindir)/emil ; then \ Index: head/mail/emil/files/patch-charset_Makefile.in =================================================================== --- head/mail/emil/files/patch-charset_Makefile.in (revision 415041) +++ head/mail/emil/files/patch-charset_Makefile.in (revision 415042) @@ -1,10 +1,10 @@ ---- charset/Makefile.in.orig 2014-01-25 18:34:47.000000000 +0100 -+++ charset/Makefile.in 2014-01-25 18:34:49.000000000 +0100 +--- charset/Makefile.in.orig 1994-12-23 07:33:00 UTC ++++ charset/Makefile.in @@ -1,7 +1,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ -CC = gcc CPPFLAGS=-I. -I.. -DXERR INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ Index: head/mail/emil/files/patch-charset_chset.c =================================================================== --- head/mail/emil/files/patch-charset_chset.c (revision 415041) +++ head/mail/emil/files/patch-charset_chset.c (revision 415042) @@ -1,11 +1,11 @@ ---- charset/chset.c.orig 2011-07-25 20:25:55.000000000 +0200 -+++ charset/chset.c 2011-07-25 20:25:56.000000000 +0200 +--- charset/chset.c.orig 1994-11-29 15:08:14 UTC ++++ charset/chset.c @@ -42,7 +42,7 @@ int i; return s; } -void +int main (argc, argv) int argc; char **argv; Index: head/mail/emil/files/patch-charset_conv.c =================================================================== --- head/mail/emil/files/patch-charset_conv.c (revision 415041) +++ head/mail/emil/files/patch-charset_conv.c (revision 415042) @@ -1,15 +1,15 @@ ---- charset/conv.c.orig 2011-07-25 20:26:26.000000000 +0200 -+++ charset/conv.c 2011-07-25 20:25:30.000000000 +0200 +--- charset/conv.c.orig 1994-12-16 12:47:50 UTC ++++ charset/conv.c @@ -65,10 +65,10 @@ Char *b, *bm; } -void +int main (argc, argv) int argc; - Char **argv; + char **argv; { Char s ARRAY(SLEN), r ARRAY(SLEN), *opt=NULL, *o=r, c; char dk ARRAY(3), us ARRAY(3); Index: head/mail/emil/files/patch-charset_dfopen.c =================================================================== --- head/mail/emil/files/patch-charset_dfopen.c (revision 415041) +++ head/mail/emil/files/patch-charset_dfopen.c (revision 415042) @@ -1,10 +1,10 @@ ---- charset/dfopen.c.orig 1994-11-29 16:10:29.000000000 +0100 -+++ charset/dfopen.c 2011-07-25 20:21:13.000000000 +0200 +--- charset/dfopen.c.orig 1994-11-29 15:10:29 UTC ++++ charset/dfopen.c @@ -1,7 +1,6 @@ #include "iso646.h" #include #include -#include #include /* TW 941114 */ #include /* TW 941114 */ #include /* TW 941114 */ Index: head/mail/emil/files/patch-charset_gc.c =================================================================== --- head/mail/emil/files/patch-charset_gc.c (revision 415041) +++ head/mail/emil/files/patch-charset_gc.c (revision 415042) @@ -1,11 +1,11 @@ ---- charset/gc.c.orig 2011-07-25 20:24:02.000000000 +0200 -+++ charset/gc.c 2011-07-25 20:24:04.000000000 +0200 +--- charset/gc.c.orig 1994-11-29 16:01:57 UTC ++++ charset/gc.c @@ -256,7 +256,7 @@ char *file, *mode; } -void +int main (argc, argv) int argc; char **argv; { Index: head/mail/emil/files/patch-configure =================================================================== --- head/mail/emil/files/patch-configure (revision 415041) +++ head/mail/emil/files/patch-configure (revision 415042) @@ -1,10 +1,10 @@ ---- configure.orig 1996-04-19 12:22:41.000000000 +0200 -+++ configure 2011-07-25 20:21:58.000000000 +0200 +--- configure.orig 1996-04-19 10:22:41 UTC ++++ configure @@ -513,7 +513,6 @@ fi -CC=gcc for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. Index: head/mail/emil/files/patch-emil.cf.man =================================================================== --- head/mail/emil/files/patch-emil.cf.man (revision 415041) +++ head/mail/emil/files/patch-emil.cf.man (revision 415042) @@ -1,38 +1,38 @@ ---- emil.cf.man.orig 1996-02-10 14:16:17.000000000 +0100 -+++ emil.cf.man 2011-07-25 20:21:13.000000000 +0200 +--- emil.cf.man.orig 1996-02-10 13:16:17 UTC ++++ emil.cf.man @@ -1,6 +1,6 @@ -.TH EMIL.CF 8 "19 December 1994" +.TH EMIL.CF 1 "19 December 1994" .SH NAME -emil.cf \- configuration file for emil(8) +emil.cf \- configuration file for emil(1) .SH SYNOPSIS .B group .IR "Group_Name" ":" @@ -45,7 +45,7 @@ emil.cf \- configuration file for emil(8 .SH DESCRIPTION The file MAINCF -is used by emil(8) to decide which conversions should be applied to a specific +is used by emil(1) to decide which conversions should be applied to a specific Internet message. Conversion is controlled by the combination of .IR Sender, @@ -127,7 +127,7 @@ european languages. Pick one of Base64, Quoted-printable, 8bit or Se, 7bit. 7bit is default. If BAse64 or Quoted-Printable is selected headers are converted according to RFC1522 (MIME-II). -7bit and Se behaives like in the textenc field. +7bit and Se behaves like in the textenc field. .TP .B "match" @@ -205,7 +205,7 @@ sender, recipient and mail relay. These Martin Wendel (Martin.Wendel@its.uu.se) and Torbjorn Wictorin (Torbjorn.Wictorin@its.uu.se) .SH "SEE ALSO" -emil(8) +emil(1) .SH BUGS None Index: head/mail/emil/files/patch-emil.man =================================================================== --- head/mail/emil/files/patch-emil.man (revision 415041) +++ head/mail/emil/files/patch-emil.man (revision 415042) @@ -1,47 +1,47 @@ ---- emil.man.orig 1996-06-04 13:42:42.000000000 +0200 -+++ emil.man 2011-07-25 20:21:13.000000000 +0200 +--- emil.man.orig 1996-06-04 11:42:42 UTC ++++ emil.man @@ -1,4 +1,4 @@ -.TH EMIL 8 "19 December 1994" +.TH EMIL 1 "19 December 1994" .SH NAME @@ -63,7 +63,7 @@ the changes in encoding and formatting i .BR no spooling. -Emil can be applied by sendmail, if specified as a delviery agent, and can also +Emil can be applied by sendmail, if specified as a delivery agent, and can also invoke sendmail or other programs for it's output. When used like this, emil does not close the connection with the calling sendmail until it returns an EX_OK from the called program, @@ -151,17 +151,17 @@ RFC822. .TP .BI "\-H " Recipient_header_encoding Recipient header encoding. One of Se, 7bit, 8bit, BAse64 or Quoted-printable. -See also emil.cf(8). +See also emil.cf(1). .TP .BI "\-T " Recipient_text_encoding Recipient text encoding. One of Se, 7bit, 8bit, BAse64, BInhex, Quoted-printable -or Uuencode. See also emil.cf(8). +or Uuencode. See also emil.cf(1). .TP .BI "\-G " Target_Group Use Target_Group to specify use of a conversion group, as declared in emil.cf. If Target_Group is specified Emil will not try to resolve conversion group using recipient, sender and recipient host, instead it performs a case -sensitive match on the conversion groups as declared in emil.cf. See also emil.cf(8). +sensitive match on the conversion groups as declared in emil.cf. See also emil.cf(1). .RE Beware, when applying the Sender_charset option, there is no @@ -243,7 +243,7 @@ Torbjorn Wictorin (Torbjorn.Wictorin@its .SH "SEE ALSO" -emil.cf(8) +emil.cf(1) .SH BUGS Index: head/mail/emil/files/patch-func.h =================================================================== --- head/mail/emil/files/patch-func.h (nonexistent) +++ head/mail/emil/files/patch-func.h (revision 415042) @@ -0,0 +1,11 @@ +--- func.h.orig 1996-06-04 13:37:04 UTC ++++ func.h +@@ -166,7 +166,7 @@ int check_encoding(struct message *) + int boundary_check(struct message *); + int is_bound(struct data *, char *); + struct message * copy_mstruct(struct message *, int); +-int getline(struct data *); ++int get_line(struct data *); + int set_end_by_boundary(struct message *, char *); + int set_end_by_lines(struct message *, int); + Property changes on: head/mail/emil/files/patch-func.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/emil/files/patch-getoption.y =================================================================== --- head/mail/emil/files/patch-getoption.y (revision 415041) +++ head/mail/emil/files/patch-getoption.y (revision 415042) @@ -1,17 +1,17 @@ ---- getoption.y.orig 2014-07-06 11:40:52.000000000 +0200 -+++ getoption.y 2014-07-06 11:40:40.000000000 +0200 +--- getoption.y.orig 1996-06-04 13:17:35 UTC ++++ getoption.y @@ -163,13 +163,10 @@ static int Ycmp(char * pattern, char * s extern char * yytext; /* defined by flex */ -/* static int yywrap() +static int yywrap() { return 1; } -*/ - -#define yywrap() 1 static void yyerror(char * msg) { Index: head/mail/emil/files/patch-header.c =================================================================== --- head/mail/emil/files/patch-header.c (nonexistent) +++ head/mail/emil/files/patch-header.c (revision 415042) @@ -0,0 +1,11 @@ +--- header.c.orig 1996-06-04 13:36:56 UTC ++++ header.c +@@ -75,7 +75,7 @@ load_header(struct message *m) + { + buf = indata->contents + indata->offset; + +- if ((linelen = getline(indata)) == 0) ++ if ((linelen = get_line(indata)) == 0) + { + /* End of data, illegal header */ + indata->offset = startoffset; /* Rewind */ Property changes on: head/mail/emil/files/patch-header.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/emil/files/patch-main.c =================================================================== --- head/mail/emil/files/patch-main.c (revision 415041) +++ head/mail/emil/files/patch-main.c (revision 415042) @@ -1,56 +1,56 @@ ---- main.c.orig 1996-06-04 15:36:58.000000000 +0200 -+++ main.c 2011-07-25 20:32:45.000000000 +0200 +--- main.c.orig 1996-06-04 13:36:58 UTC ++++ main.c @@ -69,7 +69,7 @@ int spawn_mailer = 0; int pseudo_route = 0; int in_fd = 0; -FILE * out_fd = stdout; +FILE * out_fd = NULL; FILE * char_fd = NULL; FILE * conf_fd = NULL; off_t pz; @@ -84,6 +84,8 @@ int main(int argc, char *argv[]) char *cmailer = NULL; char *member = NULL; + out_fd = stdout; + #ifdef HAVE_GETPAGESIZE pz = (off_t) getpagesize(); #elif defined(hpux) || defined(_AUX_SOURCE) @@ -177,7 +179,7 @@ int main(int argc, char *argv[]) sprintf(ebuf,"Invalid parameter to -f: %s",optarg); #ifdef DEBUG if (edebug) - fprintf(stderr, ebuf); + fprintf(stderr, "%s", ebuf); #endif logger(LOG_WARNING,ebuf); } @@ -303,7 +305,7 @@ int main(int argc, char *argv[]) sprintf(ebuf,"Invalid flag: -%c",c); #ifdef DEBUG if (edebug) - fprintf(stderr, ebuf); + fprintf(stderr, "%s", ebuf); #endif logger(LOG_WARNING,ebuf); } @@ -359,7 +361,7 @@ int main(int argc, char *argv[]) sprintf(ebuf, "Invalid mailer specification %s", optarg); #ifdef DEBUG if (edebug) - fprintf(stderr, ebuf); + fprintf(stderr, "%s", ebuf); #endif logger(LOG_ERR, ebuf); fprintf(stderr, "Emil: %s\n", ebuf); @@ -448,7 +450,7 @@ int main(int argc, char *argv[]) ); #ifdef DEBUG if (edebug) - fprintf(stderr, ebuf); + fprintf(stderr, "%s", ebuf); #endif logger(LOG_DEBUG,ebuf); if (source == NULL) Index: head/mail/emil/files/patch-message.c =================================================================== --- head/mail/emil/files/patch-message.c (nonexistent) +++ head/mail/emil/files/patch-message.c (revision 415042) @@ -0,0 +1,54 @@ +--- message.c.orig 1996-06-04 13:36:59 UTC ++++ message.c +@@ -93,7 +93,7 @@ move_past_boundary(struct message *m, ch + /* Find start boundary */ + while (is_bound(inbuf, boundary) != TRUE) + { +- if ((linelen = getline(inbuf)) == 0) ++ if ((linelen = get_line(inbuf)) == 0) + { + #ifdef DEBUG + if (edebug) +@@ -115,7 +115,7 @@ move_past_boundary(struct message *m, ch + inbuf->loffset += 1; + } + /* Move past boundary */ +- inbuf->offset += getline(inbuf); ++ inbuf->offset += get_line(inbuf); + inbuf->loffset += 1; + #ifdef DEBUG + if (edebug) +@@ -388,13 +388,13 @@ copy_mstruct(struct message *m, int forc + + /* + * int +- * getline(inbuf) ++ * get_line(inbuf) + * + * Move pointer to next line of inbuf. Return line length. + */ + + int +-getline(struct data *inbuf) ++get_line(struct data *inbuf) + { + unsigned char *tmp; + if (inbuf == NULL || inbuf->contents == NULL || +@@ -423,7 +423,7 @@ set_end_by_boundary(struct message *m, c + loffset = inbuf->loffset; + while (is_bound(inbuf, boundary) != TRUE) + { +- if ((linelen = getline(inbuf)) == 0) ++ if ((linelen = get_line(inbuf)) == 0) + { + if (m->parent) + inbuf->bodyend = m->parent->sd->bodyend; +@@ -471,7 +471,7 @@ set_end_by_lines(struct message *m, int + offset = inbuf->offset; + loffset = inbuf->loffset; + lineend = loffset + lines; +- while ((linelen = getline(inbuf)) != 0 && lineend > inbuf->loffset) ++ while ((linelen = get_line(inbuf)) != 0 && lineend > inbuf->loffset) + { + inbuf->offset += linelen; + inbuf->loffset += 1; Property changes on: head/mail/emil/files/patch-message.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/emil/files/patch-mime.c =================================================================== --- head/mail/emil/files/patch-mime.c (revision 415041) +++ head/mail/emil/files/patch-mime.c (revision 415042) @@ -1,46 +1,46 @@ ---- mime.c.orig 1996-06-04 15:36:59.000000000 +0200 -+++ mime.c 2011-07-25 20:21:13.000000000 +0200 +--- mime.c.orig 1996-06-04 13:36:59 UTC ++++ mime.c @@ -56,18 +56,18 @@ encode_mime(struct message *m) if (match(m->sd->type, "TEXT")) { if (m->td->charset != NULL) - sprintf(buf, "%s; charset=\"%s\"", ct, m->td->charset); + snprintf(buf, sizeof(buf), "%s; charset=\"%s\"", ct, m->td->charset); else - sprintf(buf, "%s", ct); + snprintf(buf, sizeof(buf), "%s", ct); } else if (match(m->sd->type, "MULTIPART")) { bb = (char *)getmimebound(); if (m->sd->applefile == AMDOUBLE) - sprintf(buf, "Multipart/AppleDouble; boundary=\"%s\"", bb); + snprintf(buf, sizeof(buf), "Multipart/AppleDouble; boundary=\"%s\"", bb); else - sprintf(buf,"%s; boundary=\"%s\"", ct, bb); + snprintf(buf, sizeof(buf), "%s; boundary=\"%s\"", ct, bb); m->td->startbound = (char *)Yalloc(MIMEBOUNDLEN + 5); m->td->endbound = (char *)Yalloc(MIMEBOUNDLEN + 7); sprintf(m->td->startbound, "--%s", bb); @@ -75,7 +75,7 @@ encode_mime(struct message *m) } else { - sprintf(buf, "%s", ct); + snprintf(buf, sizeof(buf), "%s", ct); } } else @@ -87,7 +87,10 @@ encode_mime(struct message *m) if (m->sd->name != NULL) { - sprintf(buf, "%s; name=\"%s\"", buf, m->sd->name); + char *buf2; + buf2 = strdup(buf); + snprintf(buf, sizeof(buf), "%s; name=\"%s\"", buf2, m->sd->name); + free(buf2); } add_header(m, "Content-Type", buf, MIME); if (bb != NULL) Index: head/mail/emil/files/patch-mimeparse.c =================================================================== --- head/mail/emil/files/patch-mimeparse.c (revision 415041) +++ head/mail/emil/files/patch-mimeparse.c (revision 415042) @@ -1,43 +1,45 @@ ---- mimeparse.c.orig 1996-06-04 15:36:59.000000000 +0200 -+++ mimeparse.c 2011-07-25 20:21:13.000000000 +0200 -@@ -219,8 +219,39 @@ parse_mime_siblings(struct message *m) +--- mimeparse.c.orig 1996-06-04 13:36:59 UTC ++++ mimeparse.c +@@ -219,9 +219,40 @@ parse_mime_siblings(struct message *m) inbuf->bodystart, inbuf->bodyend); #endif + /* FIX */ + if (m->sd->encoding == EMULTI && m->sd->endbound != NULL) + { + int tttt; + move_past_boundary(m, m->sd->endbound); + for (;;) + { -+ tttt = getline(m->sd); ++ tttt = get_line(m->sd); +#ifdef DEBUG + if (edebug) -+ fprintf(stderr," getline = %d\n", tttt); ++ fprintf(stderr," get_line = %d\n", tttt); +#endif + if (tttt == 1) + { + inbuf->offset += tttt; + inbuf->loffset += 1; + continue; + } + if (tttt == 2 && *(m->sd->contents + m->sd->offset) == '\r') + { + inbuf->offset += tttt; + inbuf->loffset += 1; + continue; + } + break; + } -+ + +- m->sd->offset = m->sd->bodyend; +- if (getline(m->sd) == 0) + } + else + /* END_FIX */ + m->sd->offset = m->sd->bodyend; + - -- m->sd->offset = m->sd->bodyend; - if (getline(m->sd) == 0) ++ ++ if (get_line(m->sd) == 0) return(OK); if (m->sd->offset < m->sd->end) + { Index: head/mail/emil/files/patch-out.c =================================================================== --- head/mail/emil/files/patch-out.c (nonexistent) +++ head/mail/emil/files/patch-out.c (revision 415042) @@ -0,0 +1,11 @@ +--- out.c.orig 1996-06-04 13:37:00 UTC ++++ out.c +@@ -143,7 +143,7 @@ void print_body(struct data *d, struct m + #endif + } + d->offset = d->bodystart; +- while ((len = getline(d)) != 0) ++ while ((len = get_line(d)) != 0) + { + line->end = 0; + append_data(line, (d->contents + d->offset), len, MED_BUF); Property changes on: head/mail/emil/files/patch-out.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/emil/files/patch-rfc822parse.c =================================================================== --- head/mail/emil/files/patch-rfc822parse.c (nonexistent) +++ head/mail/emil/files/patch-rfc822parse.c (revision 415042) @@ -0,0 +1,11 @@ +--- rfc822parse.c.orig 1996-06-04 13:37:01 UTC ++++ rfc822parse.c +@@ -86,7 +86,7 @@ parse_rfc822_message(struct message *m) + + + /* Loop through rest of the message */ +- while ((linelen = getline(inbuf)) != 0) ++ while ((linelen = get_line(inbuf)) != 0) + { + if (inbuf->bodyend <= inbuf->offset && + inbuf->lineend <= inbuf->loffset) Property changes on: head/mail/emil/files/patch-rfc822parse.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/emil/files/patch-uuencode.c =================================================================== --- head/mail/emil/files/patch-uuencode.c (revision 415041) +++ head/mail/emil/files/patch-uuencode.c (revision 415042) @@ -1,20 +1,29 @@ ---- uuencode.c.orig 1996-06-04 15:37:02.000000000 +0200 -+++ uuencode.c 2011-07-25 20:21:13.000000000 +0200 +--- uuencode.c.orig 1996-06-04 13:37:02 UTC ++++ uuencode.c @@ -116,7 +116,7 @@ encode_uuencode(struct message *m) /* Start with uuencode preamble */ fix_filename(m); - sprintf(outb,"begin 644 %s\n", m->sd->name); + snprintf(outb, sizeof(outb), "begin 644 %s\n", m->sd->name); append_data(outbuf, outb, strlen(outb), pz); outbuf->lineend += 1; i = 0; @@ -242,7 +242,7 @@ decode_uuencode(struct message *m) inb++; inbuf->offset += 1; } - if ((i = sscanf(inb, "begin%*1[ ]%*3[0-7]%*1[ ]%s", filename)) != 1) + if ((i = sscanf(inb, "begin%*1[ ]%*3[0-7]%*1[ ]%511s", filename)) != 1) { #ifdef DEBUG if (edebug) +@@ -290,7 +290,7 @@ decode_uuencode(struct message *m) + /* Check for end */ + if (strncmp(inb, "end", 3) == 0) + { +- inbuf->offset += getline(inbuf); ++ inbuf->offset += get_line(inbuf); + inbuf->loffset += 1; + inbuf->bodyend = inbuf->offset; + if (process)