midfavila
/
sbase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
sbase/libutil/recurse.c

60 lines
1.5 KiB
C
Raw Normal View History

add chown
2011-05-24 23:24:33 +00:00
/* See LICENSE file for copyright and license details. */
#include <dirent.h>
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
#include <errno.h>
Add strlcpy()/strlcat() Refactor recurse() routine in preparation to moving tar(1) over to use it instead of the ftw() interface.
2014-01-30 12:37:35 +00:00
#include <limits.h>
#include <stdio.h>
add chown
2011-05-24 23:24:33 +00:00
#include <stdlib.h>
#include <string.h>
recurse: ignore links
2011-06-04 13:30:54 +00:00
#include <sys/stat.h>
Add strlcpy()/strlcat() Refactor recurse() routine in preparation to moving tar(1) over to use it instead of the ftw() interface.
2014-01-30 12:37:35 +00:00
#include <sys/types.h>
#include <unistd.h>
Style inquistion for util and some tools.
2013-03-05 20:46:48 +00:00
add chown
2011-05-24 23:24:33 +00:00
#include "../util.h"
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
int recurse_follow = 'P';
int recurse_samedev = 0;
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 20:43:56 +00:00
add chown
2011-05-24 23:24: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
recurse(const char *path, void (*fn)(const char *, int, void *), int depth, void *data)
add chown
2011-05-24 23:24:33 +00:00
{
struct dirent *d;
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
struct stat lst, st, dst;
add chown
2011-05-24 23:24:33 +00:00
DIR *dp;
Refactor recurse() Instead of allocating a buffer on each run, build a buf on the stack.
2015-03-12 12:22:37 +00:00
char subpath[PATH_MAX];
add chown
2011-05-24 23:24:33 +00:00
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
if (lstat(path, &lst) < 0) {
if (errno != ENOENT)
weprintf("lstat %s:", path);
return;
}
if (stat(path, &st) < 0) {
if (errno != ENOENT)
weprintf("stat %s:", path);
return;
}
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 20:43:56 +00:00
if (!S_ISDIR(lst.st_mode) && !(S_ISLNK(lst.st_mode) && S_ISDIR(st.st_mode) &&
!(recurse_follow == 'P' || (recurse_follow == 'H' && depth > 0))))
recurse: ignore links
2011-06-04 13:30:54 +00:00
return;
Add some error checking to util/recurse.c Some more stylistic changes and simplification.
2014-06-30 14:58:00 +00:00
if (!(dp = opendir(path)))
recurse: ignore links
2011-06-04 13:30:54 +00:00
eprintf("opendir %s:", path);
Add some error checking to util/recurse.c Some more stylistic changes and simplification.
2014-06-30 14:58:00 +00:00
while ((d = readdir(dp))) {
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 20:43:56 +00:00
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
Add strlcpy()/strlcat() Refactor recurse() routine in preparation to moving tar(1) over to use it instead of the ftw() interface.
2014-01-30 12:37:35 +00:00
continue;
Refactor recurse() Instead of allocating a buffer on each run, build a buf on the stack.
2015-03-12 12:22:37 +00:00
if (strlcpy(subpath, path, PATH_MAX) >= PATH_MAX)
eprintf("strlcpy: path too long\n");
if (path[strlen(path) - 1] != '/' && strlcat(subpath, "/", PATH_MAX) >= PATH_MAX)
eprintf("strlcat: path too long\n");
if (strlcat(subpath, d->d_name, PATH_MAX) >= PATH_MAX)
eprintf("strlcat: path too long\n");
if (recurse_samedev && lstat(subpath, &dst) < 0) {
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
if (errno != ENOENT)
Refactor recurse() Instead of allocating a buffer on each run, build a buf on the stack.
2015-03-12 12:22:37 +00:00
weprintf("stat %s:", subpath);
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
} else if (!(recurse_samedev && dst.st_dev != lst.st_dev))
Refactor recurse() Instead of allocating a buffer on each run, build a buf on the stack.
2015-03-12 12:22:37 +00:00
fn(subpath, depth + 1, data);
Style inquistion for util and some tools.
2013-03-05 20:46:48 +00:00
}
add chown
2011-05-24 23:24:33 +00:00
closedir(dp);
}