Vodz, last_patch_88

This commit is contained in:
Glenn L McGrath
2003-06-10 17:22:49 +00:00
parent 6c43f743a3
commit 24833430bc
22 changed files with 211 additions and 365 deletions

View File

@ -48,11 +48,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 *name = entry->d_name;
/* Must skip ".." since that is "/", and so we
* would get a false positive on ".." */
if (name[0] == '.' && name[1] == '.' && !name[2])
continue;
fileName = concat_path_file("/dev", 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 &&
@ -66,7 +69,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;
}