# include "config.h"
#endif
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include <unistd.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-lib/debug.h>
#include "mutt.h"
#include "rfc1524.h"
#include "attach.h"
-#include "lib/debug.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <unistd.h>
-
/* The command semantics include the following:
* %s is the filename that contains the mail body data
* %t is the content type, like text/plain
char buf[LONG_STRING];
char type[LONG_STRING];
- strfcpy (type, _type, sizeof (type));
+ m_strcpy(type, sizeof(type), _type);
if (option (OPTMAILCAPSANITIZE))
mutt_sanitize_filename (type, 0);
param[z] = '\0';
_pvalue = mutt_get_parameter (param, a->parameter);
- strfcpy (pvalue, NONULL (_pvalue), sizeof (pvalue));
+ m_strcpy(pvalue, sizeof(pvalue), NONULL(_pvalue));
if (option (OPTMAILCAPSANITIZE))
mutt_sanitize_filename (pvalue, 0);
buf[y++] = command[x++];
}
buf[y] = '\0';
- strfcpy (command, buf, clen);
+ m_strcpy(command, clen, buf);
return needspipe;
}
s++;
}
else {
- *ch++ = 0;
- SKIPWS (ch);
+ *ch++ = '\0';
+ ch = vskipspaces(ch);
break;
}
}
- str_skip_trailws (s);
+ m_strrtrim(s);
return ch;
}
static int get_field_text (char *field, char **entry,
char *type, char *filename, int line)
{
- field = str_skip_initws (field);
+ field = vskipspaces(field);
if (*field == '=') {
if (entry) {
- field++;
- field = str_skip_initws (field);
- str_replace (entry, field);
+ field = vskipspaces(field + 1);
+ m_strreplace(entry, field);
}
return 1;
}
{
if (len > siz)
len = siz - 1;
- strfcpy (d, s, len);
+ m_strcpy(d, len, s);
}
int rfc1524_expand_filename (char *nametemplate,
if (!nametemplate) {
if (oldfile)
- strfcpy (newfile, oldfile, nflen);
+ m_strcpy(newfile, nflen, oldfile);
}
else if (!oldfile) {
mutt_expand_fmt (newfile, nflen, nametemplate, "mutt");
if (rmatch)
*right = 0;
else
- strfcpy (right, nametemplate + i + 2, sizeof (right));
+ m_strcpy(right, sizeof(right), nametemplate + i + 2);
snprintf (newfile, nflen, "%s%s%s", left, oldfile, right);
}
else {
/* no "%s" in the name template. */
- strfcpy (newfile, nametemplate, nflen);
+ m_strcpy(newfile, nflen, nametemplate);
}
}