sbase/echo.c

/* See LICENSE file for copyright and license details. */
#include <stdio.h>
#include <string.h>
#include "util.h"

int
main(int argc, char *argv[])
{
	int nflag = 0;

	if (*++argv && !strcmp(*argv, "-n")) {
		nflag = 1;
		argc--, argv++;
	}

	for (; *argv; argc--, argv++)
		putword(stdout, *argv);
	if (!nflag)
		putchar('\n');

	return fshut(stdout, "<stdout>");
}
initial commit 2011-05-23 01:36:34 +00:00			`/* See LICENSE file for copyright and license details. */`
			`#include <stdio.h>`
Do not interpret -- in echo(1) Retain -n as it is marginally useful and common. 2015-04-03 09:29:11 +00:00			`#include <string.h>`
kill -l 2011-06-10 01:56:13 +00:00			`#include "util.h"`
initial commit 2011-05-23 01:36:34 +00:00
			`int`
			`main(int argc, char *argv[])`
			`{`
Un-boolify sbase It actually makes the binaries smaller, the code easier to read (gems like "val == true", "val == false" are gone) and actually predictable in the sense of that we actually know what we're working with (one bitwise operator was quite adventurous and should now be fixed). This is also more consistent with the other suckless projects around which don't use boolean types. 2014-11-13 20:24:47 +00:00			`int nflag = 0;`
initial commit 2011-05-23 01:36:34 +00:00
Do not interpret -- in echo(1) Retain -n as it is marginally useful and common. 2015-04-03 09:29:11 +00:00			`if (++argv && !strcmp(argv, "-n")) {`
Un-boolify sbase It actually makes the binaries smaller, the code easier to read (gems like "val == true", "val == false" are gone) and actually predictable in the sense of that we actually know what we're working with (one bitwise operator was quite adventurous and should now be fixed). This is also more consistent with the other suckless projects around which don't use boolean types. 2014-11-13 20:24:47 +00:00			`nflag = 1;`
Do not interpret -- in echo(1) Retain -n as it is marginally useful and common. 2015-04-03 09:29:11 +00:00			`argc--, argv++;`
			`}`
Eliminating the getopt disgrace. 2013-06-14 18:20:47 +00:00
Make already audited tools argv-centric instead of argc-centric This has already been suggested by Evan Gates <evan.gates@gmail.com> and he's totally right about it. So, what's the problem? I wrote a testing program asshole.c with int main(void) { execl("/path/to/sbase/echo", "echo", "test"); return 0; } and checked the results with glibc and musl. Note that the sentinel NULL is missing from the end of the argument list. glibc calculates an argc of 5, musl 4 (instead of 2) and thus mess up things anyway. The powerful arg.h also focuses on argv instead of argc as well, but ignoring argc completely is also the wrong way to go. Instead, a more idiomatic approach is to check *argv only and decrement argc on the go. While at it, I rewrote yes(1) in an argv-centric way as well. All audited tools have been "fixed" and each following audited tool will receive the same treatment. 2015-03-02 13:19:26 +00:00			`for (; *argv; argc--, argv++)`
Update putword() to accept a FILE * 2015-04-21 16:40:57 +00:00			`putword(stdout, *argv);`
Fix coding style It was about damn time. Consistency is very important in such a big codebase. 2014-11-13 17:29:30 +00:00			`if (!nflag)`
add ls; simpler pwd 2011-05-26 03:01:20 +00:00			`putchar('\n');`
Eliminating the getopt disgrace. 2013-06-14 18:20:47 +00:00
Add *fshut() functions to properly flush file streams This has been a known issue for a long time. Example: printf "word" > /dev/full wouldn't report there's not enough space on the device. This is due to the fact that every libc has internal buffers for stdout which store fragments of written data until they reach a certain size or on some callback to flush them all at once to the kernel. You can force the libc to flush them with fflush(). In case flushing fails, you can check the return value of fflush() and report an error. However, previously, sbase didn't have such checks and without fflush(), the libc silently flushes the buffers on exit without checking the errors. No offense, but there's no way for the libc to report errors in the exit- condition. GNU coreutils solve this by having onexit-callbacks to handle the flushing and report issues, but they have obvious deficiencies. After long discussions on IRC, we came to the conclusion that checking the return value of every io-function would be a bit too much, and having a general-purpose fclose-wrapper would be the best way to go. It turned out that fclose() alone is not enough to detect errors. The right way to do it is to fflush() + check ferror on the fp and then to a fclose(). This is what fshut does and that's how it's done before each return. The return value is obviously affected, reporting an error in case a flush or close failed, but also when reading failed for some reason, the error- state is caught. the !!( ... + ...) construction is used to call all functions inside the brackets and not "terminating" on the first. We want errors to be reported, but there's no reason to stop flushing buffers when one other file buffer has issues. Obviously, functionales come before the flush and ret-logic comes after to prevent early exits as well without reporting warnings if there are any. One more advantage of fshut() is that it is even able to report errors on obscure NFS-setups which the other coreutils are unable to detect, because they only check the return-value of fflush() and fclose(), not ferror() as well. 2015-04-04 19:25:17 +00:00			`return fshut(stdout, "<stdout>");`
initial commit 2011-05-23 01:36:34 +00:00			`}`