static char* find_mount_point(char *block)
{
FILE *fp = fopen("/proc/mounts", "r");
- static char line[256];
+ static char line[256], *saveptr;
int len = strlen(block);
char *point = NULL;
+ struct stat s;
if(!fp)
return NULL;
fclose(fp);
+ if (point)
+ return point;
+
+ if (stat(block, &s))
+ return NULL;
+
+ if (!S_ISBLK(s.st_mode))
+ return NULL;
+
+ fp = fopen("/proc/self/mountinfo", "r");
+ if(!fp)
+ return NULL;
+
+ while (fgets(line, sizeof(line), fp)) {
+ strtok_r(line, " \t", &saveptr);
+ strtok_r(NULL, " \t", &saveptr);
+ if (atoi(strtok_r(NULL, ":", &saveptr)) == major(s.st_rdev) &&
+ atoi(strtok_r(NULL, " \t", &saveptr)) == minor(s.st_rdev)) {
+ strtok_r(NULL, " \t", &saveptr);
+ point = strtok_r(NULL, " \t", &saveptr);
+ break;
+ }
+ }
+
+ fclose(fp);
+
return point;
}
}
if (anon_mount) {
- char target[] = "/mnt/mmcblk123";
+ char target[32];
int err = 0;
snprintf(target, sizeof(target), "/mnt/%s", device);
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;
}