Apply vodz' last_patch52

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

diff --git a/libbb/find_root_device.c b/libbb/find_root_device.c
index de765ce4499eed22c4a0a2bc6ff3f11c64e35997..0a3f1bc77eb65749e9b44842d9b35a00347cd84d 100644 (file)
--- a/libbb/find_root_device.c
+++ b/libbb/find_root_device.c
@@ -2,9 +2,9 @@
 /*
  * 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.
+ * 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.
  *
  * 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
@@ -19,59 +19,58 @@
  * 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.
- *
  */
 
 #include <stdio.h>
 #include <string.h>
 #include <dirent.h>
+#include <stdlib.h>
 #include "libbb.h"
 
 
 
-extern int find_real_root_device_name(char* name)
+extern char *find_real_root_device_name(const char* name)
 {
        DIR *dir;
        struct dirent *entry;
        struct stat statBuf, rootStat;
-       char fileName[BUFSIZ];
-
-       if (stat("/", &rootStat) != 0) {
-               error_msg("could not stat '/'");
-               return( FALSE);
-       }
+       char *fileName = NULL;
+       dev_t dev;
 
-       dir = opendir("/dev");
-       if (!dir) {
-               error_msg("could not open '/dev'");
-               return( FALSE);
-       }
+       if (stat("/", &rootStat) != 0) 
+               perror_msg("could not stat '/'");
+       else {
+               if ((dev = rootStat.st_rdev)==0) 
+                       dev=rootStat.st_dev;
 
-       while((entry = readdir(dir)) != NULL) {
+               dir = opendir("/dev");
+               if (!dir) 
+                       perror_msg("could not open '/dev'");
+               else {
+                       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;
+                               /* Must skip ".." since that is "/", and so we 
+                                * would get a false positive on ".."  */
+                               if (strcmp(entry->d_name, "..") == 0)
+                                       continue;
 
-               snprintf( fileName, strlen(name)+1, "/dev/%s", entry->d_name);
+                               fileName = concat_path_file("/dev", entry->d_name);
 
-               if (stat(fileName, &statBuf) != 0)
-                       continue;
-               /* Some char devices have the same dev_t as block
-                * devices, so make sure this is a block device */
-               if (! S_ISBLK(statBuf.st_mode))
-                       continue;
-               if (statBuf.st_rdev == rootStat.st_rdev) {
-                       strcpy(name, fileName); 
-                       return ( TRUE);
+                               /* 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);
                }
        }
-
-       return( FALSE);
+       if(fileName==NULL)
+               fileName=xstrdup("/dev/root");
+       return fileName;
 }