projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
muttlib.c
diff --git
a/muttlib.c
b/muttlib.c
index
723043a
..
c0df6d1
100644
(file)
--- a/
muttlib.c
+++ b/
muttlib.c
@@
-13,6
+13,9
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "ascii.h"
+#include "buffer.h"
+#include "enter.h"
#include "mutt_curses.h"
#include "mime.h"
#include "mx.h"
#include "mutt_curses.h"
#include "mime.h"
#include "mx.h"
@@
-20,6
+23,7
@@
#include "attach.h"
#include "reldate.h"
#include "attach.h"
#include "reldate.h"
+#include "svnrev.h"
#ifdef USE_IMAP
#include "imap.h"
#ifdef USE_IMAP
#include "imap.h"
@@
-61,7
+65,7
@@
BODY *mutt_new_body (void)
* Renamed to mutt_adv_mktemp so I only have to change where it's
* called, and not all possible cases.
*/
* Renamed to mutt_adv_mktemp so I only have to change where it's
* called, and not all possible cases.
*/
-void mutt_adv_mktemp (char *s, size_t l)
+void mutt_adv_mktemp (c
onst char* dir, c
har *s, size_t l)
{
char buf[_POSIX_PATH_MAX];
char tmp[_POSIX_PATH_MAX];
{
char buf[_POSIX_PATH_MAX];
char tmp[_POSIX_PATH_MAX];
@@
-69,7
+73,7
@@
void mutt_adv_mktemp (char *s, size_t l)
size_t sl;
struct stat sb;
size_t sl;
struct stat sb;
- strfcpy (buf, NONULL (Tempdir), sizeof (buf));
+ strfcpy (buf,
dir && *dir ? dir :
NONULL (Tempdir), sizeof (buf));
mutt_expand_path (buf, sizeof (buf));
if (s[0] == '\0') {
snprintf (s, l, "%s/muttXXXXXX", buf);
mutt_expand_path (buf, sizeof (buf));
if (s[0] == '\0') {
snprintf (s, l, "%s/muttXXXXXX", buf);
@@
-113,7
+117,7
@@
int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src)
tmp[0] = '\0';
}
tmp[0] = '\0';
}
- mutt_adv_mktemp (tmp, sizeof (tmp));
+ mutt_adv_mktemp (
NULL,
tmp, sizeof (tmp));
if (mutt_save_attachment (fp, src, tmp, 0, NULL) == -1)
return -1;
if (mutt_save_attachment (fp, src, tmp, 0, NULL) == -1)
return -1;
@@
-1285,8
+1289,8
@@
const char *mutt_make_version (void)
{
static char vstring[STRING];
{
static char vstring[STRING];
- snprintf (vstring, sizeof (vstring), "Mutt-ng %s
(%s) based on Mutt 1.5.9
",
- MUTT_VERSION, ReleaseDate);
+ snprintf (vstring, sizeof (vstring), "Mutt-ng %s
-%s (based on Mutt 1.5.10/%s)
",
+ MUTT_VERSION,
MUTTNG_SVNREV,
ReleaseDate);
return vstring;
}
return vstring;
}