X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffstools.git;a=blobdiff_plain;f=block.c;h=33264583c23b91ef32747c5e50c0c7b4fb624283;hp=4d823e6bec562685c4b8770fab694f94271aa9dc;hb=415bb93aac1b3b658d6957e7114ed3835ae3724d;hpb=5b61e27d36e5bbf40825a4ae14920efe47d36f02

diff --git a/block.c b/block.c
index 4d823e6..3326458 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));
 
@@ -577,25 +587,83 @@ 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;
+	unsigned int minor, major;
 
-	if(!fp)
+	if (!fp)
+		return NULL;
+
+	if (stat(block, &s))
 		return NULL;
 
 	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 (!S_ISBLK(s.st_mode))
+			continue;
+
+		if (major == major(s.st_rdev) &&
+		    minor == minor(s.st_rdev)) {
+			point = strdup(cpoint);
 			break;
 		}
 	}
@@ -690,6 +758,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 +778,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 +814,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 +864,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 +890,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);
@@ -1267,7 +1340,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;
 		}