aboutsummaryrefslogtreecommitdiff
path: root/networking/tftp.c
diff options
context:
space:
mode:
Diffstat (limited to 'networking/tftp.c')
-rw-r--r--networking/tftp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/networking/tftp.c b/networking/tftp.c
index d551c861f..04bfe844f 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -453,7 +453,7 @@ static int tftp_protocol(
453 /* fill in packet if the filename fits into xbuf */ 453 /* fill in packet if the filename fits into xbuf */
454 len = strlen(remote_file) + 1; 454 len = strlen(remote_file) + 1;
455 if (2 + len + sizeof("octet") >= io_bufsize) { 455 if (2 + len + sizeof("octet") >= io_bufsize) {
456 bb_error_msg("remote filename is too long"); 456 bb_simple_error_msg("remote filename is too long");
457 goto ret; 457 goto ret;
458 } 458 }
459 strcpy(cp, remote_file); 459 strcpy(cp, remote_file);
@@ -468,7 +468,7 @@ static int tftp_protocol(
468 468
469 /* Need to add option to pkt */ 469 /* Need to add option to pkt */
470 if ((&xbuf[io_bufsize - 1] - cp) < sizeof("blksize NNNNN tsize ") + sizeof(off_t)*3) { 470 if ((&xbuf[io_bufsize - 1] - cp) < sizeof("blksize NNNNN tsize ") + sizeof(off_t)*3) {
471 bb_error_msg("remote filename is too long"); 471 bb_simple_error_msg("remote filename is too long");
472 goto ret; 472 goto ret;
473 } 473 }
474 expect_OACK = 1; 474 expect_OACK = 1;
@@ -569,7 +569,7 @@ static int tftp_protocol(
569 retries--; 569 retries--;
570 if (retries == 0) { 570 if (retries == 0) {
571 tftp_progress_done(); 571 tftp_progress_done();
572 bb_error_msg("timeout"); 572 bb_simple_error_msg("timeout");
573 goto ret; /* no err packet sent */ 573 goto ret; /* no err packet sent */
574 } 574 }
575 575
@@ -674,7 +674,7 @@ static int tftp_protocol(
674 * must be ignored by the client and server 674 * must be ignored by the client and server
675 * as if it were never requested." */ 675 * as if it were never requested." */
676 if (blksize != TFTP_BLKSIZE_DEFAULT) 676 if (blksize != TFTP_BLKSIZE_DEFAULT)
677 bb_error_msg("falling back to blocksize "TFTP_BLKSIZE_DEFAULT_STR); 677 bb_simple_error_msg("falling back to blocksize "TFTP_BLKSIZE_DEFAULT_STR);
678 blksize = TFTP_BLKSIZE_DEFAULT; 678 blksize = TFTP_BLKSIZE_DEFAULT;
679 io_bufsize = TFTP_BLKSIZE_DEFAULT + 4; 679 io_bufsize = TFTP_BLKSIZE_DEFAULT + 4;
680 } 680 }
@@ -739,7 +739,7 @@ static int tftp_protocol(
739 strcpy(G_error_pkt_str, bb_msg_read_error); 739 strcpy(G_error_pkt_str, bb_msg_read_error);
740 send_err_pkt: 740 send_err_pkt:
741 if (G_error_pkt_str[0]) 741 if (G_error_pkt_str[0])
742 bb_error_msg("%s", G_error_pkt_str); 742 bb_simple_error_msg(G_error_pkt_str);
743 G.error_pkt[1] = TFTP_ERROR; 743 G.error_pkt[1] = TFTP_ERROR;
744 xsendto(socket_fd, G.error_pkt, 4 + 1 + strlen(G_error_pkt_str), 744 xsendto(socket_fd, G.error_pkt, 4 + 1 + strlen(G_error_pkt_str),
745 &peer_lsa->u.sa, peer_lsa->len); 745 &peer_lsa->u.sa, peer_lsa->len);