more f*n places for d_nam<e>len

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

diff --git a/libcitadel/lib/mime_parser.c b/libcitadel/lib/mime_parser.c
index 11f2a27cfb9b3a1938ea7dd87a8742e5ef4fc99a..1fc037d43ffd77462434eb93f645001f4dbb251a 100644 (file)
--- a/libcitadel/lib/mime_parser.c
+++ b/libcitadel/lib/mime_parser.c
@@ -135,7 +135,7 @@ char *fixed_partnum(char *supplied_partnum) {
 
 static inline unsigned int _decode_hex(const char *Source)
 {
-       int ret = '?';
+       unsigned int ret = '?';
        unsigned char LO_NIBBLE;
        unsigned char HI_NIBBLE;
 
@@ -178,7 +178,6 @@ int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen) {
                        }
                        else
                        {
-                               ch = 0;
                                ch = _decode_hex(&encoded[pos]);
                                pos += 2;
                                decoded[decoded_length++] = ch;
@@ -217,13 +216,13 @@ void mime_decode(char *partnum,
 
        /* Some encodings aren't really encodings */
        if (!strcasecmp(encoding, "7bit"))
-               strcpy(encoding, "");
+               *encoding = '\0';
        if (!strcasecmp(encoding, "8bit"))
-               strcpy(encoding, "");
+               *encoding = '\0';
        if (!strcasecmp(encoding, "binary"))
-               strcpy(encoding, "");
+               *encoding = '\0';
        if (!strcasecmp(encoding, "ISO-8859-1"))
-               strcpy(encoding, "");
+               *encoding = '\0';
 
        /* If this part is not encoded, send as-is */
        if ( (strlen(encoding) == 0) || (dont_decode)) {
@@ -305,11 +304,11 @@ int mime_decode_now (char *part_start,
        *decoded = NULL;
        /* Some encodings aren't really encodings */
        if (!strcasecmp(encoding, "7bit"))
-               strcpy(encoding, "");
+               *encoding = '\0';
        if (!strcasecmp(encoding, "8bit"))
-               strcpy(encoding, "");
+               *encoding = '\0';
        if (!strcasecmp(encoding, "binary"))
-               strcpy(encoding, "");
+               *encoding = '\0';
 
        /* If this part is not encoded, send as-is */
        if (strlen(encoding) == 0) {
@@ -1058,8 +1057,8 @@ int LoadIconDir(const char *DirName)
        {
                char *MinorPtr;
                char *PStart;
-#ifdef _DIRENT_HAVE_D_NAMELEN
-               d_namelen = filedir_entry->d_namelen;
+#ifdef _DIRENT_HAVE_D_NAMLEN
+               d_namelen = filedir_entry->d_namlen;
 #else
                d_namelen = strlen(filedir_entry->d_name);
 #endif