Make the swap buffer content function publically available.

[citadel.git] / libcitadel / lib / vnote.c

diff --git a/libcitadel/lib/vnote.c b/libcitadel/lib/vnote.c
index a3564eb28067448aa5baba42bba73a2c79ad41f1..feeee928915a3bf008e71d6a112ec3364760700e 100644 (file)
--- a/libcitadel/lib/vnote.c
+++ b/libcitadel/lib/vnote.c
@@ -1,11 +1,21 @@
 /*
- * $Id$
- *
  * vNote implementation for Citadel
  *
  * Copyright (C) 1999-2007 by the citadel.org development team.
- * This code is freely redistributable under the terms of the GNU General
- * Public License.  All other rights reserved.
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 
@@ -70,10 +80,10 @@ struct vnote *vnote_new_from_str(char *s) {
                thisline = NULL;
                nexteol = strchr(ptr, '\n');
                if (nexteol) {
-                       thisline = malloc((nexteol - ptr) + 2);
-                       strncpy(thisline, ptr, (nexteol-ptr));
                        thisline_len = (nexteol-ptr);
-                       thisline[thisline_len] = 0;
+                       thisline = malloc(thisline_len + 2);
+                       memcpy(thisline, ptr, thisline_len);
+                       thisline[thisline_len] = '\0';
                        ptr = nexteol + 1;
                }
                else {
@@ -96,9 +106,8 @@ struct vnote *vnote_new_from_str(char *s) {
                                *encoded_value++ = 0;
 
                                /* any qualifiers?  (look for a semicolon) */
-                               is_base64 = (int) bmstrcasestr(thisline, "encoding=base64");
-                               is_quoted_printable = (int) bmstrcasestr(thisline,
-                                                               "encoding=quoted-printable");
+                               is_base64 = bmstrcasestr(thisline, "encoding=base64") ? 1 : 0;
+                               is_quoted_printable = bmstrcasestr(thisline, "encoding=quoted-printable") ? 1 : 0;
 
                                char *semicolon_pos = strchr(thisline, ';');
                                if (semicolon_pos) {
@@ -203,7 +212,7 @@ void vnote_serialize_output_field(char *append_to, char *field, char *label) {
 
        mydup = malloc((strlen(field) * 3) + 1);
        if (!mydup) return;
-       strcpy(mydup, "");
+       *mydup = '\0';
 
        while (ptr[pos] != 0) {
                ch = (unsigned char)(ptr[pos++]);
@@ -246,7 +255,7 @@ char *vnote_serialize(struct vnote *v) {
        s = malloc(bytes_needed);
        if (!s) return NULL;
 
-       strcpy(s, "");
+       *s = '\0';
        vnote_serialize_output_field(s, "vnote", "BEGIN");
        vnote_serialize_output_field(s, "//Citadel//vNote handler library//EN", "PRODID");
        vnote_serialize_output_field(s, "1.1", "VERSION");