We did not have a safe_write, which is the analog to safe_read. Convert
full_write to use safe_write internally, which is needed to guarantee proper behavior, i.e. when writing to a pipe.
This commit is contained in:
parent
638da75f4b
commit
dae099b2f9
@ -109,6 +109,7 @@ extern int is_directory(const char *name, int followLinks, struct stat *statBuf)
|
|||||||
extern int remove_file(const char *path, int flags);
|
extern int remove_file(const char *path, int flags);
|
||||||
extern int copy_file(const char *source, const char *dest, int flags);
|
extern int copy_file(const char *source, const char *dest, int flags);
|
||||||
extern ssize_t safe_read(int fd, void *buf, size_t count);
|
extern ssize_t safe_read(int fd, void *buf, size_t count);
|
||||||
|
extern ssize_t safe_write(int fd, void *buf, size_t count);
|
||||||
extern ssize_t bb_full_write(int fd, const void *buf, size_t len);
|
extern ssize_t bb_full_write(int fd, const void *buf, size_t len);
|
||||||
extern ssize_t bb_full_read(int fd, void *buf, size_t len);
|
extern ssize_t bb_full_read(int fd, void *buf, size_t len);
|
||||||
extern int recursive_action(const char *fileName, int recurse,
|
extern int recursive_action(const char *fileName, int recurse,
|
||||||
|
@ -36,7 +36,7 @@ ssize_t bb_full_write(int fd, const void *buf, size_t len)
|
|||||||
total = 0;
|
total = 0;
|
||||||
|
|
||||||
while (len > 0) {
|
while (len > 0) {
|
||||||
cc = write(fd, buf, len);
|
cc = safe_write(fd, buf, len);
|
||||||
|
|
||||||
if (cc < 0)
|
if (cc < 0)
|
||||||
return cc; /* write() returns -1 on failure. */
|
return cc; /* write() returns -1 on failure. */
|
||||||
|
48
libbb/safe_write.c
Normal file
48
libbb/safe_write.c
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
/* vi: set sw=4 ts=4: */
|
||||||
|
/*
|
||||||
|
* Utility routines.
|
||||||
|
*
|
||||||
|
* Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include "libbb.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
ssize_t safe_write(int fd, void *buf, size_t count)
|
||||||
|
{
|
||||||
|
ssize_t n;
|
||||||
|
|
||||||
|
do {
|
||||||
|
n = write(fd, buf, count);
|
||||||
|
} while (n < 0 && errno == EINTR);
|
||||||
|
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* END CODE */
|
||||||
|
/*
|
||||||
|
Local Variables:
|
||||||
|
c-file-style: "linux"
|
||||||
|
c-basic-offset: 4
|
||||||
|
tab-width: 4
|
||||||
|
End:
|
||||||
|
*/
|
Loading…
Reference in New Issue
Block a user