projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove longjmp in signalhandler of prompter
[mmh]
/
uip
/
mhparse.c
diff --git
a/uip/mhparse.c
b/uip/mhparse.c
index
dc8e380
..
f4c26cc
100644
(file)
--- a/
uip/mhparse.c
+++ b/
uip/mhparse.c
@@
-10,7
+10,6
@@
#include <fcntl.h>
#include <h/signals.h>
#include <errno.h>
#include <fcntl.h>
#include <h/signals.h>
#include <errno.h>
-#include <setjmp.h>
#include <signal.h>
#include <h/tws.h>
#include <h/mime.h>
#include <signal.h>
#include <h/tws.h>
#include <h/mime.h>
@@
-137,7
+136,7
@@
pidcheck(int status)
fflush(stdout);
fflush(stderr);
fflush(stdout);
fflush(stderr);
- done(1);
+ exit(1);
return 1;
}
return 1;
}
@@
-1536,7
+1535,7
@@
openBase64(CT ct, char **file)
cp = context_find(buffer);
if (cp == NULL || *cp == '\0') {
snprintf(buffer, sizeof(buffer), "%s-suffix-%s", invo_name,
cp = context_find(buffer);
if (cp == NULL || *cp == '\0') {
snprintf(buffer, sizeof(buffer), "%s-suffix-%s", invo_name,
- ci->ci_type);
+ ci->ci_type);
cp = context_find(buffer);
}
if (cp != NULL && *cp != '\0') {
cp = context_find(buffer);
}
if (cp != NULL && *cp != '\0') {
@@
-1752,8
+1751,10
@@
openQuoted(CT ct, char **file)
}
if (cp != NULL && *cp != '\0') {
if (ce->ce_unlink) {
}
if (cp != NULL && *cp != '\0') {
if (ce->ce_unlink) {
- // Temporary file already exists, so we rename to
- // version with extension.
+ /*
+ ** Temporary file already exists, so we rename to
+ ** version with extension.
+ */
char *file_org = strdup(ce->ce_file);
ce->ce_file = add(cp, ce->ce_file);
if (rename(file_org, ce->ce_file)) {
char *file_org = strdup(ce->ce_file);
ce->ce_file = add(cp, ce->ce_file);
if (rename(file_org, ce->ce_file)) {
@@
-1962,7
+1963,7
@@
open7Bit(CT ct, char **file)
cp = context_find(buffer);
if (cp == NULL || *cp == '\0') {
snprintf(buffer, sizeof(buffer), "%s-suffix-%s", invo_name,
cp = context_find(buffer);
if (cp == NULL || *cp == '\0') {
snprintf(buffer, sizeof(buffer), "%s-suffix-%s", invo_name,
- ci->ci_type);
+ ci->ci_type);
cp = context_find(buffer);
}
if (cp != NULL && *cp != '\0') {
cp = context_find(buffer);
}
if (cp != NULL && *cp != '\0') {