X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Fvol_id.c;h=2b53085c72a6bdc31a624e8698af5b8664d09879;hp=a4a866cfcf6d040e952fd6c0bc6ab8d77ba6fe09;hb=2d8af104e0262554be2bf2cbbaa752bee6f1a65a;hpb=b0f57eb066cd897dab536ee37daab4239d136d4c

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index a4a866cfc..2b53085c7 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -60,31 +60,34 @@ void log_message(int priority, const char *format, ...)
 }
 #endif
 
-static void set_str(char *to, const unsigned char *from, int count)
+static void set_str(char *to, const char *from, size_t count)
 {
-	int i, j;
-	int len;
+	size_t i, j, len;
 
+	/* strip trailing whitespace */
 	len = strnlen(from, count);
-	while (isspace(from[len-1]))
+	while (len && isspace(from[len-1]))
 		len--;
 
+	/* strip leading whitespace */
 	i = 0;
 	while (isspace(from[i]) && (i < len))
 		i++;
 
 	j = 0;
 	while (i < len) {
-		switch(from[i]) {
-		case '/':
-			break;
-		case ' ':
+		/* substitute multiple whitespace */
+		if (isspace(from[i])) {
+			while (isspace(from[i]))
+				i++;
 			to[j++] = '_';
-			break;
-		default:
-			to[j++] = from[i];
 		}
-		i++;
+		/* skip chars */
+		if (from[i] == '/') {
+			i++;
+			continue;
+		}
+		to[j++] = from[i++];
 	}
 	to[j] = '\0';
 }
@@ -106,7 +109,7 @@ int main(int argc, char *argv[])
 	struct volume_id *vid = NULL;
 	static char name[VOLUME_ID_LABEL_SIZE];
 	int i;
-	unsigned long long size;
+	uint64_t size;
 	const char *node = NULL;
 	int rc = 0;
 
@@ -142,6 +145,7 @@ int main(int argc, char *argv[])
 
 	if (ioctl(vid->fd, BLKGETSIZE64, &size) != 0)
 		size = 0;
+	dbg("BLKGETSIZE64=%llu", size);
 
 	if (volume_id_probe_all(vid, 0, size) == 0)
 		goto print;
@@ -153,6 +157,7 @@ int main(int argc, char *argv[])
 
 print:
 	set_str(name, vid->label, sizeof(vid->label));
+	replace_untrusted_chars(name);
 
 	switch (print) {
 	case PRINT_EXPORT: