Index: dorandom.c
===================================================================
--- dorandom.c	(revision 2116)
+++ dorandom.c	(revision 2117)
@@ -58,7 +58,7 @@
 
 char *urand_get(int numbytes) {
   char *retval;
-  int result;
+  int n, result;
 
   retval=(char *)malloc(numbytes);
   if (!retval) {
@@ -66,11 +66,13 @@
     exit(1); /* sorry :-(. */
   }
   
-  
   result=read(infile,retval,numbytes);
-  if (result < numbytes) {
-    free(retval);
-    return NULL; /* couldn't do it :-( */
+  for (n = result = 0; result < numbytes; result += n) {
+    n = read(infile, retval + result, numbytes - result);
+    if (n <= 0) {
+      free(retval);
+      return NULL;
+    }
   }
 
   return retval;
Index: aescmdline.c
===================================================================
--- aescmdline.c	(revision 2116)
+++ aescmdline.c	(revision 2117)
@@ -33,13 +33,15 @@
 /* write data, aborting if we have a write error. */
 
 void ewrite(int outfile,void *buf, size_t count) {
-  int result;
+  int n, result;
 
-  result=write(outfile,buf,count);
-  if (result!=(int) count) {
-    fprintf(stderr,"%s:error:could not write data.\n",progname);
-    perror(progname);
-    usage();
+  for (n = result = 0; result < count; result += n) {
+    n = write(outfile, buf + result, count - result);
+    if (n <= 0) {
+      fprintf(stderr,"%s:error:could not write data.\n",progname);
+      perror(progname);
+      usage();
+    }
   }
 }
 
@@ -80,13 +82,19 @@
  */
 void read_key_from_stdin(int infile, int keysize) {
   unsigned char keybuf[65];
-  int result, hexkeysize;
+  int n, result, hexkeysize;
 
   hexkeysize = keysize / 4;
-  result=read(infile,keybuf, hexkeysize+1);
-  if (result<hexkeysize+1) {
-    fprintf(stderr,"%s: Error: Key not found on stdin.\n",progname);
-    usage();
+  for (n = result = 0; result < hexkeysize + 1; result += n) {
+    n = read(infile, keybuf + result, hexkeysize + 1 - result);
+    if (n < 0) {
+      fprintf(stderr,"%s: Error: Could not read key from stdin.\n",progname);
+      perror(progname);
+      usage();
+    } else if (n == 0) {
+      fprintf(stderr,"%s: Error: Key not found on stdin.\n",progname);
+      usage();
+    }
   }
 
   keybuf[hexkeysize]=0; /* make sure it is null terminated */
Index: aesget.c
===================================================================
--- aesget.c	(revision 2116)
+++ aesget.c	(revision 2117)
@@ -47,7 +47,7 @@
 
 
 static void decryptfile(int infile,int outfile) {
-  int result;
+  int n, result;
 
 #define CRYPTBUF_SIZE 262144
   char buf[CRYPTBUF_SIZE];
@@ -55,11 +55,14 @@
   int bufsize;  /* how many chars are currently in that buffer. */
 
 
-  result=read(infile,cfb_blk,16);  /* set feedback buffer to salt. */
-  if (result<16) {
-    fprintf(stderr,"%s:error:could not get salt from input\n",progname);
-    perror(progname);
-    usage();
+  /* set feedback buffer to salt. */
+  for (n = result = 0; result < 16; result += n) {
+    n = read(infile, cfb_blk + result, 16 - result);
+    if (n <= 0) {
+      fprintf(stderr,"%s:error:could not get salt from input\n",progname);
+      perror(progname);
+      usage();
+    }
   }
 
   /* Now initialize the cipher: */
Index: tobin.c
===================================================================
--- tobin.c	(revision 2116)
+++ tobin.c	(revision 2117)
@@ -9,7 +9,7 @@
 int main(int argc, char* argv[])
 {
   char* rtnbuf;
-  int binlen;
+  int binlen, n, result;
 
   if (argc != 2)
     {
@@ -18,6 +18,12 @@
     }
   binlen = strlen(argv[1])/2;
   rtnbuf = unhexify_block(argv[1], binlen);
-  write(fileno(stdout), rtnbuf, binlen);
+  for (n = result = 0; result < binlen; result += n) {
+    n = write(fileno(stdout), rtnbuf + result, binlen - result);
+    if (n <= 0) {
+      perror("tobin");
+      return(1);
+    }
+  }
   return(0);
 }