sbase/libutil/rm.c

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

#include "../fs.h"
#include "../util.h"

int rm_fflag = 0;
int rm_rflag = 0;
int rm_status = 0;

void
rm(const char *path, int depth, void *data)
{
	if (rm_rflag)
		recurse(path, rm, depth, NULL);
	if (remove(path) < 0) {
		if (!rm_fflag)
			weprintf("remove %s:", path);
		if (!(rm_fflag && errno == ENOENT))
			rm_status = 1;
	}
}
implement cp and mv and improve rm 2012-01-30 22:41:33 +00:00			`/* See LICENSE file for copyright and license details. */`
Fix exit status with -f for nonexistent paths Thanks Michael Forney <mforney@mforney.org> for reporting this! 2015-03-01 22:48:50 +00:00			`#include <errno.h>`
implement cp and mv and improve rm 2012-01-30 22:41:33 +00:00			`#include <stdio.h>`
Style inquistion for util and some tools. 2013-03-05 20:46:48 +00:00
implement cp and mv and improve rm 2012-01-30 22:41:33 +00:00			`#include "../fs.h"`
			`#include "../util.h"`

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 rm_fflag = 0;`
			`int rm_rflag = 0;`
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			`int rm_status = 0;`
implement cp and mv and improve rm 2012-01-30 22:41:33 +00:00
			`void`
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(const char path, int depth, void data)`
implement cp and mv and improve rm 2012-01-30 22:41:33 +00:00			`{`
Sort includes and more cleanup and fixes in util/ 2014-11-13 18:54:28 +00:00			`if (rm_rflag)`
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			`recurse(path, rm, depth, NULL);`
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			`if (remove(path) < 0) {`
			`if (!rm_fflag)`
			`weprintf("remove %s:", path);`
Do not mask previous return-values in libutil/rm.c Thanks Michael Forney <mforney@mforney.org> for this observation! 2015-03-02 09:53:55 +00:00			`if (!(rm_fflag && errno == ENOENT))`
			`rm_status = 1;`
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			`}`
implement cp and mv and improve rm 2012-01-30 22:41:33 +00:00			`}`