X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmountd.git;a=blobdiff_plain;f=mount.c;h=646cc30fedc506b965c693fea64566fa7d128b8f;hp=1b3e8f420f32d68439292ae5afc8dc93e8c5941e;hb=1af9ca2c14f6c65f23244ff7562e069c51326dd8;hpb=827e9eb7ea68786c1b840402a4b2b64473263ae3;ds=sidebyside diff --git a/mount.c b/mount.c index 1b3e8f4..646cc30 100644 --- a/mount.c +++ b/mount.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "include/log.h" #include "include/list.h" @@ -30,7 +31,7 @@ int mount_new(char *path, char *dev); -struct list_head mounts; +static struct list_head mounts; struct mount { struct list_head list; @@ -47,25 +48,27 @@ struct mount { int fs; }; -char *fs_names[] = { +static char *fs_names[] = { "", "", - "MBR", - "EXT2", - "EXT3", - "FAT", - "HFSPLUS", + "mbr", + "ext2", + "ext3", + "fat", + "hfsplus", "", - "NTFS", + "ntfs", "", - "EXT4" + "exfat", + "ext4", + "hfsplusjournal" }; #define MAX_MOUNTED 32 #define MAX_MOUNT_NAME 32 -char mounted[MAX_MOUNTED][3][MAX_MOUNT_NAME]; -int mounted_count = 0; +static char mounted[MAX_MOUNTED][3][MAX_MOUNT_NAME]; +static int mounted_count = 0; extern char uci_path[32]; static void mount_dump_uci_state(void) @@ -98,7 +101,7 @@ static void mount_dump_uci_state(void) ucix_add_option(ctx, mountd, q->serial, "rev", q->rev); snprintf(t, 64, "size%d", atoi(&q->dev[3])); ucix_add_option(ctx, mountd, q->serial, t, q->size); - if(q->fs > MBR && q->fs <= EXT4) + if(q->fs > MBR && q->fs <= LASTFS) { snprintf(t, 64, "fs%d", atoi(&q->dev[3])); ucix_add_option(ctx, mountd, q->serial, t, fs_names[q->fs]); @@ -136,8 +139,7 @@ static void mount_add_list(char *name, char *dev, char *serial, { struct mount *mount; char tmp[64], tmp2[64]; - if(fs <= MBR || fs > EXT4) - return; + mount = malloc(sizeof(struct mount)); INIT_LIST_HEAD(&mount->list); strncpy(mount->vendor, vendor, 64); @@ -152,13 +154,14 @@ static void mount_add_list(char *name, char *dev, char *serial, mount->mounted = 0; mount->fs = fs; list_add(&mount->list, &mounts); - if((!mount->ignore) && (mount->fs > MBR) && (mount->fs <= EXT4)) + if (!mount->ignore) { log_printf("new mount : %s -> %s (%s)\n", name, dev, fs_names[mount->fs]); snprintf(tmp, 64, "%s%s", uci_path, name); snprintf(tmp2, 64, "/tmp/run/mountd/%s", dev); symlink(tmp2, tmp); - mount_new("/tmp/run/mountd/", dev); + if (!mount_new("/tmp/run/mountd/", dev)) + system_printf("ACTION=add DEVICE=%s NAME=%s /sbin/hotplug-call mount", dev, name); } } @@ -170,10 +173,9 @@ static int mount_check_disc(char *disc) if(!fp) { log_printf("error reading /proc/mounts"); - fclose(fp); return avail; } - while((fgets(tmp, 256, fp) > 0) && (avail == -1)) + while((fgets(tmp, 256, fp) != NULL) && (avail == -1)) { char *t; char tmp2[32]; @@ -226,43 +228,74 @@ int mount_new(char *path, char *dev) pid = autofs_safe_fork(); if(!pid) { + char *options, *fstype; + if(mount->fs == EXFAT) + { + options = "rw,uid=1000,gid=1000"; + fstype = "exfat"; + } if(mount->fs == FAT) { - log_printf("mount -t vfat -o rw,uid=1000,gid=1000 /dev/%s %s", mount->dev, tmp); - ret = system_printf("mount -t vfat -o rw,uid=1000,gid=1000 /dev/%s %s", mount->dev, tmp); + options = "rw,uid=1000,gid=1000"; + fstype = "vfat"; } if(mount->fs == EXT4) { - log_printf("mount -t ext4 -o rw,defaults /dev/%s %s", mount->dev, tmp); - ret = system_printf("mount -t ext4 -o rw,defaults /dev/%s %s", mount->dev, tmp); + options = "rw,defaults"; + fstype = "ext4"; } if(mount->fs == EXT3) { - log_printf("mount -t ext3 -o rw,defaults /dev/%s %s", mount->dev, tmp); - ret = system_printf("mount -t ext3 -o rw,defaults /dev/%s %s", mount->dev, tmp); + options = "rw,defaults"; + fstype = "ext3"; } if(mount->fs == EXT2) { - log_printf("mount -t ext2 -o rw,defaults /dev/%s %s", mount->dev, tmp); - ret = system_printf("mount -t ext2 -o rw,defaults /dev/%s %s", mount->dev, tmp); + options = "rw,defaults"; + fstype = "ext2"; } if(mount->fs == HFSPLUS) { - log_printf("mount -t hfsplus -o rw,defaults,uid=1000,gid=1000 /dev/%s %s", mount->dev, tmp); - ret = system_printf("mount -t hfsplus -o rw,defaults,uid=1000,gid=1000 /dev/%s %s", mount->dev, tmp); + options = "rw,defaults,uid=1000,gid=1000"; + fstype = "hfsplus"; + } + if(mount->fs == HFSPLUSJOURNAL) + { + options = "ro,defaults,uid=1000,gid=1000"; + fstype = "hfsplus"; } if(mount->fs == NTFS) { - log_printf("ntfs-3g /dev/%s %s -o force", mount->dev, tmp); - ret = system_printf("ntfs-3g /dev/%s %s -o force", mount->dev, tmp); + options = "force"; + fstype = "ntfs-3g"; + } + if(mount->fs > MBR && mount->fs <= LASTFS) + { + struct uci_context *ctx; + char *uci_options, *uci_fstype; + ctx = ucix_init("mountd"); + if(fs_names[mount->fs]) + { + uci_options = ucix_get_option(ctx, "mountd", fs_names[mount->fs], "options"); + uci_fstype = ucix_get_option(ctx, "mountd", fs_names[mount->fs], "fstype"); + if(uci_options) + options = uci_options; + if(uci_fstype) + fstype = uci_fstype; + log_printf("mount -t %s -o %s /dev/%s %s", fstype, options, mount->dev, tmp); + ret = system_printf("mount -t %s -o %s /dev/%s %s", fstype, options, mount->dev, tmp); + } + ucix_cleanup(ctx); } exit(WEXITSTATUS(ret)); } pid = waitpid(pid, &ret, 0); ret = WEXITSTATUS(ret); log_printf("----------> mount ret = %d\n", ret); - if(ret && (ret != 0xff)) + if (ret && ret != 0xff) { + rmdir(tmp); return -1; + } if(mount_wait_for_disc(mount->dev) == 0) { mount->mounted = 1; @@ -310,6 +343,7 @@ static char* mount_get_serial(char *dev) static struct hd_driveid hd; int i; static char *serial; + static char disc_id[13]; snprintf(tmp, 64, "/dev/%s", dev); disc = open(tmp, O_RDONLY); if(!disc) @@ -355,7 +389,7 @@ static char* mount_get_serial(char *dev) fp = fopen(tmp2, "r"); if(fp) { - while(fgets(tmp2, 64, fp) > 0) + while(fgets(tmp2, 64, fp) != NULL) { serial = strstr(tmp2, "Serial Number:"); if(serial) @@ -384,7 +418,6 @@ static char* mount_get_serial(char *dev) unsigned int *u = (unsigned int*) uniq; int l = strlen(serial); int i; - static char disc_id[13]; memset(disc_id, 0, 13); memset(uniq, 0, 6); for(i = 0; i < l; i++) @@ -395,7 +428,8 @@ static char* mount_get_serial(char *dev) //log_printf("Serial number - %s %s\n", serial, disc_id); return disc_id; } - return 0; + sprintf(disc_id, "000000000000"); + return disc_id; } static void mount_dev_add(char *dev) @@ -417,17 +451,29 @@ static void mount_dev_add(char *dev) char size[64]; char sector_size[64]; FILE *fp; + int offset = 3; + int fs; + strcpy(name, dev); - name[3] = '\0'; + if (!strncmp(name, "mmcblk", 6)) + offset = 7; + name[offset] = '\0'; s = mount_get_serial(name); - if(!s) + if(!s) { return; - snprintf(tmp, 64, "part%s", &dev[3]); - snprintf(node, 64, "Disc-%s", &dev[2]); - if(node[5] >= 'a' && node[5] <= 'z') + } + if (!strncmp(name, "mmcblk", 6)) { + snprintf(tmp, 64, "part%s", &dev[8]); + snprintf(node, 64, "SD-P%s", &dev[8]); + + } else { + snprintf(tmp, 64, "part%s", &dev[3]); + snprintf(node, 64, "USB-%s", &dev[2]); + } + if(node[4] >= 'a' && node[4] <= 'z') { - node[5] -= 'a'; - node[5] += 'A'; + node[4] -= 'a'; + node[4] += 'A'; } ctx = ucix_init("mountd"); p = ucix_get_option(ctx, "mountd", s, tmp); @@ -512,28 +558,28 @@ static void mount_dev_add(char *dev) fclose(fp); } snprintf(tmp, 64, "/dev/%s", dev); - mount_add_list(node, dev, s, vendor, model, rev, ignore, size, sector_size, detect_fs(tmp)); + fs = detect_fs(tmp); + if (fs <= MBR || fs > LASTFS) { + ignore = 1; + } + mount_add_list(node, dev, s, vendor, model, rev, ignore, size, sector_size, fs); mount_dump_uci_state(); } } -static void mount_dev_del(char *dev) +static void mount_dev_del(struct mount *mount) { - struct mount *mount = mount_find(0, dev); char tmp[256]; - if(mount) - { - if(mount->mounted) - { - snprintf(tmp, 256, "%s%s", "/tmp/run/mountd/", mount->name); - log_printf("%s has dissappeared ... unmounting\n", tmp); - snprintf(tmp, 256, "%s%s", "/tmp/run/mountd/", mount->dev); - system_printf("/bin/umount %s", tmp); - rmdir(tmp); - snprintf(tmp, 64, "%s%s", uci_path, mount->name); - unlink(tmp); - mount_dump_uci_state(); - } + + if (mount->mounted) { + snprintf(tmp, 256, "%s%s", "/tmp/run/mountd/", mount->name); + log_printf("%s has dissappeared ... unmounting\n", tmp); + snprintf(tmp, 256, "%s%s", "/tmp/run/mountd/", mount->dev); + system_printf("/bin/umount %s", tmp); + rmdir(tmp); + snprintf(tmp, 64, "%s%s", uci_path, mount->name); + unlink(tmp); + mount_dump_uci_state(); } } @@ -562,7 +608,7 @@ char* is_mounted(char *block, char *path) return 0; } -static void mount_check_mount_list(void) +static void mount_update_mount_list(void) { FILE *fp = fopen("/proc/mounts", "r"); char tmp[256]; @@ -570,13 +616,18 @@ static void mount_check_mount_list(void) if(!fp) { log_printf("error reading /proc/mounts"); - fclose(fp); return; } mounted_count = 0; - while(fgets(tmp, 256, fp) > 0) + while(fgets(tmp, 256, fp) != NULL) { char *t, *t2; + + if (mounted_count + 1 > MAX_MOUNTED) { + log_printf("found more than %d mounts \n", MAX_MOUNTED); + break; + } + t = strstr(tmp, " "); if(t) { @@ -602,10 +653,8 @@ static void mount_check_mount_list(void) mounted[mounted_count][0], mounted[mounted_count][1], mounted[mounted_count][2]);*/ - if(mounted_count < MAX_MOUNTED - 1) - mounted_count++; - else - log_printf("found more than %d mounts \n", MAX_MOUNTED); + + mounted_count++; } fclose(fp); } @@ -613,13 +662,13 @@ static void mount_check_mount_list(void) /* FIXME: we need more intelligence here */ static int dir_filter2(const struct dirent *a) { - if(/*strcmp(a->d_name, "sda") &&*/(!strncmp(a->d_name, "sd", 2))) + if(!strncmp(a->d_name, "mmcblk", 6) || !strncmp(a->d_name, "sd", 2)) return 1; return 0; } #define MAX_BLOCK 64 -char block[MAX_BLOCK][MAX_BLOCK]; -int blk_cnt = 0; +static char block[MAX_BLOCK][MAX_BLOCK]; +static int blk_cnt = 0; static int check_block(char *b) { @@ -648,13 +697,19 @@ static void mount_enum_drives(void) char tmp[64]; snprintf(tmp, 64, "/sys/block/%s/", namelist[n]->d_name); m = scandir(tmp, &namelist2, dir_filter2, dir_sort); - while(m--) + if(m > 0) { - strncpy(&block[blk_cnt][0], namelist2[m]->d_name, MAX_BLOCK); + while(m--) + { + strncpy(&block[blk_cnt][0], namelist2[m]->d_name, MAX_BLOCK); + blk_cnt++; + free(namelist2[m]); + } + free(namelist2); + } else { + strncpy(&block[blk_cnt][0], namelist[n]->d_name, MAX_BLOCK); blk_cnt++; - free(namelist2[m]); } - free(namelist2); } free(namelist[n]); } @@ -689,14 +744,18 @@ static void mount_enum_drives(void) } if(!check_block(q->dev)||del) { - mount_dev_del(q->dev); + mount_dev_del(q); p->prev->next = p->next; p->next->prev = p->prev; p = p->next; log_printf("removing %s\n", q->dev); - snprintf(tmp, 64, "%s%s", uci_path, q->name); - unlink(tmp); - system_printf("/etc/mountd/event remove %s %s", q->dev, q->name); + if (q->mounted) { + snprintf(tmp, 64, "%s%s", "/tmp/run/mountd/", q->dev); + rmdir(tmp); + snprintf(tmp, 64, "%s%s", uci_path, q->name); + unlink(tmp); + system_printf("ACTION=remove DEVICE=%s NAME=%s /sbin/hotplug-call mount", q->dev, q->name); + } free(q); mount_dump_uci_state(); system_printf("/etc/fonstated/ReloadSamba"); @@ -716,7 +775,7 @@ static void mount_check_enum(void) void mount_init(void) { INIT_LIST_HEAD(&mounts); - timer_add(mount_check_mount_list, 2); + timer_add(mount_update_mount_list, 2); timer_add(mount_check_enum, 1); - mount_check_mount_list(); + mount_update_mount_list(); }