#include "../../udev_utils.h"
#include "../../logging.h"
-#include "volume_id/volume_id.h"
+#include "libvolume_id/volume_id.h"
#define BLKGETSIZE64 _IOR(0x12,114,size_t)
/* strip trailing whitespace */
len = strnlen(from, count);
- while (isspace(from[len-1]))
+ while (len && isspace(from[len-1]))
len--;
/* strip leading whitespace */
if (ioctl(vid->fd, BLKGETSIZE64, &size) != 0)
size = 0;
+ dbg("BLKGETSIZE64=%llu", size);
if (volume_id_probe_all(vid, 0, size) == 0)
goto print;
print:
set_str(name, vid->label, sizeof(vid->label));
+ replace_untrusted_chars(name);
switch (print) {
case PRINT_EXPORT: