posixify source

[moira.git] / update / get_file.c

diff --git a/update/get_file.c b/update/get_file.c
index 627e4f9b8c4935262923569897c8235f15a65240..17a2f97b60bbd4325d6cbf9b6d67696c3961b4ad 100644 (file)
--- a/update/get_file.c
+++ b/update/get_file.c
@@ -14,6 +14,7 @@ static char *rcsid_get_file_c = "$Header$";
 #include <stdio.h>
 #include <gdb.h>
 #include <ctype.h>
+#include <string.h>
 #include <sys/param.h>
 #include <sys/file.h>
 #include <fcntl.h>
@@ -87,7 +88,11 @@ get_file(pathname, file_size, checksum, mode, encrypt)
     }
     if (done)                  /* re-initialize data */
        initialize();
+#ifdef POSIX
+    if (setuid(uid) < 0) {
+#else
     if (setreuid(0, uid) < 0) {
+#endif
        com_err(whoami, errno, "Unable to setuid to %d\n", uid);
        exit(1);
     }
@@ -141,7 +146,7 @@ get_file(pathname, file_size, checksum, mode, encrypt)
                session[4], session[5], session[6], session[7]);
 #endif /* DEBUG */
        des_key_sched(session, sched);
-       bcopy(session, ivec, sizeof(ivec));
+       memcpy(ivec, session, sizeof(ivec));
     }
     n_written = 0;
     while (n_written < file_size && code == 0) {
@@ -219,7 +224,7 @@ get_block(fd, max_size, encrypt)
        des_pcbc_encrypt(src, dst, n, sched, ivec, 1);
        for (i = 0; i < 8; i++)
          ivec[i] = src[n - 8 + i] ^ dst[n - 8 + i];
-       bcopy(dst, STRING_DATA(data), n);
+       memcpy(STRING_DATA(data), dst, n);
     }
 
     n_read = MIN(MAX_STRING_SIZE(data), max_size);