From: olivier.hardouin@gmail.com <olivier.hardouin@gmail.com>
Date: Wed, 22 Jun 2016 07:51:19 +0000 (+0200)
Subject: support for disk without partition table
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=582d4d41f1e4ccd327143a3f2f89b5124d3cd8ba;p=oweals%2Fmountd.git

support for disk without partition table

if no partition found, try to mount the block device itself

Signed-off-by: Olivier Hardouin <olivier.hardouin@gmail.com>
---

diff --git a/mount.c b/mount.c
index 0c2862a..7cbb8ff 100644
--- a/mount.c
+++ b/mount.c
@@ -693,13 +693,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]);
 		}