~mdw
/
sw-tools
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in comment.
[sw-tools]
/
src
/
sw_rsh.c
diff --git
a/src/sw_rsh.c
b/src/sw_rsh.c
index
91aa82b
..
8720551
100644
(file)
--- a/
src/sw_rsh.c
+++ b/
src/sw_rsh.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: sw_rsh.c,v 1.
5 1999/06/24 16:02
:22 mdw Exp $
+ * $Id: sw_rsh.c,v 1.
7 1999/09/24 13:16
:22 mdw Exp $
*
* Run remote commands
*
*
* Run remote commands
*
@@
-29,6
+29,13
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: sw_rsh.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: sw_rsh.c,v $
+ * Revision 1.7 1999/09/24 13:16:22 mdw
+ * Fix typo in comment.
+ *
+ * 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.5 1999/06/24 16:02:22 mdw
* Fix signal handling some more.
*
@@
-91,11
+98,6
@@
#define PKHEADSZ 3
#define PKHEADSZ 3
-typedef struct pkhead {
- octet len[2];
- octet type;
-} pkhead;
-
/*----- Static variables --------------------------------------------------*/
static int handler = 0;
/*----- Static variables --------------------------------------------------*/
static int handler = 0;
@@
-113,13
+115,13
@@
static rcmd *rcmds = RCMD_LINK;
* Returns: Zero if it worked, nonzero otherwise.
*
* Use: Sends a data packet. If the type is `data', then `sz' may be
* 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 e
e
nough 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)
{
* 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;
const char *q = p;
size_t chunk;
@@
-132,13
+134,13
@@
int pksend(sw_remote *r, int type, const void *p, size_t sz)
/* --- Main output loop --- */
/* --- Main output loop --- */
- h
.type
= type;
+ h
[2]
= type;
do {
/* --- Set up the packet header --- */
chunk = (sz > PKMAX ? PKMAX : sz);
do {
/* --- Set up the packet header --- */
chunk = (sz > PKMAX ? PKMAX : sz);
- STORE16(h
.len
, chunk);
+ STORE16(h, chunk);
/* --- Write the packet header --- */
/* --- Write the packet header --- */
@@
-184,7
+186,7
@@
int pksend(sw_remote *r, int type, const void *p, size_t sz)
int pkrecv(sw_remote *r)
{
int pkrecv(sw_remote *r)
{
-
pkhead h
;
+
octet h[PKHEADSZ]
;
size_t sz;
char *p;
ssize_t n;
size_t sz;
char *p;
ssize_t n;
@@
-222,7
+224,7
@@
int pkrecv(sw_remote *r)
* characters.
*/
* 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)
memcpy(r->buf, &h, PKHEADSZ);
n = read(r->fdin, r->buf + PKHEADSZ, sizeof(r->buf) - PKHEADSZ);
if (n < 0)
@@
-233,10
+235,10
@@
int pkrecv(sw_remote *r)
/* --- Sort out what's going on --- */
/* --- Sort out what's going on --- */
- sz = LOAD16(h
.len
);
+ sz = LOAD16(h);
r->sz = sz;
if (!sz)
r->sz = sz;
if (!sz)
- return (h
.type
);
+ return (h
[2]
);
if (sz > PKMAX) {
errno = E2BIG;
return (-1);
if (sz > PKMAX) {
errno = E2BIG;
return (-1);
@@
-257,7
+259,7
@@
int pkrecv(sw_remote *r)
}
}
}
}
- return (h
.type
);
+ return (h
[2]
);
}
/*----- Error reporting and exit statuses --------------------------------*/
}
/*----- Error reporting and exit statuses --------------------------------*/