/* -*-c-*-
*
- * $Id: sw_rsh.c,v 1.1 1999/06/02 16:53:34 mdw Exp $
+ * $Id: sw_rsh.c,v 1.4 1999/06/24 15:51:17 mdw Exp $
*
* Run remote commands
*
/*----- Revision history --------------------------------------------------*
*
* $Log: sw_rsh.c,v $
- * Revision 1.1 1999/06/02 16:53:34 mdw
- * Initial revision
+ * Revision 1.4 1999/06/24 15:51:17 mdw
+ * Fix signal handlers so they don't corrupt `errno'.
+ *
+ * Revision 1.3 1999/06/18 18:58:54 mdw
+ * Signal handling fixes.
+ *
+ * Revision 1.2 1999/06/02 17:03:29 mdw
+ * Fix use of `octet' now that mLib includes `bits.h' (as of version 1.3.5
+ * release). Also use the mLib load and store macros rather than doing it
+ * by hand.
+ *
+ * Revision 1.1.1.1 1999/06/02 16:53:34 mdw
+ * Initial import.
*
*/
#endif
#include <mLib/alloc.h>
+#include <mLib/bits.h>
#include <mLib/dstr.h>
#include <mLib/exc.h>
#include <mLib/mdwopt.h>
/*----- Data structures ---------------------------------------------------*/
-typedef unsigned char octet;
-
#define PKHEADSZ 3
typedef struct pkhead {
/* --- Set up the packet header --- */
chunk = (sz > PKMAX ? PKMAX : sz);
- h.len[0] = chunk & 0xff;
- h.len[1] = (chunk >> 8) & 0xff;
+ STORE16(h.len, chunk);
/* --- Write the packet header --- */
/* --- Sort out what's going on --- */
- sz = h.len[0] | (h.len[1] << 8);
+ sz = LOAD16(h.len);
r->sz = sz;
if (!sz)
return (h.type);
static void sigchld(int sig)
{
+ int e = errno;
#ifdef DEBUG_SIGCHLD
int status;
while (waitpid(-1, &status, WNOHANG) > 0) {
while (waitpid(-1, 0, WNOHANG) > 0)
;
#endif
+ errno = e;
}
/* --- @swrsh@ --- *
if (!handler) {
struct sigaction sa;
sa.sa_handler = sigchld;
- sa.sa_flags = 0;
+ sa.sa_flags = SA_NOCLDSTOP;
+#ifdef SA_RESTART
+ sa.sa_flags |= SA_RESTART;
+#endif
sigemptyset(&sa.sa_mask);
sigaction(SIGCHLD, &sa, 0);
handler = 1;
if (!host) {
r->fdin = r->fdout = sk[1];
+ signal(SIGINT, SIG_DFL);
+ signal(SIGQUIT, SIG_DFL);
remote(r, cmd, argv, environ);
}