/* -*-c-*-
*
- * $Id: sw_rsh.c,v 1.2 1999/06/02 17:03:29 mdw Exp $
+ * $Id$
*
* Run remote commands
*
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: sw_rsh.c,v $
- * 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.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include "config.h"
#define PKHEADSZ 3
-typedef struct pkhead {
- octet len[2];
- octet type;
-} pkhead;
-
/*----- Static variables --------------------------------------------------*/
static int handler = 0;
* Returns: Zero if it worked, nonzero otherwise.
*
* Use: Sends a data packet. If the type is `data', then `sz' may be
- * arbitrarily large and is divided into small eenough chunks.
+ * arbitrarily large and is divided into small enough chunks.
* Otherwise it's an error to send a packet that's too big.
*/
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 --------------------------------*/
void swvprintf(sw_remote *r, const char *format, va_list ap)
{
dstr d = DSTR_INIT;
- dstr_vputf(&d, format, ap);
+ dstr_vputf(&d, format, &ap);
pksend(r, PKTYPE_DATA, d.buf, d.len);
dstr_destroy(&d);
}
va_start(ap, format);
dstr_putf(&d, "%s [remote]: ", QUIS);
- dstr_vputf(&d, format, ap);
+ dstr_vputf(&d, format, &ap);
dstr_putc(&d, '\n');
dstr_putz(&d);
va_end(ap);
sym_table t;
sym_create(&t);
env_import(&t, env);
- if (env != environ) {
+ if (env[0] && env != environ) {
free(env);
env_import(&t, environ);
}
r.fdin = 0;
r.fdout = 1;
- /* --- Read packets from the remote host --- */
+ /* --- Object if stdin is a terminal --- */
+
+ if (isatty(STDIN_FILENO)) {
+ die(EXIT_FAILURE,
+ "don't use the `--remote' option unless "
+ "you know what you're doing.");
+ }
+
+ /* --- Read packets from the remote host --- */
for (;;) {
int t = pkrecv(&r);
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;
/* --- Child end of a local job --- */
+ signal(SIGINT, SIG_DFL);
+ signal(SIGQUIT, SIG_DFL);
+
if (!host) {
r->fdin = r->fdout = sk[1];
remote(r, cmd, argv, environ);