diff options
| author | Hans Petter <hansp@src.gnome.org> | 2003-09-12 06:04:44 +0800 |
|---|---|---|
| committer | Hans Petter <hansp@src.gnome.org> | 2003-09-12 06:04:44 +0800 |
| commit | 697761cc337aa77a47140c8df50ed84bc25e23f6 (patch) | |
| tree | b785830f72e9938cceaa016a419c7b6d9892bada /libical/src/libicalvcal/vobject.c | |
| parent | 733d77e657516f9a59b5c1a7b62acb87b03ec86f (diff) | |
| download | gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.gz gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.bz2 gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.lz gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.xz gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.zst gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.zip | |
Import new libical from mainline HEAD and make appropriate changes to
Evolution.
svn path=/trunk/; revision=22538
Diffstat (limited to 'libical/src/libicalvcal/vobject.c')
| -rw-r--r-- | libical/src/libicalvcal/vobject.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libical/src/libicalvcal/vobject.c b/libical/src/libicalvcal/vobject.c index b17830eb72..616581ffa8 100644 --- a/libical/src/libicalvcal/vobject.c +++ b/libical/src/libicalvcal/vobject.c @@ -42,6 +42,11 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. * vobject, and convert a vobject into its textual representation. */ +#ifdef WIN32 +#define snprintf _snprintf +#define strcasecmp stricmp +#endif + #include "vobject.h" #include <stdlib.h> #include <string.h> @@ -1244,9 +1249,10 @@ static void writeGroup(OFile *fp, VObject *o) char buf2[256]; strcpy(buf1,NAME_OF(o)); while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) { - strcpy(buf2,STRINGZ_VALUE_OF(o)); - strcat(buf2,"."); - strcat(buf2,buf1); + strncpy(buf2,STRINGZ_VALUE_OF(o),sizeof(buf2)); + buf2[sizeof(buf2)-1] = '\0'; + strncat(buf2,".",sizeof(buf2)-strlen(buf2)-1); + strncat(buf2,buf1,sizeof(buf2)-strlen(buf2)-1); strcpy(buf1,buf2); } appendsOFile(fp,buf1); |