X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffstools.git;a=blobdiff_plain;f=block.c;h=b8ef430126e6dbd3ce81cd998ab78fb6306ee4fc;hp=13992f20ebbce0bccb0fb664188c6d2b3e9a3c81;hb=6eda7defcedbe8337d7cb4dd4b3d04244a7b6698;hpb=0453f48e509077c83129b8aaceecb4e4430c8309

diff --git a/block.c b/block.c
index 13992f2..b8ef430 100644
--- a/block.c
+++ b/block.c
@@ -464,6 +464,16 @@ static int config_load(char *cfg)
 static struct blkid_struct_probe* _probe_path(char *path)
 {
 	struct blkid_struct_probe *pr;
+	char tmppath[64];
+
+	/* skip ubi device if ubiblock device is present */
+	if (path[5] == 'u' && path[6] == 'b' && path[7] == 'i' &&
+	    path[8] >= '0' && path[8] <= '9' ) {
+		snprintf(tmppath, sizeof(tmppath), "/dev/ubiblock%s", path + 8);
+		list_for_each_entry(pr, &devices, list)
+			if (!strcasecmp(pr->dev, tmppath))
+				return NULL;
+	}
 
 	pr = malloc(sizeof(*pr));
 
@@ -506,7 +516,7 @@ static void cache_load(int mtd)
 	if (mtd) {
 		_cache_load("/dev/mtdblock*");
 		_cache_load("/dev/ubiblock*");
-		_cache_load("/dev/ubi?*_?*");
+		_cache_load("/dev/ubi[0-9]*");
 	}
 	_cache_load("/dev/mmcblk*");
 	_cache_load("/dev/sd*");
@@ -516,25 +526,6 @@ static void cache_load(int mtd)
 	_cache_load("/dev/mapper/*");
 }
 
-static int print_block_info(struct blkid_struct_probe *pr)
-{
-	printf("%s:", pr->dev);
-	if (pr->uuid[0])
-		printf(" UUID=\"%s\"", pr->uuid);
-
-	if (pr->label[0])
-		printf(" LABEL=\"%s\"", pr->label);
-
-	if (pr->name[0])
-		printf(" NAME=\"%s\"", pr->name);
-
-	if (pr->version[0])
-		printf(" VERSION=\"%s\"", pr->version);
-
-	printf(" TYPE=\"%s\"\n", pr->id->name);
-
-	return 0;
-}
 
 static int print_block_uci(struct blkid_struct_probe *pr)
 {
@@ -577,25 +568,86 @@ static struct blkid_struct_probe* find_block_info(char *uuid, char *label, char
 
 static char* find_mount_point(char *block)
 {
-	FILE *fp = fopen("/proc/mounts", "r");
+	FILE *fp = fopen("/proc/self/mountinfo", "r");
 	static char line[256];
 	int len = strlen(block);
-	char *point = NULL;
+	char *point = NULL, *pos, *tmp, *cpoint, *devname;
+	struct stat s;
+	int rstat;
+	unsigned int minor, major;
 
-	if(!fp)
+	if (!fp)
 		return NULL;
 
+	rstat = stat(block, &s);
+
 	while (fgets(line, sizeof(line), fp)) {
-		if (!strncmp(line, block, len)) {
-			char *p = &line[len + 1];
-			char *t = strstr(p, " ");
+		pos = strchr(line, ' ');
+		if (!pos)
+			continue;
 
-			if (!t) {
-				fclose(fp);
-				return NULL;
-			}
-			*t = '\0';
-			point = p;
+		pos = strchr(pos + 1, ' ');
+		if (!pos)
+			continue;
+
+		tmp = ++pos;
+		pos = strchr(pos, ':');
+		if (!pos)
+			continue;
+
+		*pos = '\0';
+		major = atoi(tmp);
+		tmp = ++pos;
+		pos = strchr(pos, ' ');
+		if (!pos)
+			continue;
+
+		*pos = '\0';
+		minor = atoi(tmp);
+		pos = strchr(pos + 1, ' ');
+		if (!pos)
+			continue;
+		tmp = ++pos;
+
+		pos = strchr(pos, ' ');
+		if (!pos)
+			continue;
+		*pos = '\0';
+		cpoint = tmp;
+
+		pos = strchr(pos + 1, ' ');
+		if (!pos)
+			continue;
+
+		pos = strchr(pos + 1, ' ');
+		if (!pos)
+			continue;
+
+		pos = strchr(pos + 1, ' ');
+		if (!pos)
+			continue;
+
+		tmp = ++pos;
+		pos = strchr(pos, ' ');
+		if (!pos)
+			continue;
+
+		*pos = '\0';
+		devname = tmp;
+		if (!strncmp(block, devname, len)) {
+			point = strdup(cpoint);
+			break;
+		}
+
+		if (rstat)
+			continue;
+
+		if (!S_ISBLK(s.st_mode))
+			continue;
+
+		if (major == major(s.st_rdev) &&
+		    minor == minor(s.st_rdev)) {
+			point = strdup(cpoint);
 			break;
 		}
 	}
@@ -605,6 +657,34 @@ static char* find_mount_point(char *block)
 	return point;
 }
 
+static int print_block_info(struct blkid_struct_probe *pr)
+{
+	static char *mp;
+
+	mp = find_mount_point(pr->dev);
+	printf("%s:", pr->dev);
+	if (pr->uuid[0])
+		printf(" UUID=\"%s\"", pr->uuid);
+
+	if (pr->label[0])
+		printf(" LABEL=\"%s\"", pr->label);
+
+	if (pr->name[0])
+		printf(" NAME=\"%s\"", pr->name);
+
+	if (pr->version[0])
+		printf(" VERSION=\"%s\"", pr->version);
+
+	if (mp) {
+		printf(" MOUNT=\"%s\"", mp);
+		free(mp);
+	}
+
+	printf(" TYPE=\"%s\"\n", pr->id->name);
+
+	return 0;
+}
+
 static void mkdir_p(char *dir)
 {
 	char *l = strrchr(dir, '/');
@@ -690,6 +770,7 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug)
 {
 	struct mount *m;
 	char *device;
+	char *mp;
 
 	if (!pr)
 		return -1;
@@ -709,8 +790,10 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug)
 	if (hotplug && !auto_mount)
 		return -1;
 
-	if (find_mount_point(pr->dev)) {
-		ULOG_ERR("%s is already mounted\n", pr->dev);
+	mp = find_mount_point(pr->dev);
+	if (mp) {
+		ULOG_ERR("%s is already mounted on %s\n", pr->dev, mp);
+		free(mp);
 		return -1;
 	}
 
@@ -743,7 +826,7 @@ static int mount_device(struct blkid_struct_probe *pr, int hotplug)
 	}
 
 	if (anon_mount) {
-		char target[] = "/mnt/mmcblk123";
+		char target[32];
 		int err = 0;
 
 		snprintf(target, sizeof(target), "/mnt/%s", device);
@@ -793,6 +876,7 @@ static int umount_device(struct blkid_struct_probe *pr)
 		ULOG_INFO("unmounted %s (%s)\n",
 		          pr->dev, mp);
 
+	free(mp);
 	return err;
 }
 
@@ -818,6 +902,7 @@ static int main_hotplug(int argc, char **argv)
 			ULOG_ERR("umount of %s failed (%d) - %s\n",
 			         mount_point, err, strerror(err));
 
+		free(mount_point);
 		return 0;
 	} else if (strcmp(action, "add")) {
 		ULOG_ERR("Unkown action %s\n", action);
@@ -1032,7 +1117,7 @@ static int check_extroot(char *path)
 				         tag, errno, strerror(errno));
 			fclose(fp);
 
-			if (*uuid || !strcasecmp(uuid, pr->uuid))
+			if (*uuid && !strcasecmp(uuid, pr->uuid))
 				return 0;
 
 			ULOG_ERR("extroot: UUID mismatch (root: %s, %s: %s)\n",
@@ -1267,7 +1352,7 @@ static int main_info(int argc, char **argv)
 			ULOG_ERR("failed to stat %s\n", argv[i]);
 			continue;
 		}
-		if (!S_ISBLK(s.st_mode)) {
+		if (!S_ISBLK(s.st_mode) && !(S_ISCHR(s.st_mode) && major(s.st_rdev) == 250)) {
 			ULOG_ERR("%s is not a block device\n", argv[i]);
 			continue;
 		}