projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networking/interface.c: reduce bss usage
[oweals/busybox.git]
/
networking
/
nc.c
diff --git
a/networking/nc.c
b/networking/nc.c
index bc7c701fe39defb2ddf695820bb9a45f3104dc86..e7bd519e06106d0b08d82668972da820b0a6444b 100644
(file)
--- a/
networking/nc.c
+++ b/
networking/nc.c
@@
-7,7
+7,11
@@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include "busybox.h"
+#include "libbb.h"
+
+#if ENABLE_DESKTOP
+#include "nc_bloaty.c"
+#else
/* Lots of small differences in features
* when compared to "standard" nc
/* Lots of small differences in features
* when compared to "standard" nc
@@
-170,11
+174,10
@@
int nc_main(int argc, char **argv)
if (select(FD_SETSIZE, &testfds, NULL, NULL, NULL) < 0)
bb_perror_msg_and_die("select");
if (select(FD_SETSIZE, &testfds, NULL, NULL, NULL) < 0)
bb_perror_msg_and_die("select");
+#define iobuf bb_common_bufsiz1
for (fd = 0; fd < FD_SETSIZE; fd++) {
if (FD_ISSET(fd, &testfds)) {
for (fd = 0; fd < FD_SETSIZE; fd++) {
if (FD_ISSET(fd, &testfds)) {
- nread = safe_read(fd, bb_common_bufsiz1,
- sizeof(bb_common_bufsiz1));
-
+ nread = safe_read(fd, iobuf, sizeof(iobuf));
if (fd == cfd) {
if (nread < 1)
exit(0);
if (fd == cfd) {
if (nread < 1)
exit(0);
@@
-188,10
+191,10
@@
int nc_main(int argc, char **argv)
}
ofd = cfd;
}
}
ofd = cfd;
}
-
- xwrite(ofd, bb_common_bufsiz1, nread);
+ xwrite(ofd, iobuf, nread);
if (delay > 0) sleep(delay);
}
}
}
}
if (delay > 0) sleep(delay);
}
}
}
}
+#endif