projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
license statements.
[apps/madmutt.git]
/
lib.c
diff --git
a/lib.c
b/lib.c
index
096f57f
..
7c704b9
100644
(file)
--- a/
lib.c
+++ b/
lib.c
@@
-34,10
+34,11
@@
#define EX_OK 0
#endif
#define EX_OK 0
#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;
@@
-217,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) ||
- (m
utt_strlen (abs_oldpath) + 1 + mutt_strlen
(oldpath) + 1 >
+ (m
_strlen(abs_oldpath) + 1 + m_strlen
(oldpath) + 1 >
sizeof abs_oldpath))
return -1;
sizeof abs_oldpath))
return -1;
@@
-391,19
+392,19
@@
int mutt_rx_sanitize_string (char *dest, size_t destlen, const char *src)
* If a line ends with "\", this char and the linefeed is removed,
* and the next line is read too.
*/
* If a line ends with "\", this char and the linefeed is removed,
* and the next line is read too.
*/
-char *mutt_read_line
(char *s, size_t * size, FILE * fp, int *line)
+char *mutt_read_line(char *s, size_t * size, FILE * fp, int *line)
{
size_t offset = 0;
char *ch;
if (!s) {
{
size_t offset = 0;
char *ch;
if (!s) {
- s =
safe_malloc (
STRING);
+ s =
p_new(char,
STRING);
*size = STRING;
}
FOREVER {
if (fgets (s + offset, *size - offset, fp) == NULL) {
*size = STRING;
}
FOREVER {
if (fgets (s + offset, *size - offset, fp) == NULL) {
-
FREE
(&s);
+
p_delete
(&s);
return NULL;
}
if ((ch = strchr (s + offset, '\n')) != NULL) {
return NULL;
}
if ((ch = strchr (s + offset, '\n')) != NULL) {
@@
-433,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;
-
safe_realloc
(&s, *size);
+
p_realloc
(&s, *size);
}
}
}
}
}
}
@@
-478,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[m
utt_strlen
(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);