From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- .../src/router/busybox/libbb/find_root_device.c | 116 ++++++++++----------- 1 file changed, 53 insertions(+), 63 deletions(-) (limited to 'release/src/router/busybox/libbb/find_root_device.c') diff --git a/release/src/router/busybox/libbb/find_root_device.c b/release/src/router/busybox/libbb/find_root_device.c index f8f68464..ca46bf53 100644 --- a/release/src/router/busybox/libbb/find_root_device.c +++ b/release/src/router/busybox/libbb/find_root_device.c @@ -1,84 +1,74 @@ /* vi: set sw=4 ts=4: */ /* - * Copyright (C) 2000,2001 by Lineo, inc. - * Written by Erik Andersen , + * Utility routines. * - * Patched by a bunch of people. Feel free to acknowledge your work. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 1999-2004 by Erik Andersen * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include -#include -#include -#include #include "libbb.h" +/* 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]; +}; -extern char *find_real_root_device_name(const char* name) +static char *find_block_device_in_dir(struct arena *ap) { DIR *dir; struct dirent *entry; - struct stat statBuf, rootStat; - char *fileName = NULL; - dev_t dev; - - if (stat("/", &rootStat) != 0) - perror_msg("could not stat '/'"); - else { - if ((dev = rootStat.st_rdev)==0) - dev=rootStat.st_dev; + char *retpath = NULL; + int len, rem; - dir = opendir("/dev"); - if (!dir) - perror_msg("could not open '/dev'"); - else { - while((entry = readdir(dir)) != NULL) { + dir = opendir(ap->devpath); + if (!dir) + return NULL; - /* Must skip ".." since that is "/", and so we - * would get a false positive on ".." */ - if (strcmp(entry->d_name, "..") == 0) - continue; + len = strlen(ap->devpath); + rem = DEVNAME_MAX-2 - len; + if (rem <= 0) + return NULL; + ap->devpath[len++] = '/'; - fileName = concat_path_file("/dev", entry->d_name); - - /* Some char devices have the same dev_t as block - * devices, so make sure this is a block device */ - if (stat(fileName, &statBuf) == 0 && - S_ISBLK(statBuf.st_mode)!=0 && - statBuf.st_rdev == dev) - break; - free(fileName); - fileName=NULL; - } - closedir(dir); + while ((entry = readdir(dir)) != NULL) { + safe_strncpy(ap->devpath + len, entry->d_name, rem); + /* lstat: do not follow links */ + if (lstat(ap->devpath, &ap->st) != 0) + continue; + 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; } } - if(fileName==NULL) - fileName=xstrdup("/dev/root"); - return fileName; + closedir(dir); + + return retpath; } +char* FAST_FUNC find_block_device(const char *path) +{ + struct arena a; -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ + 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); +} -- cgit v1.2.3-54-g00ecf