Vodz, last_patch_114

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

diff --git a/libbb/find_root_device.c b/libbb/find_root_device.c
index b12d392a23630dd59a52e5cf09f2cbcb34e48b0c..c595321dfe832f0197e2363047a387f997664edf 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-2003 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
@@ -48,11 +46,14 @@ extern char *find_real_root_device_name(const char* name)
                        bb_perror_msg("could not open '/dev'");
                else {
                        while((entry = readdir(dir)) != NULL) {
-
-                               fileName = concat_subpath_file("/dev", entry->d_name);
-                               if(fileName == NULL)
+                               const char *myname = entry->d_name;
+                               /* Must skip ".." since that is "/", and so we
+                                * would get a false positive on ".."  */
+                               if (myname[0] == '.' && myname[1] == '.' && !myname[2])
                                        continue;
 
+                               fileName = concat_path_file("/dev", myname);
+
                                /* Some char devices have the same dev_t as block
                                 * devices, so make sure this is a block device */
                                if (stat(fileName, &statBuf) == 0 && 
@@ -66,7 +67,7 @@ extern char *find_real_root_device_name(const char* name)
                }
        }
        if(fileName==NULL)
-               fileName=bb_xstrdup("/dev/root");
+               fileName = bb_xstrdup("/dev/root");
        return fileName;
 }