oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(do_write, do_read): always return -1 for failure

Browse Source 
(net_write, net_read): remove.  they already exist in libroken


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6194 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-05-10 03:50:07 +00:00
parent f546bbcf16
commit 98760591be
1 changed files with 3 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
appl/rsh/common.c
View File

@@ -59,14 +59,14 @@ do_read (int fd,
ret = krb5_net_read (context, &fd, &len, 4); ret = krb5_net_read (context, &fd, &len, 4);
if (ret != 4) if (ret != 4)
return ret; return -1;
len = ntohl(len); len = ntohl(len);
outer_len = krb5_get_wrapped_length (context, crypto, len); outer_len = krb5_get_wrapped_length (context, crypto, len);
if (outer_len > sz) if (outer_len > sz)
abort (); abort ();
ret = krb5_net_read (context, &fd, buf, outer_len); ret = krb5_net_read (context, &fd, buf, outer_len);
if (ret != outer_len) if (ret != outer_len)
return ret; return -1;
status = krb5_decrypt(context, crypto, KRB5_KU_OTHER_ENCRYPTED, status = krb5_decrypt(context, crypto, KRB5_KU_OTHER_ENCRYPTED,
buf, outer_len, &data); buf, outer_len, &data);
@@ -74,7 +74,7 @@ do_read (int fd,
if (status) if (status)
errx (1, "%s", krb5_get_err_text (context, status)); errx (1, "%s", krb5_get_err_text (context, status));
memcpy (buf, data.data, len); memcpy (buf, data.data, len);
free (data.data); krb5_data_free (&data);
return len; return len;
} else { } else {
abort (); abort ();
@@ -122,41 +122,3 @@ do_write (int fd, void *buf, size_t sz)
} else } else
return write (fd, buf, sz); return write (fd, buf, sz);
} }
ssize_t
net_write (int fd,
const void *buf,
size_t len)
{
char *cbuf = (char *)buf;
ssize_t count;
size_t rem = len;
while (rem > 0) {
count = write (fd, cbuf, rem);
if (count < 0)
return count;
cbuf += count;
rem -= count;
}
return len;
}
ssize_t
net_read (int fd,
void *buf,
size_t len)
{
char *cbuf = (char *)buf;
ssize_t count;
size_t rem = len;
while (rem > 0) {
count = read (fd, cbuf, rem);
if (count <= 0)
return count;
cbuf += count;
rem -= count;
}
return len;
}