emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied patch from Vladimir Oleynik via Magnus Damm that removes newlines from

Browse Source 
error_msg() calls and uses 'return EXIT_SUCCESS' instead of return 0.
This commit is contained in:
Mark Whitley 2001-03-06 20:58:48 +00:00
parent 0f430e34af
commit 8bb7df49c2
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
networking/tftp.c
View File

@ -110,7 +110,7 @@ static inline int tftp(int cmd, struct hostent *host,
if ((socketfd = socket(PF_INET, SOCK_DGRAM, 0)) < 0) { if ((socketfd = socket(PF_INET, SOCK_DGRAM, 0)) < 0) {
perror_msg("socket"); perror_msg("socket");
return 1; return EXIT_FAILURE;
} }
len = sizeof(sa); len = sizeof(sa);
@ -157,7 +157,7 @@ static inline int tftp(int cmd, struct hostent *host,
} }
if ((*cp != '\0') || (&buf[BUFSIZE - 1] - cp) < 7) { if ((*cp != '\0') || (&buf[BUFSIZE - 1] - cp) < 7) {
error_msg("too long server-filename.\n"); error_msg("too long server-filename");
break; break;
} }
@ -212,7 +212,7 @@ static inline int tftp(int cmd, struct hostent *host,
if (sendto(socketfd, buf, len, 0, if (sendto(socketfd, buf, len, 0,
(struct sockaddr *) &sa, sizeof(sa)) < 0) { (struct sockaddr *) &sa, sizeof(sa)) < 0) {
perror_msg("send()"); perror_msg("send");
len = -1; len = -1;
break; break;
} }
@ -256,7 +256,7 @@ static inline int tftp(int cmd, struct hostent *host,
/* discard the packet - treat as timeout */ /* discard the packet - treat as timeout */
case 0: case 0:
error_msg("timeout.\n"); error_msg("timeout");
if (!timeout) { if (!timeout) {
timeout = BB_TFTP_NO_RETRIES; timeout = BB_TFTP_NO_RETRIES;
@ -266,7 +266,7 @@ static inline int tftp(int cmd, struct hostent *host,
if (!timeout) { if (!timeout) {
len = -1; len = -1;
error_msg("last timeout!\n"); error_msg("last timeout");
} }
break; break;
@ -333,7 +333,7 @@ static inline int tftp(int cmd, struct hostent *host,
} }
if (msg) { if (msg) {
error_msg("server says: %s.\n", msg); error_msg("server says: %s", msg);
} }
break; break;
@ -342,11 +342,7 @@ static inline int tftp(int cmd, struct hostent *host,
close(socketfd); close(socketfd);
if (finished) { return finished ? EXIT_SUCCESS : EXIT_FAILURE;
return 0;
}
return 1;
} }
int tftp_main(int argc, char **argv) int tftp_main(int argc, char **argv)
@ -402,7 +398,7 @@ int tftp_main(int argc, char **argv)
free(s); free(s);
} }
if (bad) { if (bad) {
perror_msg_and_die("bad \"server:file\" combination"); error_msg_and_die("bad \"server:file\" combination");
} }
if (BB_TFTP_DEBUG) { if (BB_TFTP_DEBUG) {

20
tftp.c
View File

@ -110,7 +110,7 @@ static inline int tftp(int cmd, struct hostent *host,
if ((socketfd = socket(PF_INET, SOCK_DGRAM, 0)) < 0) { if ((socketfd = socket(PF_INET, SOCK_DGRAM, 0)) < 0) {
perror_msg("socket"); perror_msg("socket");
return 1; return EXIT_FAILURE;
} }
len = sizeof(sa); len = sizeof(sa);
@ -157,7 +157,7 @@ static inline int tftp(int cmd, struct hostent *host,
} }
if ((*cp != '\0') || (&buf[BUFSIZE - 1] - cp) < 7) { if ((*cp != '\0') || (&buf[BUFSIZE - 1] - cp) < 7) {
error_msg("too long server-filename.\n"); error_msg("too long server-filename");
break; break;
} }
@ -212,7 +212,7 @@ static inline int tftp(int cmd, struct hostent *host,
if (sendto(socketfd, buf, len, 0, if (sendto(socketfd, buf, len, 0,
(struct sockaddr *) &sa, sizeof(sa)) < 0) { (struct sockaddr *) &sa, sizeof(sa)) < 0) {
perror_msg("send()"); perror_msg("send");
len = -1; len = -1;
break; break;
} }
@ -256,7 +256,7 @@ static inline int tftp(int cmd, struct hostent *host,
/* discard the packet - treat as timeout */ /* discard the packet - treat as timeout */
case 0: case 0:
error_msg("timeout.\n"); error_msg("timeout");
if (!timeout) { if (!timeout) {
timeout = BB_TFTP_NO_RETRIES; timeout = BB_TFTP_NO_RETRIES;
@ -266,7 +266,7 @@ static inline int tftp(int cmd, struct hostent *host,
if (!timeout) { if (!timeout) {
len = -1; len = -1;
error_msg("last timeout!\n"); error_msg("last timeout");
} }
break; break;
@ -333,7 +333,7 @@ static inline int tftp(int cmd, struct hostent *host,
} }
if (msg) { if (msg) {
error_msg("server says: %s.\n", msg); error_msg("server says: %s", msg);
} }
break; break;
@ -342,11 +342,7 @@ static inline int tftp(int cmd, struct hostent *host,
close(socketfd); close(socketfd);
if (finished) { return finished ? EXIT_SUCCESS : EXIT_FAILURE;
return 0;
}
return 1;
} }
int tftp_main(int argc, char **argv) int tftp_main(int argc, char **argv)
@ -402,7 +398,7 @@ int tftp_main(int argc, char **argv)
free(s); free(s);
} }
if (bad) { if (bad) {
perror_msg_and_die("bad \"server:file\" combination"); error_msg_and_die("bad \"server:file\" combination");
} }
if (BB_TFTP_DEBUG) { if (BB_TFTP_DEBUG) {