mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-28 04:52:07 +00:00
b253cc4213
[atomicio.c atomicio.h authfd.c monitor_wrap.c msg.c scp.c sftp-client.c]
[ssh-keyscan.c sshconnect.c]
Switch atomicio to use a simpler interface; it now returns a size_t
(containing number of bytes read/written), and indicates error by
returning 0. EOF is signalled by errno==EPIPE.
Typical use now becomes:
if (atomicio(read, ..., len) != len)
err(1,"read");
ok deraadt@, cloder@, djm@
66 lines
2.0 KiB
C
66 lines
2.0 KiB
C
/*
|
|
* Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
|
|
* Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
RCSID("$OpenBSD: atomicio.c,v 1.13 2005/05/24 17:32:43 avsm Exp $");
|
|
|
|
#include "atomicio.h"
|
|
|
|
/*
|
|
* ensure all of data on socket comes through. f==read || f==vwrite
|
|
*/
|
|
size_t
|
|
atomicio(f, fd, _s, n)
|
|
ssize_t (*f) (int, void *, size_t);
|
|
int fd;
|
|
void *_s;
|
|
size_t n;
|
|
{
|
|
char *s = _s;
|
|
size_t pos = 0;
|
|
ssize_t res;
|
|
|
|
while (n > pos) {
|
|
res = (f) (fd, s + pos, n - pos);
|
|
switch (res) {
|
|
case -1:
|
|
#ifdef EWOULDBLOCK
|
|
if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
|
|
#else
|
|
if (errno == EINTR || errno == EAGAIN)
|
|
#endif
|
|
continue;
|
|
return 0;
|
|
case 0:
|
|
errno = EPIPE;
|
|
return pos;
|
|
default:
|
|
pos += (u_int)res;
|
|
}
|
|
}
|
|
return (pos);
|
|
}
|