small indenting fixes
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@532 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -37,36 +37,36 @@ int
|
|||||||
copy_encrypted (int fd1, int fd2, des_cblock *iv,
|
copy_encrypted (int fd1, int fd2, des_cblock *iv,
|
||||||
des_key_schedule schedule)
|
des_key_schedule schedule)
|
||||||
{
|
{
|
||||||
des_cblock iv1, iv2;
|
des_cblock iv1, iv2;
|
||||||
int num1 = 0, num2 = 0;
|
int num1 = 0, num2 = 0;
|
||||||
|
|
||||||
memcpy (&iv1, iv, sizeof(iv1));
|
memcpy (&iv1, iv, sizeof(iv1));
|
||||||
memcpy (&iv2, iv, sizeof(iv2));
|
memcpy (&iv2, iv, sizeof(iv2));
|
||||||
for (;;) {
|
for (;;) {
|
||||||
fd_set fdset;
|
fd_set fdset;
|
||||||
int ret;
|
int ret;
|
||||||
char buf[BUFSIZ];
|
char buf[BUFSIZ];
|
||||||
|
|
||||||
FD_ZERO(&fdset);
|
FD_ZERO(&fdset);
|
||||||
FD_SET(fd1, &fdset);
|
FD_SET(fd1, &fdset);
|
||||||
FD_SET(fd2, &fdset);
|
FD_SET(fd2, &fdset);
|
||||||
|
|
||||||
ret = select (max(fd1, fd2)+1, &fdset, NULL, NULL, NULL);
|
ret = select (max(fd1, fd2)+1, &fdset, NULL, NULL, NULL);
|
||||||
if (ret < 0 && errno != EINTR) {
|
if (ret < 0 && errno != EINTR) {
|
||||||
fprintf (stderr, "%s: select: %s\n", prog, strerror (errno));
|
fprintf (stderr, "%s: select: %s\n", prog, strerror (errno));
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (FD_ISSET(fd1, &fdset)) {
|
if (FD_ISSET(fd1, &fdset)) {
|
||||||
ret = do_enccopy (fd1, fd2, DES_ENCRYPT, &iv1, schedule, &num1);
|
ret = do_enccopy (fd1, fd2, DES_ENCRYPT, &iv1, schedule, &num1);
|
||||||
if (ret <= 0)
|
if (ret <= 0)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
if (FD_ISSET(fd2, &fdset)) {
|
if (FD_ISSET(fd2, &fdset)) {
|
||||||
ret = do_enccopy (fd2, fd1, DES_DECRYPT, &iv2, schedule, &num2);
|
ret = do_enccopy (fd2, fd1, DES_DECRYPT, &iv2, schedule, &num2);
|
||||||
if (ret <= 0)
|
if (ret <= 0)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -76,13 +76,13 @@ copy_encrypted (int fd1, int fd2, des_cblock *iv,
|
|||||||
RETSIGTYPE
|
RETSIGTYPE
|
||||||
childhandler (int sig)
|
childhandler (int sig)
|
||||||
{
|
{
|
||||||
pid_t pid;
|
pid_t pid;
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
pid = waitpid (-1, &status, WNOHANG|WUNTRACED);
|
pid = waitpid (-1, &status, WNOHANG|WUNTRACED);
|
||||||
} while(pid > 0);
|
} while(pid > 0);
|
||||||
signal (SIGCHLD, childhandler);
|
signal (SIGCHLD, childhandler);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Reference in New Issue
Block a user