projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed mhlist -verbose to work with all content types [Bug #35219].
[mmh]
/
uip
/
mhshowsbr.c
diff --git
a/uip/mhshowsbr.c
b/uip/mhshowsbr.c
index
38167c8
..
d3ddb94
100644
(file)
--- a/
uip/mhshowsbr.c
+++ b/
uip/mhshowsbr.c
@@
-19,16
+19,6
@@
#include <h/utils.h>
#include <sys/wait.h>
#include <h/utils.h>
#include <sys/wait.h>
-/*
-** Just use sigjmp/longjmp on older machines that
-** don't have sigsetjmp/siglongjmp.
-*/
-#ifndef HAVE_SIGSETJMP
-# define sigjmp_buf jmp_buf
-# define sigsetjmp(env,mask) setjmp(env)
-# define siglongjmp(env,val) longjmp(env,val)
-#endif
-
extern int debugsw;
int serialsw = 0;
extern int debugsw;
int serialsw = 0;
@@
-146,7
+136,7
@@
show_single_message(CT ct, char *form)
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);
while (wait(&status) != NOTOK) {
pidcheck(status);
while (wait(&status) != NOTOK) {
pidcheck(status);
@@
-154,7
+144,7
@@
show_single_message(CT ct, char *form)
}
/* reset the signal mask */
}
/* reset the signal mask */
- SIGPROCMASK(SIG_SETMASK, &oset, &set);
+ sigprocmask(SIG_SETMASK, &oset, &set);
xpid = 0;
flush_errors();
xpid = 0;
flush_errors();
@@
-459,7
+449,8
@@
raw:
}
}
}
}
- if (buflen <= 0 || (ct->c_termproc && buflen <= strlen(ct->c_termproc))) {
+ if (buflen <= 0 || (ct->c_termproc &&
+ (size_t)buflen <= strlen(ct->c_termproc))) {
/*
** content_error would provide a more useful error message
** here, except that if we got overrun, it probably would
/*
** content_error would provide a more useful error message
** here, except that if we got overrun, it probably would
@@
-675,7
+666,7
@@
show_multi_internal(CT ct, int serial, int alternate)
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);
}
/*
}
/*
@@
-761,7
+752,7
@@
show_multi_internal(CT ct, int serial, int alternate)
out:
if (!nowserial) {
/* reset the signal mask */
out:
if (!nowserial) {
/* reset the signal mask */
- SIGPROCMASK(SIG_SETMASK, &oset, &set);
+ sigprocmask(SIG_SETMASK, &oset, &set);
}
return result;
}
return result;
@@
-958,8
+949,8
@@
raw:
}
}
}
}
- if (buflen <= 0 ||
- (ct->c_termproc && buflen <= strlen(ct->c_termproc))) {
+ if (buflen <= 0 || (ct->c_termproc &&
+ (size_t)buflen <= strlen(ct->c_termproc))) {
/*
** content_error would provide a more useful error message
** here, except that if we got overrun, it probably would
/*
** content_error would provide a more useful error message
** here, except that if we got overrun, it probably would