Try to make indent formatting less horrible

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

diff --git a/libbb/find_root_device.c b/libbb/find_root_device.c
index f8f68464da87335a6ee3acfe5f0fdda482f78398..c595321dfe832f0197e2363047a387f997664edf 100644 (file)
--- a/libbb/find_root_device.c
+++ b/libbb/find_root_device.c
@@ -1,9 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Copyright (C) 2000,2001 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Utility routines.
  *
- * 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
@@ -18,7 +17,6 @@
  * 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
- *
  */
 
 #include <stdio.h>
@@ -38,23 +36,23 @@ extern char *find_real_root_device_name(const char* name)
        dev_t dev;
 
        if (stat("/", &rootStat) != 0) 
-               perror_msg("could not stat '/'");
+               bb_perror_msg("could not stat '/'");
        else {
                if ((dev = rootStat.st_rdev)==0) 
                        dev=rootStat.st_dev;
 
                dir = opendir("/dev");
                if (!dir) 
-                       perror_msg("could not open '/dev'");
+                       bb_perror_msg("could not open '/dev'");
                else {
                        while((entry = readdir(dir)) != NULL) {
-
-                               /* Must skip ".." since that is "/", and so we 
+                               const char *myname = entry->d_name;
+                               /* Must skip ".." since that is "/", and so we
                                 * would get a false positive on ".."  */
-                               if (strcmp(entry->d_name, "..") == 0)
+                               if (myname[0] == '.' && myname[1] == '.' && !myname[2])
                                        continue;
 
-                               fileName = concat_path_file("/dev", entry->d_name);
+                               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 */
@@ -69,7 +67,7 @@ extern char *find_real_root_device_name(const char* name)
                }
        }
        if(fileName==NULL)
-               fileName=xstrdup("/dev/root");
+               fileName = bb_xstrdup("/dev/root");
        return fileName;
 }