]> andersk Git - moira.git/blobdiff - update/send_file.c
Code style cleanup. (No functional changes)
[moira.git] / update / send_file.c
index 5577391354dc38127053472e51a5a8d61ac27a4d..b5ff17fcf0f10dca2e9fdfa3411903c34ff356fa 100644 (file)
@@ -20,9 +20,7 @@ static char *rcsid_send_file_c = "$Header$";
 #include <des.h>
 #include <krb.h>
 #include <update.h>
-#ifdef POSIX
 #include <fcntl.h>
-#endif
 
 extern CONNECTION conn;
 extern int errno;
@@ -47,148 +45,144 @@ extern char *whoami;
  *  1 on error (file not found, etc)
  */
 
-int
-send_file(pathname, target_path, encrypt)
-char *pathname;
-char *target_path;
-int  encrypt;
+int send_file(char *pathname, char *target_path, int encrypt)
 {
-    int n, fd, code, n_to_send, i;
-    STRING data;
-    unsigned char dst[UPDATE_BUFSIZ + 8], *src;
-    struct stat statb;
-    des_key_schedule sched;
-    des_cblock ivec;
+  int n, fd, code, n_to_send, i;
+  STRING data;
+  unsigned char dst[UPDATE_BUFSIZ + 8], *src;
+  struct stat statb;
+  des_key_schedule sched;
+  des_cblock ivec;
 
-    /* send file over */
-    fd = open(pathname, O_RDONLY, 0);
-    if (fd < 0) {
-       com_err(whoami, errno, "unable to open %s for read", pathname);
-       return(MR_OCONFIG);
+  /* send file over */
+  fd = open(pathname, O_RDONLY, 0);
+  if (fd < 0)
+    {
+      com_err(whoami, errno, "unable to open %s for read", pathname);
+      return MR_OCONFIG;
     }
-    if (fstat(fd, &statb)) {
-       com_err(whoami, errno, "unable to stat %s", pathname);
-       close(fd);
-       return(MR_OCONFIG);
+  if (fstat(fd, &statb))
+    {
+      com_err(whoami, errno, "unable to stat %s", pathname);
+      close(fd);
+      return MR_OCONFIG;
     }
-    n_to_send = statb.st_size;
-    
-    string_alloc(&data, UPDATE_BUFSIZ);
-    sprintf(STRING_DATA(data), "XFER_00%c %d %d %s",
-           (encrypt ? '3' : '2'), n_to_send,
-           checksum_file(pathname), target_path);
-    code = send_object(conn, (char *)&data, STRING_T);
-    if (code) {
-       com_err(whoami, connection_errno(conn), " sending XFER request");
-       close(fd);
-       return(connection_errno(conn));
+  n_to_send = statb.st_size;
+
+  string_alloc(&data, UPDATE_BUFSIZ);
+  sprintf(STRING_DATA(data), "XFER_00%c %d %d %s",
+         (encrypt ? '3' : '2'), n_to_send,
+         checksum_file(pathname), target_path);
+  code = send_object(conn, (char *)&data, STRING_T);
+  if (code)
+    {
+      com_err(whoami, connection_errno(conn), " sending XFER request");
+      close(fd);
+      return connection_errno(conn);
     }
-    code = receive_object(conn, (char *)&n, INTEGER_T);
-    if (code) {
-       com_err(whoami, connection_errno(conn),
-               " getting reply from XFER request");
-       close(fd);
-       return(connection_errno(conn));
+  code = receive_object(conn, (char *)&n, INTEGER_T);
+  if (code)
+    {
+      com_err(whoami, connection_errno(conn),
+             " getting reply from XFER request");
+      close(fd);
+      return connection_errno(conn);
     }
-    if (n) {
-       com_err(whoami, n, " transfer request (XFER) rejected");
-       close(fd);
-       return(n);
+  if (n)
+    {
+      com_err(whoami, n, " transfer request (XFER) rejected");
+      close(fd);
+      return n;
     }
-    
-    code = receive_object(conn, (char *)&n, INTEGER_T);
-    if (code) {
-       com_err(whoami, connection_errno(conn), ": lost connection");
-       close(fd);
-       return(connection_errno(conn));
+
+  code = receive_object(conn, (char *)&n, INTEGER_T);
+  if (code)
+    {
+      com_err(whoami, connection_errno(conn), ": lost connection");
+      close(fd);
+      return connection_errno(conn);
     }
-    if (n) {
-       com_err(whoami, n, " from remote server: can't update %s",
-               pathname);
-       close(fd);
-       return(n);
+  if (n)
+    {
+      com_err(whoami, n, " from remote server: can't update %s", pathname);
+      close(fd);
+      return n;
     }
 
-    if (encrypt) {
-#ifdef DEBUG
-       printf("Session key %02x %02x %02x %02x  %02x %02x %02x %02x\n",
-              session[0], session[1], session[2], session[3], 
-              session[4], session[5], session[6], session[7]);
-#endif /* DEBUG */
-       des_key_sched(session, sched);
-#ifdef POSIX
-       memmove(ivec, session, sizeof(ivec));
-#else
-       bcopy(session, ivec, sizeof(ivec));
-#endif
+  if (encrypt)
+    {
+      des_key_sched(session, sched);
+      memmove(ivec, session, sizeof(ivec));
     }
 
-    while (n_to_send > 0) {
-#ifdef DEBUG
-       printf("n_to_send = %d\n", n_to_send);
-#endif /* DEBUG */
-       n = read(fd, STRING_DATA(data), UPDATE_BUFSIZ);
-       if (n < 0) {
-           com_err(whoami, errno, " reading %s for transmission", pathname);
-           close(fd);
-           return(MR_ABORTED);
+  while (n_to_send > 0)
+    {
+      n = read(fd, STRING_DATA(data), UPDATE_BUFSIZ);
+      if (n < 0)
+       {
+         com_err(whoami, errno, " reading %s for transmission", pathname);
+         close(fd);
+         return MR_ABORTED;
        }
-       MAX_STRING_SIZE(data) = n;
-       if (encrypt) {
-           src = (unsigned char *)STRING_DATA(data);
-#ifdef POSIX
-           memmove(dst, src, n);
-#else
-           bcopy(src, dst, n);
-#endif
-           memset(dst + n, 0, 7);
-           /* encrypt! */
-           des_pcbc_encrypt(dst, src, n, sched, ivec, 0);
-           /* save vector to continue chaining */
-           for (i = 0; i < 8; i++)
-             ivec[i] = dst[n - 8 + i] ^ src[n - 8 + i];
-           /* round up to multiple of 8 */
-           data.length = (data.length + 7) & 0xfffffff8;
+      MAX_STRING_SIZE(data) = n;
+      if (encrypt)
+       {
+         src = (unsigned char *)STRING_DATA(data);
+         memmove(dst, src, n);
+         memset(dst + n, 0, 7);
+         /* encrypt! */
+         des_pcbc_encrypt(dst, src, n, sched, ivec, 0);
+         /* save vector to continue chaining */
+         for (i = 0; i < 8; i++)
+           ivec[i] = dst[n - 8 + i] ^ src[n - 8 + i];
+         /* round up to multiple of 8 */
+         data.length = (data.length + 7) & 0xfffffff8;
        }
-       code = send_object(conn, (char *)&data, STRING_T);
-       if (code) {
-           com_err(whoami, connection_errno(conn), " transmitting file %s",
-                   pathname);
-           close(fd);
-           return(connection_errno(conn));
+      code = send_object(conn, (char *)&data, STRING_T);
+      if (code)
+       {
+         com_err(whoami, connection_errno(conn), " transmitting file %s",
+                 pathname);
+         close(fd);
+         return connection_errno(conn);
        }
-       n_to_send -= n;
-       code = receive_object(conn, (char *)&n, INTEGER_T);
-       if (code) {
-           com_err(whoami, connection_errno(conn),
-                   " awaiting ACK remote server during transmission of %s",
-                   pathname);
-           close(fd);
-           return(connection_errno(conn));
+      n_to_send -= n;
+      code = receive_object(conn, (char *)&n, INTEGER_T);
+      if (code)
+       {
+         com_err(whoami, connection_errno(conn),
+                 " awaiting ACK remote server during transmission of %s",
+                 pathname);
+         close(fd);
+         return connection_errno(conn);
        }
-       if (n) {
-           com_err(whoami, n, " from remote server during transmission of %s",
-                   pathname);
-           close(fd);
-           return(n);
+      if (n)
+       {
+         com_err(whoami, n, " from remote server during transmission of %s",
+                 pathname);
+         close(fd);
+         return n;
        }
     }
-    if (statb.st_size == 0) {
-       code = receive_object(conn, (char *)&n, INTEGER_T);
-       if (code) {
-           com_err(whoami, connection_errno(conn),
-                   " awaiting ACK remote server after transmission of %s",
-                   pathname);
-           close(fd);
-           return(connection_errno(conn));
+  if (statb.st_size == 0)
+    {
+      code = receive_object(conn, (char *)&n, INTEGER_T);
+      if (code)
+       {
+         com_err(whoami, connection_errno(conn),
+                 " awaiting ACK remote server after transmission of %s",
+                 pathname);
+         close(fd);
+         return connection_errno(conn);
        }
-       if (n) {
-           com_err(whoami, n, " from remote server after transmission of %s",
-                   pathname);
-           close(fd);
-           return(n);
+      if (n)
+       {
+         com_err(whoami, n, " from remote server after transmission of %s",
+                 pathname);
+         close(fd);
+         return n;
        }
     }
-    close(fd);
-    return(MR_SUCCESS);
+  close(fd);
+  return MR_SUCCESS;
 }
This page took 0.041347 seconds and 4 git commands to generate.