projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't test with sendmail because it would really send the mail. If
[mmh]
/
uip
/
sendsbr.c
diff --git
a/uip/sendsbr.c
b/uip/sendsbr.c
index
f0c84f5
..
3eff75d
100644
(file)
--- a/
uip/sendsbr.c
+++ b/
uip/sendsbr.c
@@
-16,16
+16,10
@@
#include <h/tws.h>
#include <h/utils.h>
#include <h/tws.h>
#include <h/utils.h>
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
#endif
#endif
+#include <time.h>
int debugsw = 0; /* global */
int forwsw = 1;
int debugsw = 0; /* global */
int forwsw = 1;
@@
-198,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.
@@
-307,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 != '-') {
@@
-502,10
+502,12
@@
make_mime_composition_file_entry(char *file_name, int attachformat)
} else {
/* Suppress Content-Id, insert simple Content-Disposition
and Content-Description with filename. */
} else {
/* Suppress Content-Id, insert simple Content-Disposition
and Content-Description with filename. */
+ p = strrchr(file_name, '/');
(void) fprintf (composition_file,
(void) fprintf (composition_file,
- "#%1$s; name=\"%2$s\" <> [%2$s]{attachment}",
+ "#%s; name=\"%s\" <> [%s]{attachment}",
content_type,
content_type,
- ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1);
+ (p == (char *)0) ? file_name : p + 1,
+ (p == (char *)0) ? file_name : p + 1);
}
break;
}
break;
@@
-519,10
+521,12
@@
make_mime_composition_file_entry(char *file_name, int attachformat)
} else {
/* Suppress Content-Id, insert Content-Disposition with
modification date and Content-Description wtih filename. */
} else {
/* Suppress Content-Id, insert Content-Disposition with
modification date and Content-Description wtih filename. */
+ p = strrchr(file_name, '/');
(void) fprintf (composition_file,
(void) fprintf (composition_file,
- "#%1$s; name=\"%2$s\" <>[%2$s]{attachment; modification-date=\"%3$s\"}",
+ "#%s; name=\"%s\" <>[%s]{attachment; modification-date=\"%s\"}",
content_type,
content_type,
- ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1,
+ (p == (char *)0) ? file_name : p + 1,
+ (p == (char *)0) ? file_name : p + 1,
dtime (&st.st_mtime, 0));
}
dtime (&st.st_mtime, 0));
}
@@
-675,7
+679,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++) {