projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No longer needed
[oweals/busybox.git]
/
networking
/
tftp.c
diff --git
a/networking/tftp.c
b/networking/tftp.c
index bd973d79ae4b4bf028a3754ba21864d07db5c00b..02ddb4ded0fa696ce7276221d6fa0c8643a84dd4 100644
(file)
--- a/
networking/tftp.c
+++ b/
networking/tftp.c
@@
-267,7
+267,7
@@
static inline int tftp(const int cmd, const struct hostent *host,
block_nr++;
if (cmd_put && (opcode == TFTP_DATA)) {
block_nr++;
if (cmd_put && (opcode == TFTP_DATA)) {
- len = read(localfd, cp, tftp_bufsize - 4);
+ len =
bb_full_
read(localfd, cp, tftp_bufsize - 4);
if (len < 0) {
bb_perror_msg("read");
if (len < 0) {
bb_perror_msg("read");
@@
-444,7
+444,7
@@
static inline int tftp(const int cmd, const struct hostent *host,
if (tmp == block_nr) {
if (tmp == block_nr) {
- len = write(localfd, &buf[4], len - 4);
+ len =
bb_full_
write(localfd, &buf[4], len - 4);
if (len < 0) {
bb_perror_msg("write");
if (len < 0) {
bb_perror_msg("write");
@@
-576,7
+576,7
@@
int tftp_main(int argc, char **argv)
result = tftp(cmd, host, remotefile, fd, port, blocksize);
#ifdef CONFIG_FEATURE_CLEAN_UP
result = tftp(cmd, host, remotefile, fd, port, blocksize);
#ifdef CONFIG_FEATURE_CLEAN_UP
- if (!(fd ==
fileno(stdout) || fd == fileno(stdin)
)) {
+ if (!(fd ==
STDOUT_FILENO || fd == STDIN_FILENO
)) {
close(fd);
}
#endif
close(fd);
}
#endif