projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore editor backup files
[mmh]
/
uip
/
sendsbr.c
diff --git
a/uip/sendsbr.c
b/uip/sendsbr.c
index
f8384f7
..
fd21acd
100644
(file)
--- a/
uip/sendsbr.c
+++ b/
uip/sendsbr.c
@@
-41,7
+41,6
@@
char *altmsg = NULL; /* .. */
char *annotext = NULL;
char *distfile = NULL;
char *annotext = NULL;
char *distfile = NULL;
-static int armed = 0;
static jmp_buf env;
static char body_file_name[MAXPATHLEN + 1]; /* name of temporary file for body content */
static jmp_buf env;
static char body_file_name[MAXPATHLEN + 1]; /* name of temporary file for body content */
@@
-56,12
+55,12
@@
static FILE *composition_file; /* composition file pointer */
* external prototypes
*/
int sendsbr (char **, int, char *, struct stat *, int, char *, int);
* external prototypes
*/
int sendsbr (char **, int, char *, struct stat *, int, char *, int);
-int done (int);
char *getusername (void);
/*
* static prototypes
*/
char *getusername (void);
/*
* static prototypes
*/
+static void armed_done (int) NORETURN;
static void alert (char *, int);
static int tmp_fd (void);
static void anno (int, struct stat *);
static void alert (char *, int);
static int tmp_fd (void);
static void anno (int, struct stat *);
@@
-118,7
+117,7
@@
sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
}
}
}
}
- armed++;
+ done=armed_done;
switch (setjmp (env)) {
case OK:
/*
switch (setjmp (env)) {
case OK:
/*
@@
-154,7
+153,7
@@
sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
break;
}
break;
}
- armed = 0;
+ done=exit;
if (distfile)
unlink (distfile);
if (distfile)
unlink (distfile);
@@
-498,8
+497,9
@@
make_mime_composition_file_entry(char *file_name, int attachformat)
} else {
/* Suppress Content-Id, insert simple Content-Disposition. */
(void) fprintf (composition_file,
} else {
/* Suppress Content-Id, insert simple Content-Disposition. */
(void) fprintf (composition_file,
- "#%s <>{attachment}",
- content_type);
+ "#%s; name=\"%s\" <>{attachment}",
+ content_type,
+ ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1);
}
break;
}
break;
@@
-514,8
+514,9
@@
make_mime_composition_file_entry(char *file_name, int attachformat)
/* Suppress Content-Id, insert Content-Disposition with
modification date. */
(void) fprintf (composition_file,
/* Suppress Content-Id, insert Content-Disposition with
modification date. */
(void) fprintf (composition_file,
- "#%s <>{attachment; modification-date=\"%s\"}",
+ "#%s; name=\"%s\" <>{attachment; modification-date=\"%s\"}",
content_type,
content_type,
+ ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1,
dtime (&st.st_mtime, 0));
}
dtime (&st.st_mtime, 0));
}
@@
-1008,7
+1009,7
@@
annoaux (int fd)
}
if (!(mp = folder_read (folder))) {
if (debugsw)
}
if (!(mp = folder_read (folder))) {
if (debugsw)
- admonish (NULL, "unable to read folder %s");
+ admonish (NULL, "unable to read folder %s", folder);
return;
}
return;
}
@@
-1073,12
+1074,10
@@
oops:
}
}
-int
-done (int status)
+static void
+armed_done (int status)
{
{
- if (armed)
- longjmp (env, status ? status : NOTOK);
+ longjmp (env, status ? status : NOTOK);
exit (status);
exit (status);
- return 1; /* dead code to satisfy the compiler */
}
}