char abs_oldpath[_POSIX_PATH_MAX];
if ((getcwd (abs_oldpath, sizeof abs_oldpath) == NULL) ||
- (mutt_strlen (abs_oldpath) + 1 + mutt_strlen (oldpath) + 1 >
+ (str_len (abs_oldpath) + 1 + str_len (oldpath) + 1 >
sizeof abs_oldpath))
return -1;
char *ch;
if (!s) {
- s = safe_malloc (STRING);
+ s = mem_malloc (STRING);
*size = STRING;
}
FOREVER {
if (fgets (s + offset, *size - offset, fp) == NULL) {
- FREE (&s);
+ mem_free (&s);
return NULL;
}
if ((ch = strchr (s + offset, '\n')) != NULL) {
/* There wasn't room for the line -- increase ``s'' */
offset = *size - 1; /* overwrite the terminating 0 */
*size += STRING;
- safe_realloc (&s, *size);
+ mem_realloc (&s, *size);
}
}
}
{
const char *fmt = "%s/%s";
- if (!*fname || (*dir && dir[mutt_strlen (dir) - 1] == '/'))
+ if (!*fname || (*dir && dir[str_len (dir) - 1] == '/'))
fmt = "%s%s";
snprintf (d, l, fmt, dir, fname);