projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't list _sysconfdir/ directory in RPM spec. We don't list any other directories...
[mmh]
/
uip
/
sendsbr.c
diff --git
a/uip/sendsbr.c
b/uip/sendsbr.c
index
57ef007
..
04d6ea9
100644
(file)
--- a/
uip/sendsbr.c
+++ b/
uip/sendsbr.c
@@
-9,23
+9,17
@@
#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 <h/tws.h>
#include <h/utils.h>
#include <signal.h>
#include <fcntl.h>
#include <h/mime.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;
@@
-116,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
@@
-500,9
+494,10
@@
make_mime_composition_file_entry(char *file_name, int attachformat)
least. */
(void) fprintf (composition_file, "#%s <>", content_type);
} else {
least. */
(void) fprintf (composition_file, "#%s <>", content_type);
} else {
- /* Suppress Content-Id, insert simple Content-Disposition. */
+ /* Suppress Content-Id, insert simple Content-Disposition
+ and Content-Description with filename. */
(void) fprintf (composition_file,
(void) fprintf (composition_file,
- "#%s; name=\"%s\" <>{attachment}",
+ "#%1$s; name=\"%2$s\" <> [%2$s]{attachment}",
content_type,
((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1);
}
content_type,
((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1);
}
@@
-517,9
+512,9
@@
make_mime_composition_file_entry(char *file_name, int attachformat)
(void) fprintf (composition_file, "#%s <>", content_type);
} else {
/* Suppress Content-Id, insert Content-Disposition with
(void) fprintf (composition_file, "#%s <>", content_type);
} else {
/* Suppress Content-Id, insert Content-Disposition with
- modification date. */
+ modification date and Content-Description wtih filename. */
(void) fprintf (composition_file,
(void) fprintf (composition_file,
- "#%s; name=\"%s\" <>{attachment; modification-date=\"%s\"}",
+ "#%1$s; name=\"%2$s\" <>[%2$s]{attachment; modification-date=\"%3$s\"}",
content_type,
((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1,
dtime (&st.st_mtime, 0));
content_type,
((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1,
dtime (&st.st_mtime, 0));
@@
-674,7
+669,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++) {
@@
-976,14
+971,14
@@
anno (int fd, struct stat *st)
sigaddset (&set, SIGINT);
sigaddset (&set, SIGQUIT);
sigaddset (&set, SIGTERM);
sigaddset (&set, SIGINT);
sigaddset (&set, SIGQUIT);
sigaddset (&set, SIGTERM);
- SIGPROCMASK (SIG_BLOCK, &set, &oset);
+ sigprocmask (SIG_BLOCK, &set, &oset);
annoaux (fd);
if (child_id == OK)
_exit (0);
/* reset the signal mask */
annoaux (fd);
if (child_id == OK)
_exit (0);
/* reset the signal mask */
- SIGPROCMASK (SIG_SETMASK, &oset, &set);
+ sigprocmask (SIG_SETMASK, &oset, &set);
chdir (cwd);
break;
chdir (cwd);
break;