- add a colorful "valid HTML 4.01 Transitional" button to be able to check the refere...

[oweals/busybox.git] / libbb / find_root_device.c

diff --git a/libbb/find_root_device.c b/libbb/find_root_device.c
index b12d392a23630dd59a52e5cf09f2cbcb34e48b0c..d1ffc87f50e296cafe71063a4522e9f04dc41013 100644 (file)
--- a/libbb/find_root_device.c
+++ b/libbb/find_root_device.c
@@ -2,9 +2,7 @@
 /*
  * Utility routines.
  *
- * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
- * Patched by a bunch of people.  Feel free to acknowledge your work.
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * 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
@@ -21,61 +19,32 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include <limits.h>
 #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 = NULL;
+       struct stat st;
        dev_t dev;
-
-       if (stat("/", &rootStat) != 0) 
-               bb_perror_msg("could not stat '/'");
-       else {
-               if ((dev = rootStat.st_rdev)==0) 
-                       dev=rootStat.st_dev;
-
-               dir = opendir("/dev");
-               if (!dir) 
-                       bb_perror_msg("could not open '/dev'");
-               else {
-                       while((entry = readdir(dir)) != NULL) {
-
-                               fileName = concat_subpath_file("/dev", entry->d_name);
-                               if(fileName == NULL)
-                                       continue;
-
-                               /* 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);
+       char *retpath=NULL;
+
+       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) {
+               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 = bb_xstrdup(devpath);
+                       break;
                }
        }
-       if(fileName==NULL)
-               fileName=bb_xstrdup("/dev/root");
-       return fileName;
-}
-
+       closedir(dir);
 
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+       return retpath;
+}