}
if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent) {
- struct utsname un;
- char *os;
+ const char *os;
if (OperatingSystem != NULL) {
os = OperatingSystem;
- }
- else {
- if (uname (&un) == -1) {
- os = "UNIX";
- }
- else {
- os = un.sysname;
- }
+ } else {
+ struct utsname un;
+ os = (uname(&un) == -1) ? "UNIX" : un.sysname;
}
/* Add a vanity header */
fprintf (fp, "User-Agent: %s (%s)\n", mutt_make_version (0), os);
return (args);
}
-static char **add_option (char **args, size_t * argslen, size_t * argsmax,
- char *s)
+static char **add_option(const char **args, size_t * argslen, size_t * argsmax,
+ const char *s)
{
- if (*argslen == *argsmax)
- mem_realloc (&args, (*argsmax += 5) * sizeof (char *));
- args[(*argslen)++] = s;
- return (args);
+ if (*argslen == *argsmax) {
+ mem_realloc(&args, (*argsmax += 5) * sizeof (char *));
+ }
+ args[(*argslen)++] = s;
+ return (args);
}
static int mutt_invoke_sendmail (ADDRESS * from, /* the sender */
rewind (tempfp);
while (fgets (sasha, sizeof (sasha), tempfp) != NULL)
lines++;
- fprintf (msg->fp, "Content-Length: " OFF_T_FMT "\n", ftello (tempfp));
+ fprintf (msg->fp, "Content-Length: %zd\n", ftello (tempfp));
fprintf (msg->fp, "Lines: %d\n\n", lines);
/* copy the body and clean up */