projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed sortm(1) verbose message and man page to reflect that with
[mmh]
/
uip
/
mhshowsbr.c
diff --git
a/uip/mhshowsbr.c
b/uip/mhshowsbr.c
index
c60acb9
..
99db9f8
100644
(file)
--- a/
uip/mhshowsbr.c
+++ b/
uip/mhshowsbr.c
@@
-12,7
+12,7
@@
#include <h/signals.h>
#include <h/md5.h>
#include <errno.h>
#include <h/signals.h>
#include <h/md5.h>
#include <errno.h>
-#include <h/m_setjmp.h>
+#include <setjmp.h>
#include <signal.h>
#include <h/mts.h>
#include <h/tws.h>
#include <signal.h>
#include <h/mts.h>
#include <h/tws.h>
@@
-38,12
+38,6
@@
pid_t xpid = 0;
static sigjmp_buf intrenv;
static sigjmp_buf intrenv;
-/* termsbr.c */
-int SOprintf (char *, ...);
-
-/* mhparse.c */
-int pidcheck (int);
-
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
@@
-533,15
+527,15
@@
show_content_aux2 (CT ct, int serial, int alternate, char *cracked, char *buffer
else
list_switch (ct, -1, 1, 0, 0);
else
list_switch (ct, -1, 1, 0, 0);
- if (xpause && SOprintf ("Press <return> to show content..."))
- printf ("Press <return> to show content...");
-
- if (xpause) {
+ if (xpause && isatty (fileno (stdout))) {
int intr;
SIGNAL_HANDLER istat;
int intr;
SIGNAL_HANDLER istat;
+ if (SOprintf ("Press <return> to show content..."))
+ printf ("Press <return> to show content...");
+
istat = SIGNAL (SIGINT, intrser);
istat = SIGNAL (SIGINT, intrser);
- if ((intr = m_sigsetjmp (intrenv, 1)) == OK) {
+ if ((intr = sigsetjmp (intrenv, 1)) == OK) {
fflush (stdout);
prompt[0] = 0;
read (fileno (stdout), prompt, sizeof(prompt));
fflush (stdout);
prompt[0] = 0;
read (fileno (stdout), prompt, sizeof(prompt));