projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added list of hand picked types initially genereted by...
[mmh]
/
uip
/
sendsbr.c
diff --git
a/uip/sendsbr.c
b/uip/sendsbr.c
index
6215219
..
91eaddf
100644
(file)
--- a/
uip/sendsbr.c
+++ b/
uip/sendsbr.c
@@
-9,7
+9,7
@@
#include <h/mh.h>
#include <h/signals.h>
#include <h/mh.h>
#include <h/signals.h>
-#include <setjmp.h>
+#include <h/m_setjmp.h>
#include <signal.h>
#include <fcntl.h>
#include <h/mime.h>
#include <signal.h>
#include <fcntl.h>
#include <h/mime.h>
@@
-110,7
+110,7
@@
sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
}
done=armed_done;
}
done=armed_done;
- switch (setjmp (env)) {
+ switch (m_setjmp (env)) {
case OK:
/*
* If given -push and -unique (which is undocumented), then
case OK:
/*
* If given -push and -unique (which is undocumented), then
@@
-192,6
+192,7
@@
attach(char *attachment_header_field_name, char *draft_file_name,
int has_body; /* draft has a message body */
int length; /* length of attachment header field name */
char *p; /* miscellaneous string pointer */
int has_body; /* draft has a message body */
int length; /* length of attachment header field name */
char *p; /* miscellaneous string pointer */
+ FILE *fp; /* pointer for mhn.defaults */
/*
* Open up the draft file.
/*
* Open up the draft file.
@@
-301,6
+302,11
@@
attach(char *attachment_header_field_name, char *draft_file_name,
* that specify attachments. Add a mhbuild MIME composition file for each.
*/
* that specify attachments. Add a mhbuild MIME composition file for each.
*/
+ if ((fp = fopen (p = etcpath ("mhn.defaults"), "r"))) {
+ readconfig ((struct node **) NULL, fp, p, 0);
+ fclose(fp);
+ }
+
rewind(draft_file);
while (get_line() != EOF && *field != '\0' && *field != '-') {
rewind(draft_file);
while (get_line() != EOF && *field != '\0' && *field != '-') {
@@
-669,7
+675,7
@@
splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
time (&clock);
snprintf (msgid, sizeof(msgid), "<%d.%ld@%s>",
time (&clock);
snprintf (msgid, sizeof(msgid), "<%d.%ld@%s>",
- (int) getpid(), (long) clock, LocalName());
+ (int) getpid(), (long) clock, LocalName(1));
fseek (in, start, SEEK_SET);
for (partno = 1; partno <= nparts; partno++) {
fseek (in, start, SEEK_SET);
for (partno = 1; partno <= nparts; partno++) {