striplt() is now string_trim()
[citadel.git] / libcitadel / lib / mime_parser.c
index 105d29a39c0297681a6550093ad9981c6a845e3e..d6ff049edafbd6d7df668cc867edf2663e0a3589 100644 (file)
@@ -2,19 +2,8 @@
 //
 // Copyright (c) 1998-2022 by the citadel.org development team.
 //
-// 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
+// This program is open source software.  Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -401,7 +390,7 @@ static long parse_MimeHeaders(interesting_mime_headers *m,
                        if (!strncasecmp(header, "Content-type:", 13)) {
                                memcpy (m->b[content_type].Key, &header[13], headerlen - 12);
                                m->b[content_type].Key[headerlen - 12] = '\0';
-                               m->b[content_type].len = striplt (m->b[content_type].Key);
+                               m->b[content_type].len = string_trim (m->b[content_type].Key);
 
                                m->b[content_type_name].len = extract_key(m->b[content_type_name].Key, CKEY(m->b[content_type]), HKEY("name"), '=');
                                m->b[charset].len           = extract_key(m->b[charset].Key,           CKEY(m->b[content_type]), HKEY("charset"), '=');
@@ -422,18 +411,18 @@ static long parse_MimeHeaders(interesting_mime_headers *m,
                        else if (!strncasecmp(header, "Content-Disposition:", 20)) {
                                memcpy (m->b[disposition].Key, &header[20], headerlen - 19);
                                m->b[disposition].Key[headerlen - 19] = '\0';
-                               m->b[disposition].len = striplt(m->b[disposition].Key);
+                               m->b[disposition].len = string_trim(m->b[disposition].Key);
 
                                m->b[content_disposition_name].len = extract_key(m->b[content_disposition_name].Key, CKEY(m->b[disposition]), HKEY("name"), '=');
                                m->b[filename].len                 = extract_key(m->b[filename].Key,                 CKEY(m->b[disposition]), HKEY("filename"), '=');
                                pch = strchr(m->b[disposition].Key, ';');
                                if (pch != NULL) *pch = '\0';
-                               m->b[disposition].len = striplt(m->b[disposition].Key);
+                               m->b[disposition].len = string_trim(m->b[disposition].Key);
                        }
                        else if (!strncasecmp(header, "Content-ID:", 11)) {
                                memcpy(m->b[id].Key, &header[11], headerlen - 11);
                                m->b[id].Key[headerlen - 11] = '\0';
-                               striplt(m->b[id].Key);
+                               string_trim(m->b[id].Key);
                                m->b[id].len = stripallbut(m->b[id].Key, '<', '>');
                        }
                        else if (!strncasecmp(header, "Content-length: ", 15)) {
@@ -446,7 +435,7 @@ static long parse_MimeHeaders(interesting_mime_headers *m,
                        else if (!strncasecmp(header, "Content-transfer-encoding: ", 26)) {
                                memcpy(m->b[encoding].Key, &header[26], headerlen - 26);
                                m->b[encoding].Key[headerlen - 26] = '\0';
-                               m->b[encoding].len = striplt(m->b[encoding].Key);
+                               m->b[encoding].len = string_trim(m->b[encoding].Key);
                        }
                        *header = '\0';
                        headerlen = 0;