#include <grp.h>
#include <getopt.h>
#include <fcntl.h>
+#include <sys/stat.h>
#include <inttypes.h>
#include <sys/ioctl.h>
return;
}
-static void set_str(char *to, const char *from, size_t count)
-{
- size_t i, j, len;
-
- /* strip trailing whitespace */
- len = strnlen(from, count);
- while (len && isspace(from[len-1]))
- len--;
-
- /* strip leading whitespace */
- i = 0;
- while (isspace(from[i]) && (i < len))
- i++;
-
- j = 0;
- while (i < len) {
- /* substitute multiple whitespace */
- if (isspace(from[i])) {
- while (isspace(from[i]))
- i++;
- to[j++] = '_';
- }
- /* skip chars */
- if (from[i] == '/') {
- i++;
- continue;
- }
- to[j++] = from[i++];
- }
- to[j] = '\0';
-}
-
static int all_probers(volume_id_probe_fn_t probe_fn,
struct volume_id *id, uint64_t off, uint64_t size,
void *data)
char label_enc[256];
char uuid_safe[256];
char uuid_enc[256];
+ char uuid_sub_enc[256];
char type_enc[256];
char type_version_enc[256];
uint64_t size = 0;
uint64_t offset = 0;
const char *node;
int fd;
- const char *label, *uuid, *type, *type_version, *usage;
+ const char *label, *uuid, *uuid_sub, *type, *type_version, *usage;
int retval;
int rc = 0;
}
if (size == 0) {
- if (ioctl(fd, BLKGETSIZE64, &size) != 0)
- size = 0;
- info(udev_ctx, "BLKGETSIZE64=%" PRIu64 " (%" PRIu64 "GB)\n", size, size >> 30);
+ if (ioctl(fd, BLKGETSIZE64, &size) == 0) {
+ info(udev_ctx, "BLKGETSIZE64=%" PRIu64 " (%" PRIu64 "GB)\n", size, size >> 30);
+ } else {
+ struct stat statbuf;
+
+ if (fstat(fd, &statbuf) == 0 && S_ISREG(statbuf.st_mode))
+ size = statbuf.st_size;
+ else
+ size = 0;
+ info(udev_ctx, "stat=%" PRIu64 " (%" PRIu64 "GB)\n", size, size >> 30);
+ }
}
/* try to drop all privileges before reading disk content */
else
retval = volume_id_probe_all(vid, offset, size);
if (retval != 0) {
- fprintf(stderr, "%s: unknown volume type\n", node);
+ fprintf(stderr, "unknown or non-unique volume type "
+ "(--probe-all lists possibly conflicting types)\n");
rc = 4;
goto exit;
}
!volume_id_get_usage(vid, &usage) ||
!volume_id_get_type(vid, &type) ||
!volume_id_get_type_version(vid, &type_version) ||
- !volume_id_get_uuid(vid, &uuid)) {
+ !volume_id_get_uuid(vid, &uuid) ||
+ !volume_id_get_uuid_sub(vid, &uuid_sub)) {
rc = 4;
goto exit;
}
- set_str(label_safe, label, sizeof(label_safe));
- util_replace_chars(label_safe, ALLOWED_CHARS_INPUT);
+ udev_util_replace_whitespace(label, label_safe, sizeof(label_safe));
+ udev_util_replace_chars(label_safe, UDEV_ALLOWED_CHARS_INPUT);
volume_id_encode_string(label, label_enc, sizeof(label_enc));
- set_str(uuid_safe, uuid, sizeof(uuid_safe));
- util_replace_chars(uuid_safe, ALLOWED_CHARS_INPUT);
+ udev_util_replace_whitespace(uuid, uuid_safe, sizeof(uuid_safe));
+ udev_util_replace_chars(uuid_safe, UDEV_ALLOWED_CHARS_INPUT);
volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc));
+ volume_id_encode_string(uuid_sub, uuid_sub_enc, sizeof(uuid_sub_enc));
+
volume_id_encode_string(type, type_enc, sizeof(type_enc));
volume_id_encode_string(type_version, type_version_enc, sizeof(type_version_enc));
printf("ID_FS_VERSION=%s\n", type_version_enc);
printf("ID_FS_UUID=%s\n", uuid_safe);
printf("ID_FS_UUID_ENC=%s\n", uuid_enc);
+ if (uuid_sub_enc[0] != '\0')
+ printf("ID_FS_UUID_SUB_ENC=%s\n", uuid_sub_enc);
printf("ID_FS_LABEL=%s\n", label_safe);
printf("ID_FS_LABEL_ENC=%s\n", label_enc);
break;