head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.46
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.44
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.42
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.40
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.38
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.36
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.34
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.32
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.30
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.28
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.26
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.24
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.22
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.20
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.18
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.16
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.14
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.12
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.10
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.8
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.6
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.4
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.2
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.2.0.2
	pkgsrc-2004Q3-base:1.2;
locks; strict;
comment	@# @;


1.3
date	2004.11.29.01.39.17;	author minskim;	state dead;
branches;
next	1.2;

1.2
date	2004.07.28.02.51.31;	author kim;	state Exp;
branches;
next	1.1;

1.1
date	2004.07.28.02.50.22;	author kim;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Update abook to 0.5.3.

Changes:
 - add allcvs filters (Christoph Sobotka)
 - removed a lefover debug message
 - fixed mutt import filter nickname cutoff
 - wrap searches
 - contrib updates
@
text
@$NetBSD: patch-aa,v 1.2 2004/07/28 02:51:31 kim Exp $

--- filter.c	2004/01/23 07:14:32	1.29
+++ filter.c	2004/03/25 18:19:38	1.30
@@@@ -618,6 +618,7 @@@@
 mutt_read_line(FILE *in, char **alias, char **rest)
 {
 	char *line, *ptr, *tmp;
+	size_t alias_len;
 
 	if( !(line = ptr = getaline(in)) )
 		return 1; /* error / EOF */
@@@@ -640,13 +641,16 @@@@
 	while( ! ISSPACE(*ptr) )
 		ptr++;
 
-	if( (*alias = (char *)malloc(ptr - tmp)) == NULL) {
+	/* includes also the trailing zero */
+	alias_len = (size_t)(ptr - tmp + 1);
+
+	if( (*alias = (char *)malloc(alias_len)) == NULL) {
 		free(line);
 		return 1;
 	}
 
-	strncpy(*alias, tmp, ptr - tmp - 1);
-	*(*alias + (ptr - tmp - 1)) = 0;
+	strncpy(*alias, tmp, alias_len - 1);
+	*(*alias + alias_len - 1) = 0;
 
 	while(ISSPACE(*ptr))
 		ptr++;
@


1.2
log
@Oops, remove RCS keywords from the patch...
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1 2004/07/28 02:50:22 kim Exp $
@


1.1
log
@Add a patch from abook CVS to fix string truncation in mutt import filter.
@
text
@d1 1
a1 1
$NetBSD$
a4 8
@@@@ -1,6 +1,6 @@@@
 
 /*
- * $Id: filter.c,v 1.29 2004/01/23 07:14:32 jheinonen Exp $
+ * $Id: filter.c,v 1.30 2004/03/25 18:19:38 jheinonen Exp $
  *
  * by JH <jheinonen@@users.sourceforge.net>
  *
@