#include <sys/ioctl.h>
#include "../../libsysfs/sysfs/libsysfs.h"
-#include "../../udev_lib.h"
+#include "../../udev_utils.h"
#include "../../logging.h"
-#include "volume_id.h"
-#include "dasdlabel.h"
+#include "volume_id/volume_id.h"
+#include "volume_id/dasd/dasd.h"
#define BLKGETSIZE64 _IOR(0x12,114,size_t)
#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
void log_message(int level, const char *format, ...)
{
va_list args;
return vid;
}
-static char *usage_id_name(enum volume_id_usage usage)
-{
- switch(usage) {
- case VOLUME_ID_UNUSED:
- return "unused";
- case VOLUME_ID_UNPROBED:
- return "unprobed";
- case VOLUME_ID_OTHER:
- return "other";
- case VOLUME_ID_PARTITIONTABLE:
- return "partitiontable";
- case VOLUME_ID_FILESYSTEM:
- return "filesystem";
- case VOLUME_ID_RAID:
- return "raid";
- default:
- return "unknown type_id";
- }
-}
-
int main(int argc, char *argv[])
{
const char help[] = "usage: udev_volume_id [-t|-l|-u|-d]\n"
struct sysfs_class_device *class_dev_parent = NULL;
struct volume_id *vid = NULL;
char *devpath;
- char probe = 'p';
+ char probe_disk_label = 0;
char print = 'a';
- char dasd_label[7];
static char name[VOLUME_ID_LABEL_SIZE];
int len, i, j;
unsigned long long size;
print = 'u';
continue;
case 'd':
- probe = 'd';
+ probe_disk_label = 1;
continue;
case 'h':
case '?':
goto exit;
}
- switch(probe) {
- case 'p' :
- /* open block device */
+ if (probe_disk_label == 0) {
vid = open_classdev(class_dev);
if (vid == NULL)
goto exit;
if (ioctl(vid->fd, BLKGETSIZE64, &size) != 0)
size = 0;
- if (volume_id_probe(vid, VOLUME_ID_ALL, 0, size) == 0)
+ if (volume_id_probe_all(vid, 0, size) == 0)
goto print;
- break;
- case 'd' :
+ } else {
/* if we are on a partition, open main block device instead */
class_dev_parent = sysfs_get_classdev_parent(class_dev);
if (class_dev_parent != NULL)
vid = open_classdev(class_dev_parent);
else
- vid = open_classdev(class_dev_parent);
+ vid = open_classdev(class_dev);
if (vid == NULL)
goto exit;
- if (probe_ibm_partition(vid->fd, dasd_label) == 0) {
- vid->type = "dasd";
- strncpy(vid->label, dasd_label, 6);
- vid->label[6] = '\0';
+ if (volume_id_probe_dasd(vid) == 0)
goto print;
- }
- break;
}
printf("unknown volume type\n");
printf("%s\n", vid->type);
break;
case 'l':
- if (name[0] == '\0' || vid->usage_id != VOLUME_ID_FILESYSTEM) {
+ if (name[0] == '\0' ||
+ (vid->usage_id != VOLUME_ID_FILESYSTEM && vid->usage_id != VOLUME_ID_DISKLABEL)) {
rc = 2;
goto exit;
}
printf("%s\n", vid->uuid);
break;
case 'a':
- printf("F:%s\n", usage_id_name(vid->usage_id));
+ printf("F:%s\n", vid->usage);
printf("T:%s\n", vid->type);
printf("V:%s\n", vid->type_version);
printf("L:%s\n", vid->label);