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)
{
	if (rm_rflag)
		recurse(path, rm, depth);
	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 17:41:33 -05: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 17:48:50 -05:00			`#include <errno.h>`
implement cp and mv and improve rm 2012-01-30 17:41:33 -05:00			`#include <stdio.h>`
Style inquistion for util and some tools. 2013-03-05 15:46:48 -05:00
implement cp and mv and improve rm 2012-01-30 17:41:33 -05: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 15:24:47 -05: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 06:45:54 -05:00			`int rm_status = 0;`
implement cp and mv and improve rm 2012-01-30 17:41:33 -05:00
			`void`
Refactor enmasse() and recurse() to reflect depth The HLP-changes to sbase have been a great addition of functionality, but they kind of "polluted" the enmasse() and recurse() prototypes. As this will come in handy in the future, knowing at which "depth" you are inside a recursing function is an important functionality. Instead of having a special HLP-flag passed to enmasse, each sub- function needs to provide it on its own and can calculate results based on the current depth (for instance, 'H' implies 'P' at depth > 0). A special case is recurse(), because it actually depends on the follow-type. A new flag "recurse_follow" brings consistency into what used to be spread across different naming conventions (fflag, HLP_flag, ...). This also fixes numerous bugs with the behaviour of HLP in the tools using it. 2015-03-02 15:43:56 -05:00			`rm(const char *path, int depth)`
implement cp and mv and improve rm 2012-01-30 17:41:33 -05:00			`{`
Sort includes and more cleanup and fixes in util/ 2014-11-13 13:54:28 -05:00			`if (rm_rflag)`
Refactor enmasse() and recurse() to reflect depth The HLP-changes to sbase have been a great addition of functionality, but they kind of "polluted" the enmasse() and recurse() prototypes. As this will come in handy in the future, knowing at which "depth" you are inside a recursing function is an important functionality. Instead of having a special HLP-flag passed to enmasse, each sub- function needs to provide it on its own and can calculate results based on the current depth (for instance, 'H' implies 'P' at depth > 0). A special case is recurse(), because it actually depends on the follow-type. A new flag "recurse_follow" brings consistency into what used to be spread across different naming conventions (fflag, HLP_flag, ...). This also fixes numerous bugs with the behaviour of HLP in the tools using it. 2015-03-02 15:43:56 -05:00			`recurse(path, rm, depth);`
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 06:45:54 -05: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 04:53:55 -05: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 06:45:54 -05:00			`}`
implement cp and mv and improve rm 2012-01-30 17:41:33 -05:00			`}`