From: | "Mike Frysinger (vapier)" <vapier@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-projects commit in pax-utils: xfuncs.c |
Date: | Tue, 01 Dec 2009 10:15:11 |
Message-Id: | E1NFPlC-0007nu-LX@stork.gentoo.org |
1 | vapier 09/12/01 10:15:06 |
2 | |
3 | Modified: xfuncs.c |
4 | Log: |
5 | allow xstrcat to start off with a NULL destination |
6 | |
7 | Revision Changes Path |
8 | 1.6 pax-utils/xfuncs.c |
9 | |
10 | file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/xfuncs.c?rev=1.6&view=markup |
11 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/xfuncs.c?rev=1.6&content-type=text/plain |
12 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/xfuncs.c?r1=1.5&r2=1.6 |
13 | |
14 | Index: xfuncs.c |
15 | =================================================================== |
16 | RCS file: /var/cvsroot/gentoo-projects/pax-utils/xfuncs.c,v |
17 | retrieving revision 1.5 |
18 | retrieving revision 1.6 |
19 | diff -u -r1.5 -r1.6 |
20 | --- xfuncs.c 31 Jan 2009 18:02:13 -0000 1.5 |
21 | +++ xfuncs.c 1 Dec 2009 10:15:06 -0000 1.6 |
22 | @@ -1,7 +1,7 @@ |
23 | /* |
24 | * Copyright 2003-2007 Gentoo Foundation |
25 | * Distributed under the terms of the GNU General Public License v2 |
26 | - * $Header: /var/cvsroot/gentoo-projects/pax-utils/xfuncs.c,v 1.5 2009/01/31 18:02:13 grobian Exp $ |
27 | + * $Header: /var/cvsroot/gentoo-projects/pax-utils/xfuncs.c,v 1.6 2009/12/01 10:15:06 vapier Exp $ |
28 | * |
29 | * Copyright 2003-2007 Ned Ludd - <solar@g.o> |
30 | * Copyright 2004-2007 Mike Frysinger - <vapier@g.o> |
31 | @@ -65,7 +65,7 @@ |
32 | { |
33 | size_t new_len; |
34 | |
35 | - new_len = strlen(*dst) + strlen(src); |
36 | + new_len = (*curr_len ? strlen(*dst) : 0) + strlen(src); |
37 | if (*curr_len <= new_len) { |
38 | *curr_len = new_len + (*curr_len / 2); |
39 | *dst = realloc(*dst, *curr_len); |