projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move signal.c into lib/sys
[apps/madmutt.git]
/
sendlib.c
diff --git
a/sendlib.c
b/sendlib.c
index
02d0ee0
..
e911fed
100644
(file)
--- a/
sendlib.c
+++ b/
sendlib.c
@@
-13,18
+13,34
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <fcntl.h>
+#include <sys/utsname.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/mem.h>
#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-lib/debug.h>
+
+#include <lib-sys/exit.h>
+#include <lib-sys/mutt_signal.h>
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "handler.h"
#include "recvattach.h"
#include "mutt.h"
#include "handler.h"
#include "recvattach.h"
-#include "mutt_curses.h"
#include "mx.h"
#include "copy.h"
#include "pager.h"
#include "mx.h"
#include "copy.h"
#include "pager.h"
@@
-32,19
+48,6
@@
#include <lib-crypt/crypt.h>
#include "mutt_idna.h"
#include <lib-crypt/crypt.h>
#include "mutt_idna.h"
-#include "lib/debug.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <sys/utsname.h>
-
#ifdef USE_LIBESMTP
# include "mutt_libesmtp.h"
#endif /* USE_LIBESMTP */
#ifdef USE_LIBESMTP
# include "mutt_libesmtp.h"
#endif /* USE_LIBESMTP */
@@
-887,7
+890,7
@@
int mutt_lookup_mime_type (BODY * att, const char *path)
snprintf (buf, sizeof (buf), "%s/.mime.types", NONULL (Homedir));
break;
case 1:
snprintf (buf, sizeof (buf), "%s/.mime.types", NONULL (Homedir));
break;
case 1:
- m_strcpy(buf, sizeof(buf), SYSCONFDIR "/m
uttng
-mime.types");
+ m_strcpy(buf, sizeof(buf), SYSCONFDIR "/m
admutt
-mime.types");
break;
case 2:
m_strcpy(buf, sizeof(buf), PKGDATADIR "/mime.types");
break;
case 2:
m_strcpy(buf, sizeof(buf), PKGDATADIR "/mime.types");
@@
-2024,11
+2027,8
@@
static int mutt_invoke_sendmail (address_t * from, /* the sender */
if ((i = send_msg (path, args, msg, &childout)) != (EX_OK & 0xff)) {
if (i != S_BKG) {
if ((i = send_msg (path, args, msg, &childout)) != (EX_OK & 0xff)) {
if (i != S_BKG) {
- const char *e = mutt_strsysexit (i);
-
- e = mutt_strsysexit (i);
mutt_error (_("Error sending message, child exited %d (%s)."), i,
mutt_error (_("Error sending message, child exited %d (%s)."), i,
-
NONULL (e
));
+
m_strsysexit(i
));
if (childout) {
struct stat st;
if (childout) {
struct stat st;