2012-01-30 22:41:33 +00:00
|
|
|
/* See LICENSE file for copyright and license details. */
|
Refactor recurse() again
Okay, why yet another recurse()-refactor?
The last one added the recursor-struct, which simplified things
on the user-end, but there was still one thing that bugged me a lot:
Previously, all fn()'s were forced to (l)stat the paths themselves.
This does not work well when you try to keep up with H-, L- and P-
flags at the same time, as each utility-function would have to set
the right function-pointer for (l)stat every single time.
This is not desirable. Furthermore, recurse should be easy to use
and not involve trouble finding the right (l)stat-function to do it
right.
So, what we needed was a stat-argument for each fn(), so it is
directly accessible. This was impossible to do though when the
fn()'s are still directly called by the programs to "start" the
recurse.
Thus, the fundamental change is to make recurse() the function to
go, while designing the fn()'s in a way they can "live" with st
being NULL (we don't want a null-pointer-deref).
What you can see in this commit is the result of this work. Why
all this trouble instead of using nftw?
The special thing about recurse() is that you tell the function
when to recurse() in your fn(). You don't need special flags to
tell nftw() to skip the subtree, just to give an example.
The only single downside to this is that now, you are not allowed
to unconditionally call recurse() from your fn(). It has to be
a directory.
However, that is a cost I think is easily weighed up by the
advantages.
Another thing is the history: I added a procedure at the end of
the outmost recurse to free the history. This way we don't leak
memory.
A simple optimization on the side:
- if (h->dev == st.st_dev && h->ino == st.st_ino)
+ if (h->ino == st.st_ino && h->dev == st.st_dev)
First compare the likely difference in inode-numbers instead of
checking the unlikely condition that the device-numbers are
different.
2015-03-18 23:53:42 +00:00
|
|
|
#include <sys/stat.h>
|
|
|
|
|
|
2015-03-01 22:48:50 +00:00
|
|
|
#include <errno.h>
|
2012-01-30 22:41:33 +00:00
|
|
|
#include <stdio.h>
|
2015-04-18 19:24:17 +00:00
|
|
|
#include <unistd.h>
|
2013-03-05 20:46:48 +00:00
|
|
|
|
2012-01-30 22:41:33 +00:00
|
|
|
#include "../fs.h"
|
|
|
|
|
#include "../util.h"
|
|
|
|
|
|
2015-01-30 11:45:54 +00:00
|
|
|
int rm_status = 0;
|
2012-01-30 22:41:33 +00:00
|
|
|
|
|
|
|
|
void
|
Refactor recurse() again
Okay, why yet another recurse()-refactor?
The last one added the recursor-struct, which simplified things
on the user-end, but there was still one thing that bugged me a lot:
Previously, all fn()'s were forced to (l)stat the paths themselves.
This does not work well when you try to keep up with H-, L- and P-
flags at the same time, as each utility-function would have to set
the right function-pointer for (l)stat every single time.
This is not desirable. Furthermore, recurse should be easy to use
and not involve trouble finding the right (l)stat-function to do it
right.
So, what we needed was a stat-argument for each fn(), so it is
directly accessible. This was impossible to do though when the
fn()'s are still directly called by the programs to "start" the
recurse.
Thus, the fundamental change is to make recurse() the function to
go, while designing the fn()'s in a way they can "live" with st
being NULL (we don't want a null-pointer-deref).
What you can see in this commit is the result of this work. Why
all this trouble instead of using nftw?
The special thing about recurse() is that you tell the function
when to recurse() in your fn(). You don't need special flags to
tell nftw() to skip the subtree, just to give an example.
The only single downside to this is that now, you are not allowed
to unconditionally call recurse() from your fn(). It has to be
a directory.
However, that is a cost I think is easily weighed up by the
advantages.
Another thing is the history: I added a procedure at the end of
the outmost recurse to free the history. This way we don't leak
memory.
A simple optimization on the side:
- if (h->dev == st.st_dev && h->ino == st.st_ino)
+ if (h->ino == st.st_ino && h->dev == st.st_dev)
First compare the likely difference in inode-numbers instead of
checking the unlikely condition that the device-numbers are
different.
2015-03-18 23:53:42 +00:00
|
|
|
rm(const char *path, struct stat *st, void *data, struct recursor *r)
|
2012-01-30 22:41:33 +00:00
|
|
|
{
|
2015-04-18 20:04:49 +00:00
|
|
|
if (!r->maxdepth && st && S_ISDIR(st->st_mode)) {
|
2015-03-12 23:25:32 +00:00
|
|
|
recurse(path, NULL, r);
|
2015-04-18 19:24:17 +00:00
|
|
|
|
|
|
|
|
if (rmdir(path) < 0) {
|
2015-04-19 12:00:47 +00:00
|
|
|
if (!(r->flags & SILENT))
|
2015-04-18 19:24:17 +00:00
|
|
|
weprintf("rmdir %s:", path);
|
2015-04-19 12:00:47 +00:00
|
|
|
if (!((r->flags & SILENT) && errno == ENOENT))
|
2015-04-18 19:24:17 +00:00
|
|
|
rm_status = 1;
|
|
|
|
|
}
|
|
|
|
|
} else if (unlink(path) < 0) {
|
2015-04-19 12:00:47 +00:00
|
|
|
if (!(r->flags & SILENT))
|
2015-04-18 19:24:17 +00:00
|
|
|
weprintf("unlink %s:", path);
|
2015-04-19 12:00:47 +00:00
|
|
|
if (!((r->flags & SILENT) && errno == ENOENT))
|
2015-03-02 09:53:55 +00:00
|
|
|
rm_status = 1;
|
2015-01-30 11:45:54 +00:00
|
|
|
}
|
2012-01-30 22:41:33 +00:00
|
|
|
}
|
