/* -*-c-*-
*
- * $Id: sw_rsh.c,v 1.3 1999/06/18 18:58:54 mdw Exp $
+ * $Id: sw_rsh.c,v 1.6 1999/09/24 13:15:57 mdw Exp $
*
* Run remote commands
*
/*----- Revision history --------------------------------------------------*
*
* $Log: sw_rsh.c,v $
+ * Revision 1.6 1999/09/24 13:15:57 mdw
+ * Remove unnecessary assumptions about structure layouts. (The `pkhead'
+ * structure is no more.)
+ *
+ * Revision 1.5 1999/06/24 16:02:22 mdw
+ * Fix signal handling some more.
+ *
+ * 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.
*
#define PKHEADSZ 3
-typedef struct pkhead {
- octet len[2];
- octet type;
-} pkhead;
-
/*----- Static variables --------------------------------------------------*/
static int handler = 0;
int pksend(sw_remote *r, int type, const void *p, size_t sz)
{
- pkhead h;
+ octet h[PKHEADSZ];
const char *q = p;
size_t chunk;
/* --- Main output loop --- */
- h.type = type;
+ h[2] = type;
do {
/* --- Set up the packet header --- */
chunk = (sz > PKMAX ? PKMAX : sz);
- STORE16(h.len, chunk);
+ STORE16(h, chunk);
/* --- Write the packet header --- */
int pkrecv(sw_remote *r)
{
- pkhead h;
+ octet h[PKHEADSZ];
size_t sz;
char *p;
ssize_t n;
* characters.
*/
- if (h.type >= PKTYPE_BOGUS) {
+ if (h[2] >= PKTYPE_BOGUS) {
memcpy(r->buf, &h, PKHEADSZ);
n = read(r->fdin, r->buf + PKHEADSZ, sizeof(r->buf) - PKHEADSZ);
if (n < 0)
/* --- Sort out what's going on --- */
- sz = LOAD16(h.len);
+ sz = LOAD16(h);
r->sz = sz;
if (!sz)
- return (h.type);
+ return (h[2]);
if (sz > PKMAX) {
errno = E2BIG;
return (-1);
}
}
- return (h.type);
+ return (h[2]);
}
/*----- Error reporting and exit statuses --------------------------------*/
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@ --- *
/* --- Child end of a local job --- */
+ signal(SIGINT, SIG_DFL);
+ signal(SIGQUIT, SIG_DFL);
+
if (!host) {
r->fdin = r->fdout = sk[1];
- signal(SIGINT, SIG_DFL);
- signal(SIGQUIT, SIG_DFL);
remote(r, cmd, argv, environ);
}