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(*argv);
	if (!nflag)
		putchar('\n');

	return 0;
}
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++)`
Audit printenv(1) 1) argc style 2) safeguard argv-loop as already seen in echo(1) with argc-decrement. 2015-02-28 20:47:17 +00:00			`putword(*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
Stop using EXIT_{SUCCESS,FAILURE} 2014-10-02 22:46:04 +00:00			`return 0;`
initial commit 2011-05-23 01:36:34 +00:00			`}`