aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* yes: add explicit error check for WIN32Ron Yorston2016-10-241-0/+4
| | | | | | | The test script for md5sum uses 'yes $text | head'. This fails because of Microsoft Windows' dodgy handling of pipes. yes checks the return value of putchar for an error, but on WIN32 none comes when a pipe fails. ferror, OTOH, does report an error.
* diff: use TMPDIR rather than TMP/TEMPRon Yorston2016-10-241-1/+1
| | | | | The getenv function in win32/env.c already handles replacing TMPDIR with TMP/TEMP on Microsoft Windows.
* diff: change handling of temporary files for WIN32Ron Yorston2016-10-201-0/+21
| | | | | | | | If it isn't possible to seek in an input file diff creates a temporary file to store the text. On Windows we can't assume that /tmp exists and we need to unlink the temporary files at the end of processing, not the start.
* Post-merge fixesRon Yorston2016-10-203-33/+35
| | | | | Update default configurations; rename ststrdup -> sstrdup; fix status returns in evalcommand.
* Merge branch 'busybox' into mergeRon Yorston2016-10-198-164/+564
|\
| * examples: update var_service/README againDenys Vlasenko2016-10-141-0/+54
| | | | | | | | | | | | Added "ps -AH e" example Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * typo fixes in docDenys Vlasenko2016-10-141-2/+2
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * examples: update var_service/README againDenys Vlasenko2016-10-141-5/+13
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * examples: update var_service/READMEDenys Vlasenko2016-10-141-24/+130
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * telnetd: ifdef out a buggy error handling code pathDenys Vlasenko2016-10-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Here, not handling the error is would just eat one input 0xff char. Correct handling would need even more corner case handling, as-is buggy handling corrupts the buffer. Since we just been told by kernel that pty is ready, EAGAIN should not be happening here anyway. function old new delta telnetd_main 1798 1785 -13 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * cpio: fix restoration of file ownership, closes 9306Denys Vlasenko2016-10-121-0/+4
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * telnet: code shrinkDenys Vlasenko2016-10-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | put_iac2(w,c) is mostly used with constants, fold them into one arg function old new delta put_iac2_merged - 46 +46 telnet_main 1603 1583 -20 con_escape 285 257 -28 put_iac2 50 - -50 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 0/2 up/down: 46/-98) Total: -52 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * telnetd: add another handshake example in comments, no code changesDenys Vlasenko2016-10-121-0/+5
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * telnetd: treat all 2-byte IACs in 240..249 range as NOPs.Denys Vlasenko2016-10-121-18/+24
| | | | | | | | | | | | | | | | | | A bit of future-proofing. Some of them can stand just being ignored. function old new delta telnetd_main 1791 1798 +7 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * telnetd: fix corner case of input processing of 0xff bytesDenys Vlasenko2016-10-122-4/+117
| | | | | | | | | | | | | | | | | | I managed to reproduce the bug, with some difficulty. function old new delta telnetd_main 1780 1791 +11 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * telnetd: fix a corner case where CRLF->CR translation can misbehaveDenys Vlasenko2016-10-121-14/+35
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * telnetd: fix handling of short writes to ptyDenys Vlasenko2016-10-121-111/+120
| | | | | | | | | | | | | | | | | | | | | | | | If a write to pty is short, remove_iacs() can be run on a buffer repeatedly. This, for example, can eat 0xff chars (IACs, in telnet terms). Rework the logic to handle IACs in a special "write to pty" function. function old new delta telnetd_main 1662 1750 +88 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * more: accept and ignore a bunch of optionsDenys Vlasenko2016-10-111-1/+10
| | | | | | | | | | | | | | | | | | | | Alpine Linux stumbled over "more -s": http://bugs.alpinelinux.org/issues/5190 function old new delta more_main 857 872 +15 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ifupdown: rewrite state file atomicallyDenys Vlasenko2016-10-091-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | By user's request. Decided to not use fcntl(F_SETLKW) in lieu of problems with locking on networked filesystems. The existence of /var/run/ifstate.new is treated as a write lock. rename() provides atomicity. function old new delta ifupdown_main 1019 1122 +103 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * tcpsvd: don't keep shared fd open if fd limit is reached. closes 9331Denys Vlasenko2016-10-071-23/+46
| | | | | | | | | | | | | | | | | | | | Also, much improved help text. function old new delta packed_usage 30652 30851 +199 tcpudpsvd_main 1782 1784 +2 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | Skip merge of "ash: all blocks in function node..."Ron Yorston2016-10-190-0/+0
|\|
| * ash: all blocks in function node copying must be SHELL_ALIGNedDenys Vlasenko2016-10-071-3/+3
| | | | | | | | | | | | | | | | | | | | Previous commit probably introduced a bug: non-matching size calculation in size counting and actual copying caused by SHELL_ALIGN being applied differently! This won't bite if string sizes are also SHELL_ALIGNed. Thus fixing. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | Merge "ash testsuite: fix false positives"Ron Yorston2016-10-192-2/+2
|\|
| * ash testsuite: fix false positivesDenys Vlasenko2016-10-072-2/+2
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | Skip merge of "ash: get rid of two global data variables"Ron Yorston2016-10-190-0/+0
|\|
| * ash: get rid of two global data variablesDenys Vlasenko2016-10-071-51/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function old new delta calcsize 126 147 +21 funcstring_end - 4 +4 sizenodelist 28 24 -4 funcstringsize 4 - -4 funcstring 4 - -4 funcblocksize 4 - -4 nodeckstrdup 48 39 -9 evaltree 828 788 -40 ------------------------------------------------------------------------------ (add/remove: 1/3 grow/shrink: 1/4 up/down: 25/-105) Total: -40 bytes text data bss dec hex filename 943376 916 14292 958584 ea078 busybox_old 943344 916 14284 958544 ea050 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* | Merge branch busybox (up to "ash: comment out free(p) just before...")Ron Yorston2016-10-19456-2350/+5694
|\|
| * ash: comment out free(p) just before _exit, tweak some outdated commentsDenys Vlasenko2016-10-071-16/+5
| | | | | | | | | | | | Planned to sync exitshell up to dash, turned out ours is better :) Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * wget: there is no -s option in GNU Wget 1.18, we should be compatibleDenys Vlasenko2016-10-041-24/+33
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * dhcp: merge leases.c and static_leases.c into dhcpd.cDenys Vlasenko2016-10-046-253/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | function old new delta send_offer 292 461 +169 udhcpd_main 1531 1588 +57 read_leases 330 332 +2 add_lease 314 312 -2 find_lease_by_mac 68 - -68 find_free_or_expired_nip 174 - -174 ------------------------------------------------------------------------------ (add/remove: 0/4 grow/shrink: 3/1 up/down: 228/-244) Total: -16 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * dhcp: merge most of static_leases.c into dhcpd.cDenys Vlasenko2016-10-043-69/+58
| | | | | | | | | | | | | | | | | | | | | | function old new delta read_staticlease 121 222 +101 add_static_lease 48 - -48 log_static_leases 68 - -68 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 1/0 up/down: 101/-116) Total: -15 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * dhcp: merge files.c into dhcpd.cDenys Vlasenko2016-10-044-243/+222
| | | | | | | | | | | | | | | | | | Added NOINLINE to two function, since my version of gcc would actualy increase code size otherwise. I see no size changes. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * examples: add example of a DHCP serverDenys Vlasenko2016-10-038-0/+91
| | | | | | | | | | | | | | As usual, by multiplying directories - "dhcpd_eth0", "dhcpd_wlan1" you can run many servers on different interfaces. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush: add commented-out debug printouts in "memleak" built-inDenys Vlasenko2016-10-032-0/+17
| | | | | | | | | | | | | | Allocation addresses of malloc() are jittery, thought I had a mem leak in hush, but it was malloc variability. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush: fix a memory corruption when exported variable is modifiedDenys Vlasenko2016-10-031-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | The construct such as this: t=1 export t t=new_value1 had a small probability of momentarily using free()d value. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush: fix exitcode on exec failure with EACCES - should be 126Denys Vlasenko2016-10-031-1/+5
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * sh testsuite: add tests for exitcode on failure to execDenys Vlasenko2016-10-038-0/+16
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * shell: delete all msh testsDenys Vlasenko2016-10-0347-356/+0
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush testsuite: fix another false positiveDenys Vlasenko2016-10-032-2/+1
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hust testsuite: fix a false positiveDenys Vlasenko2016-10-031-1/+1
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ash testsuite: add most of hust tests which pass for ashDenys Vlasenko2016-10-03103-0/+795
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ash: [PARSER] Add nlprompt/nlnoprompt helpersDenys Vlasenko2016-10-021-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream commit: Date: Mon, 29 Sep 2014 22:53:53 +0800 [PARSER] Add nlprompt/nlnoprompt helpers This patch adds the nlprompt/nlnoprompt helpers to isolate code dealing with newlines and prompting. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * whitespace fixesDenys Vlasenko2016-10-022-2/+2
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush: add var4.tests, var5.testsDenys Vlasenko2016-10-024-0/+22
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * hush: fix var3.testsDenys Vlasenko2016-10-024-206/+214
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * sh: do not print empty line at the end of "help" outputDenys Vlasenko2016-10-022-2/+1
| | | | | | | | | | | | It's pointless. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * sh testsuite: sync ash-redir/ and hush-redir/Denys Vlasenko2016-10-0218-114/+313
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * sh testsuite: sync ash-misc/source* and hush-misc/source*Denys Vlasenko2016-10-0210-27/+50
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * sh testsuite: sync ash-vars/ and hush-vars/Denys Vlasenko2016-10-0211-20/+39
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| * ash testsuite: update some of variable tests with newer versions from hushDenys Vlasenko2016-10-026-25/+156
| | | | | | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-16 00:59:41 +0000