X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Ffind_root_device.c;h=71b79b8d09178950dca2aafb26067740531c552e;hb=15b213ef5a0834eb06a0183ab839ac883d829d5a;hp=edfd7085a163140ac3c6b6b4a595d1820934a501;hpb=774d135b66f4ba914ee8649ce6e8c3f7d3e36c35;p=oweals%2Fbusybox.git

diff --git a/libbb/find_root_device.c b/libbb/find_root_device.c
index edfd7085a..71b79b8d0 100644
--- a/libbb/find_root_device.c
+++ b/libbb/find_root_device.c
@@ -2,90 +2,32 @@
 /*
  * Utility routines.
  *
- * Copyright (C) tons of folks.  Tracking down who wrote what
- * isn't something I'm going to worry about...  If you wrote something
- * here, please 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
- *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell 
- * Permission has been granted to redistribute this code under the GPL.
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <dirent.h>
-#include <stdlib.h>
 #include "libbb.h"
 
-
-
-extern char *find_real_root_device_name(const char* name)
+char *find_block_device(char *path)
 {
 	DIR *dir;
 	struct dirent *entry;
-	struct stat statBuf, rootStat;
-	char *fileName;
+	struct stat st;
 	dev_t dev;
+	char *retpath=NULL;
 
-	if (stat("/", &rootStat) != 0) {
-		perror_msg("could not stat '/'");
-		return NULL;
-	}
-	if ((dev = rootStat.st_rdev)==0) dev=rootStat.st_dev;
-
-	dir = opendir("/dev");
-	if (!dir) {
-		perror_msg("could not open '/dev'");
-		goto fallback;
-	}
-
+	if(stat(path, &st) || !(dir = opendir("/dev"))) return NULL;
+	dev = (st.st_mode & S_IFMT) == S_IFBLK ? st.st_rdev : st.st_dev;
 	while((entry = readdir(dir)) != NULL) {
-
-		/* Must skip ".." since that is "/", and so we 
-		 * would get a false positive on ".."  */
-		if (strcmp(entry->d_name, "..") == 0)
-			continue;
-
-		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) {
-			return fileName; 
+		char devpath[PATH_MAX];
+		sprintf(devpath,"/dev/%s", entry->d_name);
+		if(!stat(devpath, &st) && S_ISBLK(st.st_mode) && st.st_rdev == dev) {
+			retpath = xstrdup(devpath);
+			break;
 		}
-		free(fileName);
 	}
 	closedir(dir);
 
-fallback:
-	/* don't use stack space, caller expects to free() result */
-	fileName=xmalloc(20);
-	sprintf(fileName,"(rdev %u)",(unsigned int) rootStat.st_rdev);
-	return fileName;
+	return retpath;
 }
-
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/