projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We don't need a function for mutt_make_version().
[apps/madmutt.git]
/
muttlib.c
diff --git
a/muttlib.c
b/muttlib.c
index
c595af6
..
1c23817
100644
(file)
--- a/
muttlib.c
+++ b/
muttlib.c
@@
-13,8
+13,7
@@
#include <grp.h>
#include <pwd.h>
#include <grp.h>
#include <pwd.h>
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
#include <lib-sys/unix.h>
#include <imap/imap.h>
#include <lib-sys/unix.h>
#include <imap/imap.h>
@@
-22,6
+21,8
@@
#include "mutt.h"
#include "attach.h"
#include "mutt.h"
#include "attach.h"
+const char *madmutt_version = "Madmutt/" MUTT_VERSION;
+
/* Modified by blong to accept a "suggestion" for file name. If
* that file exists, then construct one with unique name but
* keep any extension. This might fail, I guess.
/* Modified by blong to accept a "suggestion" for file name. If
* that file exists, then construct one with unique name but
* keep any extension. This might fail, I guess.
@@
-32,7
+33,7
@@
void mutt_adv_mktemp (const char* dir, char *s, ssize_t l)
{
int fd;
{
int fd;
- fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(
MC
ore.tmpdir) : dir, s);
+ fd = m_tempfd(s, l, m_strisempty(dir) ? NONULL(
mod_c
ore.tmpdir) : dir, s);
if (fd < 0) {
*s = '\0';
} else {
if (fd < 0) {
*s = '\0';
} else {
@@
-43,7
+44,7
@@
void mutt_adv_mktemp (const char* dir, char *s, ssize_t l)
void mutt_mktemp(char *s)
{
void mutt_mktemp(char *s)
{
- int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(
MC
ore.tmpdir), NULL);
+ int fd = m_tempfd(s, _POSIX_PATH_MAX, NONULL(
mod_c
ore.tmpdir), NULL);
if (fd < 0) {
*s = '\0';
} else {
if (fd < 0) {
*s = '\0';
} else {
@@
-62,7
+63,7
@@
ssize_t _mutt_expand_path(char *buf, ssize_t len, const char *s, int rx)
switch (*s) {
case '~':
if (s[1] == '/' || s[1] == '\0') {
switch (*s) {
case '~':
if (s[1] == '/' || s[1] == '\0') {
- m_strcpy(p, sizeof(p),
MC
ore.homedir);
+ m_strcpy(p, sizeof(p),
mod_c
ore.homedir);
tail = s + 1;
} else {
struct passwd *pw;
tail = s + 1;
} else {
struct passwd *pw;
@@
-199,7
+200,7
@@
void mutt_pretty_mailbox (char *s)
*s++ = '=';
memmove (s, s + len, m_strlen(s + len) + 1);
}
*s++ = '=';
memmove (s, s + len, m_strlen(s + len) + 1);
}
- else if (m_strncmp(s,
MCore.homedir, (len = m_strlen(MC
ore.homedir))) == 0
+ else if (m_strncmp(s,
mod_core.homedir, (len = m_strlen(mod_c
ore.homedir))) == 0
&& s[len] == '/') {
*s++ = '~';
memmove (s, s + len - 1, m_strlen(s + len - 1) + 1);
&& s[len] == '/') {
*s++ = '~';
memmove (s, s + len - 1, m_strlen(s + len - 1) + 1);
@@
-312,14
+313,6
@@
int mutt_save_confirm (const char *s, struct stat *st)
return 1;
}
return 1;
}
-#ifdef USE_NNTP
- if (magic == M_NNTP) {
- mutt_error _("Can't save message to newsserver.");
-
- return 0;
- }
-#endif
-
if (magic > 0 && !mx_access (s, W_OK)) {
if (option (OPTCONFIRMAPPEND) &&
(!TrashPath || (m_strcmp(s, TrashPath) != 0))) {
if (magic > 0 && !mx_access (s, W_OK)) {
if (option (OPTCONFIRMAPPEND) &&
(!TrashPath || (m_strcmp(s, TrashPath) != 0))) {
@@
-357,8
+350,6
@@
int mutt_save_confirm (const char *s, struct stat *st)
}
}
}
}
}
}
-
- CLEARLINE (LINES - 1);
return (ret);
}
return (ret);
}
@@
-367,13
+358,6
@@
void mutt_sleep (short s)
sleep(MAX(s, SleepTime));
}
sleep(MAX(s, SleepTime));
}
-const char *mutt_make_version(void)
-{
- static char vstring[STRING];
- snprintf(vstring, sizeof (vstring), "Madmutt/%s", MUTT_VERSION);
- return vstring;
-}
-
/* return 1 if address lists are strictly identical */
static int mutt_cmp_addr (const address_t * a, const address_t * b)
{
/* return 1 if address lists are strictly identical */
static int mutt_cmp_addr (const address_t * a, const address_t * b)
{