projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some comments to the format compiler and engine.
[mmh]
/
uip
/
sendsbr.c
diff --git
a/uip/sendsbr.c
b/uip/sendsbr.c
index
65b5ba1
..
6215219
100644
(file)
--- a/
uip/sendsbr.c
+++ b/
uip/sendsbr.c
@@
-2,8
+2,6
@@
/*
* sendsbr.c -- routines to help WhatNow/Send along
*
/*
* sendsbr.c -- routines to help WhatNow/Send along
*
- * $Id$
- *
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
* complete copyright information.
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
* complete copyright information.
@@
-18,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;
@@
-502,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);
}
@@
-519,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));
@@
-978,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;