sbase/rm.c

/* See LICENSE file for copyright and license details. */
#include "fs.h"
#include "util.h"

static void
usage(void)
{
	eprintf("usage: %s [-f] [-Rr] file ...\n", argv0);
}

int
main(int argc, char *argv[])
{
	ARGBEGIN {
	case 'f':
		rm_fflag = 1;
		break;
	case 'R':
	case 'r':
		rm_rflag = 1;
		break;
	default:
		usage();
	} ARGEND;

	if (!argc) {
		if (!rm_fflag)
			usage();
		else
			return 0;
	}

	for (; *argv; argc--, argv++)
		rm(*argv, 0, NULL);

	return rm_status;
}
add rm, thanks rob 2011-05-24 00:52:28 +00:00			`/* See LICENSE file for copyright and license details. */`
implement cp and mv and improve rm 2012-01-30 22:41:33 +00:00			`#include "fs.h"`
add rm, thanks rob 2011-05-24 00:52:28 +00:00			`#include "util.h"`

Eliminating the getopt disgrace. 2013-06-14 18:20:47 +00:00			`static void`
			`usage(void)`
			`{`
rm: Remove -i from usage and manpage We do not support it so do not lie to the user. 2015-02-19 14:54:12 +00:00			`eprintf("usage: %s [-f] [-Rr] file ...\n", argv0);`
Eliminating the getopt disgrace. 2013-06-14 18:20:47 +00:00			`}`

add rm, thanks rob 2011-05-24 00:52:28 +00:00			`int`
			`main(int argc, char *argv[])`
			`{`
Eliminating the getopt disgrace. 2013-06-14 18:20:47 +00:00			`ARGBEGIN {`
			`case 'f':`
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			`rm_fflag = 1;`
Eliminating the getopt disgrace. 2013-06-14 18:20:47 +00:00			`break;`
Add -R as a synonym to -r for rm(1) Some scripts require this. 2013-12-12 13:15:07 +00:00			`case 'R':`
Eliminating the getopt disgrace. 2013-06-14 18:20:47 +00:00			`case 'r':`
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			`rm_rflag = 1;`
Eliminating the getopt disgrace. 2013-06-14 18:20:47 +00:00			`break;`
			`default:`
			`usage();`
			`} ARGEND;`
None of these work without the proper # of arguments so print usage 2013-08-31 22:04:49 +00:00
Audit rm(1) 1) One small argc-style-matter 2) manpage cleanup 3) NOTE: The utility-functions will be evaluated separately. 2015-02-28 20:30:20 +00:00			`if (!argc) {`
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			`if (!rm_fflag)`
A plain rm -f is valid and should not be considered an error 2014-07-04 13:50:20 +00:00			`usage();`
			`else`
Stop using EXIT_{SUCCESS,FAILURE} 2014-10-02 22:46:04 +00:00			`return 0;`
A plain rm -f is valid and should not be considered an error 2014-07-04 13:50:20 +00:00			`}`
None of these work without the proper # of arguments so print usage 2013-08-31 22:04:49 +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 du(1) and refactor recurse() While auditing du(1) I realized that there's no way the over 100 lines of procedures in du() would pass the audit. Instead, I decided to rewrite this section using recurse() from libutil. However, the issue was that you'd need some kind of payload to count the number of bytes in the subdirectories and use them in the higher hierarchies. The solution is to add a "void *data" data pointer to each recurse- function-prototype, which we might also be able to use in other recurse-applications. recurse() itself had to be augmented with a recurse_samedev-flag, which basically prevents recurse from leaving the current device. Now, let's take a closer look at the audit: 1) Removing the now unnecessary util-functions push, pop, xrealpath, rename print() to printpath(), localize some global variables. 2) Only pass the block count to nblks instead of the entire stat- pointer. 3) Fix estrtonum to use the minimum of LLONG_MAX and SIZE_MAX. 4) Use idiomatic argv+argc-loop 5) Report proper exit-status. 2015-03-11 22:21:52 +00:00			`rm(*argv, 0, NULL);`
add rm, thanks rob 2011-05-24 00:52:28 +00:00
Fix return values in rm(1) and mv(1) by setting rm_status to 1 if removing 1 file in the list fails. Extend this to mv_status in mv(1). 2015-01-30 11:45:54 +00:00			`return rm_status;`
add rm, thanks rob 2011-05-24 00:52:28 +00:00			`}`