teach find_root_device to deal with /dev/ subdirs

(by "Kirill K. Smirnov" <lich@math.spbu.ru>)
This commit is contained in:
Denis Vlasenko 2007-04-13 23:59:52 +00:00
parent 334fa9bcb5
commit 16abcd90ae
9 changed files with 71 additions and 27 deletions

View File

@ -504,11 +504,11 @@ static struct dnode **list_dir(const char *path)
/* are we going to list the file- it may be . or .. or a hidden file */ /* are we going to list the file- it may be . or .. or a hidden file */
if (entry->d_name[0] == '.') { if (entry->d_name[0] == '.') {
if ((entry->d_name[1] == 0 || ( if ((!entry->d_name[1] || (entry->d_name[1] == '.' && !entry->d_name[2]))
entry->d_name[1] == '.' && !(all_fmt & DISP_DOT)
&& entry->d_name[2] == 0)) ) {
&& !(all_fmt & DISP_DOT))
continue; continue;
}
if (!(all_fmt & DISP_HIDDEN)) if (!(all_fmt & DISP_HIDDEN))
continue; continue;
} }

View File

@ -40,7 +40,7 @@ int rm_main(int argc, char **argv)
do { do {
const char *base = bb_get_last_path_component(*argv); const char *base = bb_get_last_path_component(*argv);
if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) { if (DOT_OR_DOTDOT(base)) {
bb_error_msg("cannot remove '.' or '..'"); bb_error_msg("cannot remove '.' or '..'");
} else if (remove_file(*argv, flags) >= 0) { } else if (remove_file(*argv, flags) >= 0) {
continue; continue;

View File

@ -405,6 +405,7 @@ extern char *xasprintf(const char *format, ...) __attribute__ ((format (printf,
#define NOT_LONE_DASH(s) ((s)[0] != '-' || (s)[1]) #define NOT_LONE_DASH(s) ((s)[0] != '-' || (s)[1])
#define LONE_CHAR(s,c) ((s)[0] == (c) && !(s)[1]) #define LONE_CHAR(s,c) ((s)[0] == (c) && !(s)[1])
#define NOT_LONE_CHAR(s,c) ((s)[0] != (c) || (s)[1]) #define NOT_LONE_CHAR(s,c) ((s)[0] != (c) || (s)[1])
#define DOT_OR_DOTDOT(s) ((s)[0] == '.' && (!(s)[1] || ((s)[1] == '.' && !(s)[2])))
/* dmalloc will redefine these to it's own implementation. It is safe /* dmalloc will redefine these to it's own implementation. It is safe
* to have the prototypes here unconditionally. */ * to have the prototypes here unconditionally. */

View File

@ -17,7 +17,7 @@
char *concat_subpath_file(const char *path, const char *f) char *concat_subpath_file(const char *path, const char *f)
{ {
if (f && *f == '.' && (!f[1] || (f[1] == '.' && !f[2]))) if (f && DOT_OR_DOTDOT(f))
return NULL; return NULL;
return concat_path_file(path, f); return concat_path_file(path, f);
} }

View File

@ -9,22 +9,50 @@
#include "libbb.h" #include "libbb.h"
char *find_block_device(const char *path) /* Find block device /dev/XXX which contains specified file
* We handle /dev/dir/dir/dir too, at a cost of ~80 more bytes code */
/* Do not reallocate all this stuff on each recursion */
enum { DEVNAME_MAX = 256 };
struct arena {
struct stat st;
dev_t dev;
/* Was PATH_MAX, but we recurse _/dev_. We can assume
* people are not crazy enough to have mega-deep tree there */
char devpath[DEVNAME_MAX];
};
static char *find_block_device_in_dir(struct arena *ap)
{ {
DIR *dir; DIR *dir;
struct dirent *entry; struct dirent *entry;
struct stat st; char *retpath = NULL;
dev_t dev; int len, rem;
char *retpath=NULL;
if (stat(path, &st) || !(dir = opendir("/dev"))) dir = opendir(ap->devpath);
if (!dir)
return NULL; return NULL;
dev = (st.st_mode & S_IFMT) == S_IFBLK ? st.st_rdev : st.st_dev;
len = strlen(ap->devpath);
rem = DEVNAME_MAX-2 - len;
if (rem <= 0)
return NULL;
ap->devpath[len++] = '/';
while ((entry = readdir(dir)) != NULL) { while ((entry = readdir(dir)) != NULL) {
char devpath[PATH_MAX]; safe_strncpy(ap->devpath + len, entry->d_name, rem);
sprintf(devpath,"/dev/%s", entry->d_name); if (stat(ap->devpath, &ap->st) != 0)
if (!stat(devpath, &st) && S_ISBLK(st.st_mode) && st.st_rdev == dev) { continue;
retpath = xstrdup(devpath); if (S_ISBLK(ap->st.st_mode) && ap->st.st_rdev == ap->dev) {
retpath = xstrdup(ap->devpath);
break;
}
if (S_ISDIR(ap->st.st_mode)) {
/* Do not recurse for '.' and '..' */
if (DOT_OR_DOTDOT(entry->d_name))
continue;
retpath = find_block_device_in_dir(ap);
if (retpath)
break; break;
} }
} }
@ -32,3 +60,14 @@ char *find_block_device(const char *path)
return retpath; return retpath;
} }
char *find_block_device(const char *path)
{
struct arena a;
if (stat(path, &a.st) != 0)
return NULL;
a.dev = S_ISBLK(a.st.st_mode) ? a.st.st_rdev : a.st.st_dev;
strcpy(a.devpath, "/dev");
return find_block_device_in_dir(&a);
}

View File

@ -26,13 +26,16 @@ char *bb_simplify_path(const char *path)
if (*p == '/') { if (*p == '/') {
if (*s == '/') { /* skip duplicate (or initial) slash */ if (*s == '/') { /* skip duplicate (or initial) slash */
continue; continue;
} else if (*s == '.') { }
if (s[1] == '/' || s[1] == 0) { /* remove extra '.' */ if (*s == '.') {
if (s[1] == '/' || !s[1]) { /* remove extra '.' */
continue; continue;
} else if ((s[1] == '.') && (s[2] == '/' || s[2] == 0)) { }
if ((s[1] == '.') && (s[2] == '/' || !s[2])) {
++s; ++s;
if (p > start) { if (p > start) {
while (*--p != '/'); /* omit previous dir */ while (*--p != '/') /* omit previous dir */
continue;
} }
continue; continue;
} }

View File

@ -1369,7 +1369,7 @@ static void dir_operation(int type, const char * dir_name, int var, unsigned lon
while ( (de = readdir (dp) ) != NULL ) while ( (de = readdir (dp) ) != NULL )
{ {
if(de->d_name && *de->d_name == '.' && (!de->d_name[1] || (de->d_name[1] == '.' && !de->d_name[2]))) if(de->d_name && DOT_OR_DOTDOT(de->d_name))
continue; continue;
snprintf (path, sizeof (path), "%s/%s", dir_name, de->d_name); snprintf (path, sizeof (path), "%s/%s", dir_name, de->d_name);
debug_msg_logger(LOG_ERR, "%s: %s", __FUNCTION__, path); debug_msg_logger(LOG_ERR, "%s: %s", __FUNCTION__, path);

View File

@ -1573,7 +1573,7 @@ static void handleIncoming(void)
} }
/* algorithm stolen from libbb bb_simplify_path(), /* algorithm stolen from libbb bb_simplify_path(),
but don't strdup and reducing trailing slash and protect out root */ * but don't strdup and reducing trailing slash and protect out root */
purl = test = url; purl = test = url;
do { do {
if (*purl == '/') { if (*purl == '/') {
@ -1583,11 +1583,11 @@ static void handleIncoming(void)
} }
if (*test == '.') { if (*test == '.') {
/* skip extra '.' */ /* skip extra '.' */
if (test[1] == '/' || test[1] == 0) { if (test[1] == '/' || !test[1]) {
continue; continue;
} else }
/* '..': be careful */ /* '..': be careful */
if (test[1] == '.' && (test[2] == '/' || test[2] == 0)) { if (test[1] == '.' && (test[2] == '/' || !test[2])) {
++test; ++test;
if (purl == url) { if (purl == url) {
/* protect out root */ /* protect out root */

View File

@ -2293,7 +2293,8 @@ updatepwd(const char *dir)
break; break;
} }
break; break;
} else if (p[1] == '\0') }
if (p[1] == '\0')
break; break;
/* fall through */ /* fall through */
default: default: