projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exit str_cmp enters m_strcmp
[apps/madmutt.git]
/
lib.c
diff --git
a/lib.c
b/lib.c
index
e683c6d
..
3212015
100644
(file)
--- a/
lib.c
+++ b/
lib.c
@@
-35,11
+35,10
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
#include "lib.h"
#include "lib.h"
-#include "lib/mem.h"
-#include "lib/str.h"
#include "lib/debug.h"
extern short Umask;
#include "lib/debug.h"
extern short Umask;
@@
-149,7
+148,7
@@
void mutt_unlink (const char *s)
if ((f = fdopen (fd, "r+"))) {
unlink (s);
if ((f = fdopen (fd, "r+"))) {
unlink (s);
-
memset (buf, 0, sizeof
(buf));
+
p_clear(buf, sizeof
(buf));
while (sb.st_size > 0) {
fwrite (buf, 1, MIN (sizeof (buf), sb.st_size), f);
sb.st_size -= MIN (sizeof (buf), sb.st_size);
while (sb.st_size > 0) {
fwrite (buf, 1, MIN (sizeof (buf), sb.st_size), f);
sb.st_size -= MIN (sizeof (buf), sb.st_size);
@@
-219,7
+218,7
@@
int safe_symlink (const char *oldpath, const char *newpath)
char abs_oldpath[_POSIX_PATH_MAX];
if ((getcwd (abs_oldpath, sizeof abs_oldpath) == NULL) ||
char abs_oldpath[_POSIX_PATH_MAX];
if ((getcwd (abs_oldpath, sizeof abs_oldpath) == NULL) ||
- (
str_len (abs_oldpath) + 1 + str_len
(oldpath) + 1 >
+ (
m_strlen(abs_oldpath) + 1 + m_strlen
(oldpath) + 1 >
sizeof abs_oldpath))
return -1;
sizeof abs_oldpath))
return -1;
@@
-435,7
+434,7
@@
char *mutt_read_line(char *s, size_t * size, FILE * fp, int *line)
/* There wasn't room for the line -- increase ``s'' */
offset = *size - 1; /* overwrite the terminating 0 */
*size += STRING;
/* There wasn't room for the line -- increase ``s'' */
offset = *size - 1; /* overwrite the terminating 0 */
*size += STRING;
-
mem_realloc
(&s, *size);
+
p_realloc
(&s, *size);
}
}
}
}
}
}
@@
-480,7
+479,7
@@
char *mutt_concat_path (char *d, const char *dir, const char *fname, size_t l)
{
const char *fmt = "%s/%s";
{
const char *fmt = "%s/%s";
- if (!*fname || (*dir && dir[
str_len
(dir) - 1] == '/'))
+ if (!*fname || (*dir && dir[
m_strlen
(dir) - 1] == '/'))
fmt = "%s%s";
snprintf (d, l, fmt, dir, fname);
fmt = "%s%s";
snprintf (d, l, fmt, dir, fname);