X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmountd.git;a=blobdiff_plain;f=mount.c;h=f2c15a0a16a9d4c99f1bc5a601fe32f4566b5783;hp=f196791b821f9edfcadf6cac5a2d162f0f99c696;hb=76766aef149ac5b9562ab9bcca33830f80beab9d;hpb=bf7cc330196d76786a25da3a67b9c1e94b1126ea

diff --git a/mount.c b/mount.c
index f196791..f2c15a0 100644
--- a/mount.c
+++ b/mount.c
@@ -152,7 +152,7 @@ static void mount_add_list(char *name, char *dev, char *serial,
 	char *vendor, char *model, char *rev, int ignore, char *size, char *sector_size, int fs)
 {
 	struct mount *mount;
-	char tmp[64], tmp2[64];
+	char dev_path[64], dev_link[64];
 
 	mount  = malloc(sizeof(struct mount));
 	INIT_LIST_HEAD(&mount->list);
@@ -172,9 +172,9 @@ static void mount_add_list(char *name, char *dev, char *serial,
 		mount->status = STATUS_IGNORE;
 	} else {
 		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);
+		snprintf(dev_link, sizeof(dev_link), "%s%s", uci_path, name);
+		snprintf(dev_path, sizeof(dev_path), "%s%s", "/tmp/run/mountd/", dev);
+		symlink(dev_path, dev_link);
 		if (!mount_new("/tmp/run/mountd/", dev))
 			system_printf("ACTION=add DEVICE=%s NAME=%s /sbin/hotplug-call mount", dev, name);
 	}
@@ -591,8 +591,6 @@ static void mount_dev_del(struct mount *mount)
 		log_printf("device %s has disappeared ... unmounting %s\n", mount->dev, tmp);
 		system_printf("/bin/umount %s", tmp);
 		rmdir(tmp);
-		snprintf(tmp, 64, "%s%s", uci_path, mount->name);
-		unlink(tmp);
 		mount_dump_uci_state();
 	}
 }
@@ -762,11 +760,9 @@ static void mount_enum_drives(void)
 			p->prev->next = p->next;
 			p->next->prev = p->prev;
 			p = p->next;
-			log_printf("removing %s\n", q->dev);
 			if (q->status == STATUS_MOUNTED || q->status == STATUS_EXPIRED) {
-				snprintf(tmp, 64, "%s%s", "/tmp/run/mountd/", q->dev);
-				rmdir(tmp);
 				snprintf(tmp, 64, "%s%s", uci_path, q->name);
+				log_printf("unlinking %s\n", tmp);
 				unlink(tmp);
 				system_printf("ACTION=remove DEVICE=%s NAME=%s /sbin/hotplug-call mount", q->dev, q->name);
 			}