projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix signedness issues.
[apps/madmutt.git]
/
charset.c
diff --git
a/charset.c
b/charset.c
index
b50ca2c
..
761be88
100644
(file)
--- a/
charset.c
+++ b/
charset.c
@@
-193,7
+193,7
@@
void mutt_set_langinfo_charset (void)
char buff[LONG_STRING];
char buff2[LONG_STRING];
char buff[LONG_STRING];
char buff2[LONG_STRING];
-
strfcpy (buff, nl_langinfo (CODESET), sizeof (buff
));
+
m_strcpy(buff, sizeof(buff), nl_langinfo(CODESET
));
mutt_canonical_charset (buff2, sizeof (buff2), buff);
/* finally, set $charset */
mutt_canonical_charset (buff2, sizeof (buff2), buff);
/* finally, set $charset */
@@
-226,16
+226,16
@@
void mutt_canonical_charset (char *dest, size_t dlen, const char *name)
else if (!ascii_strncasecmp (name, "iso8859-", 8))
snprintf (scratch, sizeof (scratch), "iso_8859-%s", name + 8);
else
else if (!ascii_strncasecmp (name, "iso8859-", 8))
snprintf (scratch, sizeof (scratch), "iso_8859-%s", name + 8);
else
-
strfcpy (scratch, NONULL (name), sizeof (scratch
));
+
m_strcpy(scratch, sizeof(scratch), NONULL(name
));
for (i = 0; PreferredMIMENames[i].key; i++)
if (!ascii_strcasecmp (scratch, PreferredMIMENames[i].key) ||
!m_strcasecmp(scratch, PreferredMIMENames[i].key)) {
for (i = 0; PreferredMIMENames[i].key; i++)
if (!ascii_strcasecmp (scratch, PreferredMIMENames[i].key) ||
!m_strcasecmp(scratch, PreferredMIMENames[i].key)) {
-
strfcpy (dest, PreferredMIMENames[i].pref, dlen
);
+
m_strcpy(dest, dlen, PreferredMIMENames[i].pref
);
return;
}
return;
}
-
strfcpy (dest, scratch, dlen
);
+
m_strcpy(dest, dlen, scratch
);
/* for cosmetics' sake, transform to lowercase. */
for (p = dest; *p; p++)
/* for cosmetics' sake, transform to lowercase. */
for (p = dest; *p; p++)
@@
-546,7
+546,7
@@
const char *mutt_get_first_charset (const char *charset)
return "us-ascii";
if (!(c1 = strchr (c, ':')))
return ((char*) charset);
return "us-ascii";
if (!(c1 = strchr (c, ':')))
return ((char*) charset);
-
strfcpy (fcharset, c, c1 - c + 1
);
+
m_strcpy(fcharset, c1 - c + 1, c
);
return fcharset;
}
return fcharset;
}