diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /libbb/full_write.c | |
parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'libbb/full_write.c')
-rw-r--r-- | libbb/full_write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/full_write.c b/libbb/full_write.c index a2abaee25..777fbd910 100644 --- a/libbb/full_write.c +++ b/libbb/full_write.c | |||
@@ -30,7 +30,7 @@ ssize_t FAST_FUNC full_write(int fd, const void *buf, size_t len) | |||
30 | /* user can do another write to know the error code */ | 30 | /* user can do another write to know the error code */ |
31 | return total; | 31 | return total; |
32 | } | 32 | } |
33 | return cc; /* write() returns -1 on failure. */ | 33 | return cc; /* write() returns -1 on failure. */ |
34 | } | 34 | } |
35 | 35 | ||
36 | total += cc; | 36 | total += cc; |