tabs are as useful as a hole in the head

28 files changed, 4830 insertions, 4833 deletions

diff --git a/src/extras/accelerometer/accelerometer.c b/src/extras/accelerometer/accelerometer.c
index 59c2a4ece3..bc9715b264 100644
--- a/src/extras/accelerometer/accelerometer.c
+++ b/src/extras/accelerometer/accelerometer.c
@@ -71,32 +71,32 @@
 static int debug = 0;
 
 static void log_fn(struct udev *udev, int priority,
-		   const char *file, int line, const char *fn,
-		   const char *format, va_list args)
+                   const char *file, int line, const char *fn,
+                   const char *format, va_list args)
 {
-	if (debug) {
-		fprintf(stderr, "%s: ", fn);
-		vfprintf(stderr, format, args);
-	} else {
-		vsyslog(priority, format, args);
-	}
+        if (debug) {
+                fprintf(stderr, "%s: ", fn);
+                vfprintf(stderr, format, args);
+        } else {
+                vsyslog(priority, format, args);
+        }
 }
 
 typedef enum {
-	ORIENTATION_UNDEFINED,
-	ORIENTATION_NORMAL,
-	ORIENTATION_BOTTOM_UP,
-	ORIENTATION_LEFT_UP,
-	ORIENTATION_RIGHT_UP
+        ORIENTATION_UNDEFINED,
+        ORIENTATION_NORMAL,
+        ORIENTATION_BOTTOM_UP,
+        ORIENTATION_LEFT_UP,
+        ORIENTATION_RIGHT_UP
 } OrientationUp;
 
 static const char *orientations[] = {
-	"undefined",
-	"normal",
-	"bottom-up",
-	"left-up",
-	"right-up",
-	NULL
+        "undefined",
+        "normal",
+        "bottom-up",
+        "left-up",
+        "right-up",
+        NULL
 };
 
 #define ORIENTATION_UP_UP ORIENTATION_NORMAL
@@ -111,247 +111,247 @@ static const char *orientations[] = {
 static const char *
 orientation_to_string (OrientationUp o)
 {
-	return orientations[o];
+        return orientations[o];
 }
 
 static OrientationUp
 string_to_orientation (const char *orientation)
 {
-	int i;
-
-	if (orientation == NULL)
-		return ORIENTATION_UNDEFINED;
-	for (i = 0; orientations[i] != NULL; i++) {
-		if (strcmp (orientation, orientations[i]) == 0)
-			return i;
-	}
-	return ORIENTATION_UNDEFINED;
+        int i;
+
+        if (orientation == NULL)
+                return ORIENTATION_UNDEFINED;
+        for (i = 0; orientations[i] != NULL; i++) {
+                if (strcmp (orientation, orientations[i]) == 0)
+                        return i;
+        }
+        return ORIENTATION_UNDEFINED;
 }
 
 static OrientationUp
 orientation_calc (OrientationUp prev,
-		  int x, int y, int z)
+                  int x, int y, int z)
 {
-	int rotation;
-	OrientationUp ret = prev;
-
-	/* Portrait check */
-	rotation = round(atan((double) x / sqrt(y * y + z * z)) * RADIANS_TO_DEGREES);
-
-	if (abs(rotation) > THRESHOLD_PORTRAIT) {
-		ret = (rotation < 0) ? ORIENTATION_LEFT_UP : ORIENTATION_RIGHT_UP;
-
-		/* Some threshold to switching between portrait modes */
-		if (prev == ORIENTATION_LEFT_UP || prev == ORIENTATION_RIGHT_UP) {
-			if (abs(rotation) < SAME_AXIS_LIMIT) {
-				ret = prev;
-			}
-		}
-
-	} else {
-		/* Landscape check */
-		rotation = round(atan((double) y / sqrt(x * x + z * z)) * RADIANS_TO_DEGREES);
-
-		if (abs(rotation) > THRESHOLD_LANDSCAPE) {
-			ret = (rotation < 0) ? ORIENTATION_BOTTOM_UP : ORIENTATION_NORMAL;
-
-			/* Some threshold to switching between landscape modes */
-			if (prev == ORIENTATION_BOTTOM_UP || prev == ORIENTATION_NORMAL) {
-				if (abs(rotation) < SAME_AXIS_LIMIT) {
-					ret = prev;
-				}
-			}
-		}
-	}
-
-	return ret;
+        int rotation;
+        OrientationUp ret = prev;
+
+        /* Portrait check */
+        rotation = round(atan((double) x / sqrt(y * y + z * z)) * RADIANS_TO_DEGREES);
+
+        if (abs(rotation) > THRESHOLD_PORTRAIT) {
+                ret = (rotation < 0) ? ORIENTATION_LEFT_UP : ORIENTATION_RIGHT_UP;
+
+                /* Some threshold to switching between portrait modes */
+                if (prev == ORIENTATION_LEFT_UP || prev == ORIENTATION_RIGHT_UP) {
+                        if (abs(rotation) < SAME_AXIS_LIMIT) {
+                                ret = prev;
+                        }
+                }
+
+        } else {
+                /* Landscape check */
+                rotation = round(atan((double) y / sqrt(x * x + z * z)) * RADIANS_TO_DEGREES);
+
+                if (abs(rotation) > THRESHOLD_LANDSCAPE) {
+                        ret = (rotation < 0) ? ORIENTATION_BOTTOM_UP : ORIENTATION_NORMAL;
+
+                        /* Some threshold to switching between landscape modes */
+                        if (prev == ORIENTATION_BOTTOM_UP || prev == ORIENTATION_NORMAL) {
+                                if (abs(rotation) < SAME_AXIS_LIMIT) {
+                                        ret = prev;
+                                }
+                        }
+                }
+        }
+
+        return ret;
 }
 
 static OrientationUp
 get_prev_orientation(struct udev_device *dev)
 {
-	const char *value;
+        const char *value;
 
-	value = udev_device_get_property_value(dev, "ID_INPUT_ACCELEROMETER_ORIENTATION");
-	if (value == NULL)
-		return ORIENTATION_UNDEFINED;
-	return string_to_orientation(value);
+        value = udev_device_get_property_value(dev, "ID_INPUT_ACCELEROMETER_ORIENTATION");
+        if (value == NULL)
+                return ORIENTATION_UNDEFINED;
+        return string_to_orientation(value);
 }
 
 #define SET_AXIS(axis, code_) if (ev[i].code == code_) { if (got_##axis == 0) { axis = ev[i].value; got_##axis = 1; } }
 
 /* accelerometers */
 static void test_orientation(struct udev *udev,
-			     struct udev_device *dev,
-			     const char *devpath)
+                             struct udev_device *dev,
+                             const char *devpath)
 {
-	OrientationUp old, new;
-	int fd, r;
-	struct input_event ev[64];
-	int got_syn = 0;
-	int got_x, got_y, got_z;
-	int x = 0, y = 0, z = 0;
-	char text[64];
-
-	old = get_prev_orientation(dev);
-
-	if ((fd = open(devpath, O_RDONLY)) < 0)
-		return;
-
-	got_x = got_y = got_z = 0;
-
-	while (1) {
-		int i;
-
-		r = read(fd, ev, sizeof(struct input_event) * 64);
-
-		if (r < (int) sizeof(struct input_event))
-			return;
-
-		for (i = 0; i < r / (int) sizeof(struct input_event); i++) {
-			if (got_syn == 1) {
-				if (ev[i].type == EV_ABS) {
-					SET_AXIS(x, ABS_X);
-					SET_AXIS(y, ABS_Y);
-					SET_AXIS(z, ABS_Z);
-				}
-			}
-			if (ev[i].type == EV_SYN && ev[i].code == SYN_REPORT) {
-				got_syn = 1;
-			}
-			if (got_x && got_y && got_z)
-				goto read_dev;
-		}
-	}
+        OrientationUp old, new;
+        int fd, r;
+        struct input_event ev[64];
+        int got_syn = 0;
+        int got_x, got_y, got_z;
+        int x = 0, y = 0, z = 0;
+        char text[64];
+
+        old = get_prev_orientation(dev);
+
+        if ((fd = open(devpath, O_RDONLY)) < 0)
+                return;
+
+        got_x = got_y = got_z = 0;
+
+        while (1) {
+                int i;
+
+                r = read(fd, ev, sizeof(struct input_event) * 64);
+
+                if (r < (int) sizeof(struct input_event))
+                        return;
+
+                for (i = 0; i < r / (int) sizeof(struct input_event); i++) {
+                        if (got_syn == 1) {
+                                if (ev[i].type == EV_ABS) {
+                                        SET_AXIS(x, ABS_X);
+                                        SET_AXIS(y, ABS_Y);
+                                        SET_AXIS(z, ABS_Z);
+                                }
+                        }
+                        if (ev[i].type == EV_SYN && ev[i].code == SYN_REPORT) {
+                                got_syn = 1;
+                        }
+                        if (got_x && got_y && got_z)
+                                goto read_dev;
+                }
+        }
 
 read_dev:
-	close(fd);
+        close(fd);
 
-	if (!got_x || !got_y || !got_z)
-		return;
+        if (!got_x || !got_y || !got_z)
+                return;
 
-	new = orientation_calc(old, x, y, z);
-	snprintf(text, sizeof(text), "ID_INPUT_ACCELEROMETER_ORIENTATION=%s", orientation_to_string(new));
-	puts(text);
+        new = orientation_calc(old, x, y, z);
+        snprintf(text, sizeof(text), "ID_INPUT_ACCELEROMETER_ORIENTATION=%s", orientation_to_string(new));
+        puts(text);
 }
 
 static void help(void)
 {
-	printf("Usage: accelerometer [options] <device path>\n"
-	       "  --debug         debug to stderr\n"
-	       "  --help          print this help text\n\n");
+        printf("Usage: accelerometer [options] <device path>\n"
+               "  --debug         debug to stderr\n"
+               "  --help          print this help text\n\n");
 }
 
 int main (int argc, char** argv)
 {
-	struct udev *udev;
-	struct udev_device *dev;
-
-	static const struct option options[] = {
-		{ "debug", no_argument, NULL, 'd' },
-		{ "help", no_argument, NULL, 'h' },
-		{}
-	};
-
-	char devpath[PATH_MAX];
-	char *devnode;
-	const char *id_path;
-	struct udev_enumerate *enumerate;
-	struct udev_list_entry *list_entry;
-
-	udev = udev_new();
-	if (udev == NULL)
-		return 1;
-
-	udev_log_init("input_id");
-	udev_set_log_fn(udev, log_fn);
-
-	/* CLI argument parsing */
-	while (1) {
-		int option;
-
-		option = getopt_long(argc, argv, "dxh", options, NULL);
-		if (option == -1)
-			break;
-
-		switch (option) {
-		case 'd':
-			debug = 1;
-			if (udev_get_log_priority(udev) < LOG_INFO)
-				udev_set_log_priority(udev, LOG_INFO);
-			break;
-		case 'h':
-			help();
-			exit(0);
-		default:
-			exit(1);
-		}
-	}
-
-	if (argv[optind] == NULL) {
-		help();
-		exit(1);
-	}
-
-	/* get the device */
-	snprintf(devpath, sizeof(devpath), "%s/%s", udev_get_sys_path(udev), argv[optind]);
-	dev = udev_device_new_from_syspath(udev, devpath);
-	if (dev == NULL) {
-		fprintf(stderr, "unable to access '%s'\n", devpath);
-		return 1;
-	}
-
-	id_path = udev_device_get_property_value(dev, "ID_PATH");
-	if (id_path == NULL) {
-		fprintf (stderr, "unable to get property ID_PATH for '%s'", devpath);
-		return 0;
-	}
-
-	/* Get the children devices and find the devnode
-	 * FIXME: use udev_enumerate_add_match_children() instead
-	 * when it's available */
-	devnode = NULL;
-	enumerate = udev_enumerate_new(udev);
-	udev_enumerate_add_match_property(enumerate, "ID_PATH", id_path);
-	udev_enumerate_add_match_subsystem(enumerate, "input");
-	udev_enumerate_scan_devices(enumerate);
-	udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(enumerate)) {
-		struct udev_device *device;
-		const char *node;
-
-		device = udev_device_new_from_syspath(udev_enumerate_get_udev(enumerate),
-						      udev_list_entry_get_name(list_entry));
-		if (device == NULL)
-			continue;
-		/* Already found it */
-		if (devnode != NULL) {
-			udev_device_unref(device);
-			continue;
-		}
-
-		node = udev_device_get_devnode(device);
-		if (node == NULL) {
-			udev_device_unref(device);
-			continue;
-		}
-		/* Use the event sub-device */
-		if (strstr(node, "/event") == NULL) {
-			udev_device_unref(device);
-			continue;
-		}
-
-		devnode = strdup(node);
-		udev_device_unref(device);
-	}
-
-	if (devnode == NULL) {
-		fprintf(stderr, "unable to get device node for '%s'\n", devpath);
-		return 0;
-	}
-
-	info(udev, "Opening accelerometer device %s\n", devnode);
-	test_orientation(udev, dev, devnode);
-	free(devnode);
-
-	return 0;
+        struct udev *udev;
+        struct udev_device *dev;
+
+        static const struct option options[] = {
+                { "debug", no_argument, NULL, 'd' },
+                { "help", no_argument, NULL, 'h' },
+                {}
+        };
+
+        char devpath[PATH_MAX];
+        char *devnode;
+        const char *id_path;
+        struct udev_enumerate *enumerate;
+        struct udev_list_entry *list_entry;
+
+        udev = udev_new();
+        if (udev == NULL)
+                return 1;
+
+        udev_log_init("input_id");
+        udev_set_log_fn(udev, log_fn);
+
+        /* CLI argument parsing */
+        while (1) {
+                int option;
+
+                option = getopt_long(argc, argv, "dxh", options, NULL);
+                if (option == -1)
+                        break;
+
+                switch (option) {
+                case 'd':
+                        debug = 1;
+                        if (udev_get_log_priority(udev) < LOG_INFO)
+                                udev_set_log_priority(udev, LOG_INFO);
+                        break;
+                case 'h':
+                        help();
+                        exit(0);
+                default:
+                        exit(1);
+                }
+        }
+
+        if (argv[optind] == NULL) {
+                help();
+                exit(1);
+        }
+
+        /* get the device */
+        snprintf(devpath, sizeof(devpath), "%s/%s", udev_get_sys_path(udev), argv[optind]);
+        dev = udev_device_new_from_syspath(udev, devpath);
+        if (dev == NULL) {
+                fprintf(stderr, "unable to access '%s'\n", devpath);
+                return 1;
+        }
+
+        id_path = udev_device_get_property_value(dev, "ID_PATH");
+        if (id_path == NULL) {
+                fprintf (stderr, "unable to get property ID_PATH for '%s'", devpath);
+                return 0;
+        }
+
+        /* Get the children devices and find the devnode
+         * FIXME: use udev_enumerate_add_match_children() instead
+         * when it's available */
+        devnode = NULL;
+        enumerate = udev_enumerate_new(udev);
+        udev_enumerate_add_match_property(enumerate, "ID_PATH", id_path);
+        udev_enumerate_add_match_subsystem(enumerate, "input");
+        udev_enumerate_scan_devices(enumerate);
+        udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(enumerate)) {
+                struct udev_device *device;
+                const char *node;
+
+                device = udev_device_new_from_syspath(udev_enumerate_get_udev(enumerate),
+                                                      udev_list_entry_get_name(list_entry));
+                if (device == NULL)
+                        continue;
+                /* Already found it */
+                if (devnode != NULL) {
+                        udev_device_unref(device);
+                        continue;
+                }
+
+                node = udev_device_get_devnode(device);
+                if (node == NULL) {
+                        udev_device_unref(device);
+                        continue;
+                }
+                /* Use the event sub-device */
+                if (strstr(node, "/event") == NULL) {
+                        udev_device_unref(device);
+                        continue;
+                }
+
+                devnode = strdup(node);
+                udev_device_unref(device);
+        }
+
+        if (devnode == NULL) {
+                fprintf(stderr, "unable to get device node for '%s'\n", devpath);
+                return 0;
+        }
+
+        info(udev, "Opening accelerometer device %s\n", devnode);
+        test_orientation(udev, dev, devnode);
+        free(devnode);
+
+        return 0;
 }
diff --git a/src/extras/ata_id/ata_id.c b/src/extras/ata_id/ata_id.c
index 64df86c23a..924d479c1d 100644
--- a/src/extras/ata_id/ata_id.c
+++ b/src/extras/ata_id/ata_id.c
@@ -48,241 +48,241 @@
 #define COMMAND_TIMEOUT_MSEC (30 * 1000)
 
 static int disk_scsi_inquiry_command(int      fd,
-				     void    *buf,
-				     size_t   buf_len)
+                                     void    *buf,
+                                     size_t   buf_len)
 {
-	struct sg_io_v4 io_v4;
-	uint8_t cdb[6];
-	uint8_t sense[32];
-	int ret;
-
-	/*
-	 * INQUIRY, see SPC-4 section 6.4
-	 */
-	memset(cdb, 0, sizeof(cdb));
-	cdb[0] = 0x12;			 /* OPERATION CODE: INQUIRY */
-	cdb[3] = (buf_len >> 8);	 /* ALLOCATION LENGTH */
-	cdb[4] = (buf_len & 0xff);
-
-	memset(sense, 0, sizeof(sense));
-
-	memset(&io_v4, 0, sizeof(struct sg_io_v4));
-	io_v4.guard = 'Q';
-	io_v4.protocol = BSG_PROTOCOL_SCSI;
-	io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
-	io_v4.request_len = sizeof (cdb);
-	io_v4.request = (uintptr_t) cdb;
-	io_v4.max_response_len = sizeof (sense);
-	io_v4.response = (uintptr_t) sense;
-	io_v4.din_xfer_len = buf_len;
-	io_v4.din_xferp = (uintptr_t) buf;
-	io_v4.timeout = COMMAND_TIMEOUT_MSEC;
-
-	ret = ioctl(fd, SG_IO, &io_v4);
-	if (ret != 0) {
-		/* could be that the driver doesn't do version 4, try version 3 */
-		if (errno == EINVAL) {
-			struct sg_io_hdr io_hdr;
-
-			memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
-			io_hdr.interface_id = 'S';
-			io_hdr.cmdp = (unsigned char*) cdb;
-			io_hdr.cmd_len = sizeof (cdb);
-			io_hdr.dxferp = buf;
-			io_hdr.dxfer_len = buf_len;
-			io_hdr.sbp = sense;
-			io_hdr.mx_sb_len = sizeof (sense);
-			io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
-			io_hdr.timeout = COMMAND_TIMEOUT_MSEC;
-
-			ret = ioctl(fd, SG_IO, &io_hdr);
-			if (ret != 0)
-				goto out;
-
-			/* even if the ioctl succeeds, we need to check the return value */
-			if (!(io_hdr.status == 0 &&
-			      io_hdr.host_status == 0 &&
-			      io_hdr.driver_status == 0)) {
-				errno = EIO;
-				ret = -1;
-				goto out;
-			}
-		} else {
-			goto out;
-		}
-	}
-
-	/* even if the ioctl succeeds, we need to check the return value */
-	if (!(io_v4.device_status == 0 &&
-	      io_v4.transport_status == 0 &&
-	      io_v4.driver_status == 0)) {
-		errno = EIO;
-		ret = -1;
-		goto out;
-	}
+        struct sg_io_v4 io_v4;
+        uint8_t cdb[6];
+        uint8_t sense[32];
+        int ret;
+
+        /*
+         * INQUIRY, see SPC-4 section 6.4
+         */
+        memset(cdb, 0, sizeof(cdb));
+        cdb[0] = 0x12;                         /* OPERATION CODE: INQUIRY */
+        cdb[3] = (buf_len >> 8);         /* ALLOCATION LENGTH */
+        cdb[4] = (buf_len & 0xff);
+
+        memset(sense, 0, sizeof(sense));
+
+        memset(&io_v4, 0, sizeof(struct sg_io_v4));
+        io_v4.guard = 'Q';
+        io_v4.protocol = BSG_PROTOCOL_SCSI;
+        io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
+        io_v4.request_len = sizeof (cdb);
+        io_v4.request = (uintptr_t) cdb;
+        io_v4.max_response_len = sizeof (sense);
+        io_v4.response = (uintptr_t) sense;
+        io_v4.din_xfer_len = buf_len;
+        io_v4.din_xferp = (uintptr_t) buf;
+        io_v4.timeout = COMMAND_TIMEOUT_MSEC;
+
+        ret = ioctl(fd, SG_IO, &io_v4);
+        if (ret != 0) {
+                /* could be that the driver doesn't do version 4, try version 3 */
+                if (errno == EINVAL) {
+                        struct sg_io_hdr io_hdr;
+
+                        memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
+                        io_hdr.interface_id = 'S';
+                        io_hdr.cmdp = (unsigned char*) cdb;
+                        io_hdr.cmd_len = sizeof (cdb);
+                        io_hdr.dxferp = buf;
+                        io_hdr.dxfer_len = buf_len;
+                        io_hdr.sbp = sense;
+                        io_hdr.mx_sb_len = sizeof (sense);
+                        io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
+                        io_hdr.timeout = COMMAND_TIMEOUT_MSEC;
+
+                        ret = ioctl(fd, SG_IO, &io_hdr);
+                        if (ret != 0)
+                                goto out;
+
+                        /* even if the ioctl succeeds, we need to check the return value */
+                        if (!(io_hdr.status == 0 &&
+                              io_hdr.host_status == 0 &&
+                              io_hdr.driver_status == 0)) {
+                                errno = EIO;
+                                ret = -1;
+                                goto out;
+                        }
+                } else {
+                        goto out;
+                }
+        }
+
+        /* even if the ioctl succeeds, we need to check the return value */
+        if (!(io_v4.device_status == 0 &&
+              io_v4.transport_status == 0 &&
+              io_v4.driver_status == 0)) {
+                errno = EIO;
+                ret = -1;
+                goto out;
+        }
 
  out:
-	return ret;
+        return ret;
 }
 
-static int disk_identify_command(int	  fd,
-				 void	 *buf,
-				 size_t	  buf_len)
+static int disk_identify_command(int          fd,
+                                 void         *buf,
+                                 size_t          buf_len)
 {
-	struct sg_io_v4 io_v4;
-	uint8_t cdb[12];
-	uint8_t sense[32];
-	uint8_t *desc = sense+8;
-	int ret;
-
-	/*
-	 * ATA Pass-Through 12 byte command, as described in
-	 *
-	 *  T10 04-262r8 ATA Command Pass-Through
-	 *
-	 * from http://www.t10.org/ftp/t10/document.04/04-262r8.pdf
-	 */
-	memset(cdb, 0, sizeof(cdb));
-	cdb[0] = 0xa1;			/* OPERATION CODE: 12 byte pass through */
-	cdb[1] = 4 << 1;		/* PROTOCOL: PIO Data-in */
-	cdb[2] = 0x2e;			/* OFF_LINE=0, CK_COND=1, T_DIR=1, BYT_BLOK=1, T_LENGTH=2 */
-	cdb[3] = 0;			/* FEATURES */
-	cdb[4] = 1;			/* SECTORS */
-	cdb[5] = 0;			/* LBA LOW */
-	cdb[6] = 0;			/* LBA MID */
-	cdb[7] = 0;			/* LBA HIGH */
-	cdb[8] = 0 & 0x4F;		/* SELECT */
-	cdb[9] = 0xEC;			/* Command: ATA IDENTIFY DEVICE */;
-	memset(sense, 0, sizeof(sense));
-
-	memset(&io_v4, 0, sizeof(struct sg_io_v4));
-	io_v4.guard = 'Q';
-	io_v4.protocol = BSG_PROTOCOL_SCSI;
-	io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
-	io_v4.request_len = sizeof (cdb);
-	io_v4.request = (uintptr_t) cdb;
-	io_v4.max_response_len = sizeof (sense);
-	io_v4.response = (uintptr_t) sense;
-	io_v4.din_xfer_len = buf_len;
-	io_v4.din_xferp = (uintptr_t) buf;
-	io_v4.timeout = COMMAND_TIMEOUT_MSEC;
-
-	ret = ioctl(fd, SG_IO, &io_v4);
-	if (ret != 0) {
-		/* could be that the driver doesn't do version 4, try version 3 */
-		if (errno == EINVAL) {
-			struct sg_io_hdr io_hdr;
-
-			memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
-			io_hdr.interface_id = 'S';
-			io_hdr.cmdp = (unsigned char*) cdb;
-			io_hdr.cmd_len = sizeof (cdb);
-			io_hdr.dxferp = buf;
-			io_hdr.dxfer_len = buf_len;
-			io_hdr.sbp = sense;
-			io_hdr.mx_sb_len = sizeof (sense);
-			io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
-			io_hdr.timeout = COMMAND_TIMEOUT_MSEC;
-
-			ret = ioctl(fd, SG_IO, &io_hdr);
-			if (ret != 0)
-				goto out;
-		} else {
-			goto out;
-		}
-	}
-
-	if (!(sense[0] == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c)) {
-		errno = EIO;
-		ret = -1;
-		goto out;
-	}
+        struct sg_io_v4 io_v4;
+        uint8_t cdb[12];
+        uint8_t sense[32];
+        uint8_t *desc = sense+8;
+        int ret;
+
+        /*
+         * ATA Pass-Through 12 byte command, as described in
+         *
+         *  T10 04-262r8 ATA Command Pass-Through
+         *
+         * from http://www.t10.org/ftp/t10/document.04/04-262r8.pdf
+         */
+        memset(cdb, 0, sizeof(cdb));
+        cdb[0] = 0xa1;                        /* OPERATION CODE: 12 byte pass through */
+        cdb[1] = 4 << 1;                /* PROTOCOL: PIO Data-in */
+        cdb[2] = 0x2e;                        /* OFF_LINE=0, CK_COND=1, T_DIR=1, BYT_BLOK=1, T_LENGTH=2 */
+        cdb[3] = 0;                        /* FEATURES */
+        cdb[4] = 1;                        /* SECTORS */
+        cdb[5] = 0;                        /* LBA LOW */
+        cdb[6] = 0;                        /* LBA MID */
+        cdb[7] = 0;                        /* LBA HIGH */
+        cdb[8] = 0 & 0x4F;                /* SELECT */
+        cdb[9] = 0xEC;                        /* Command: ATA IDENTIFY DEVICE */;
+        memset(sense, 0, sizeof(sense));
+
+        memset(&io_v4, 0, sizeof(struct sg_io_v4));
+        io_v4.guard = 'Q';
+        io_v4.protocol = BSG_PROTOCOL_SCSI;
+        io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
+        io_v4.request_len = sizeof (cdb);
+        io_v4.request = (uintptr_t) cdb;
+        io_v4.max_response_len = sizeof (sense);
+        io_v4.response = (uintptr_t) sense;
+        io_v4.din_xfer_len = buf_len;
+        io_v4.din_xferp = (uintptr_t) buf;
+        io_v4.timeout = COMMAND_TIMEOUT_MSEC;
+
+        ret = ioctl(fd, SG_IO, &io_v4);
+        if (ret != 0) {
+                /* could be that the driver doesn't do version 4, try version 3 */
+                if (errno == EINVAL) {
+                        struct sg_io_hdr io_hdr;
+
+                        memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
+                        io_hdr.interface_id = 'S';
+                        io_hdr.cmdp = (unsigned char*) cdb;
+                        io_hdr.cmd_len = sizeof (cdb);
+                        io_hdr.dxferp = buf;
+                        io_hdr.dxfer_len = buf_len;
+                        io_hdr.sbp = sense;
+                        io_hdr.mx_sb_len = sizeof (sense);
+                        io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
+                        io_hdr.timeout = COMMAND_TIMEOUT_MSEC;
+
+                        ret = ioctl(fd, SG_IO, &io_hdr);
+                        if (ret != 0)
+                                goto out;
+                } else {
+                        goto out;
+                }
+        }
+
+        if (!(sense[0] == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c)) {
+                errno = EIO;
+                ret = -1;
+                goto out;
+        }
 
  out:
-	return ret;
+        return ret;
 }
 
-static int disk_identify_packet_device_command(int	  fd,
-					       void	 *buf,
-					       size_t	  buf_len)
+static int disk_identify_packet_device_command(int          fd,
+                                               void         *buf,
+                                               size_t          buf_len)
 {
-	struct sg_io_v4 io_v4;
-	uint8_t cdb[16];
-	uint8_t sense[32];
-	uint8_t *desc = sense+8;
-	int ret;
-
-	/*
-	 * ATA Pass-Through 16 byte command, as described in
-	 *
-	 *  T10 04-262r8 ATA Command Pass-Through
-	 *
-	 * from http://www.t10.org/ftp/t10/document.04/04-262r8.pdf
-	 */
-	memset(cdb, 0, sizeof(cdb));
-	cdb[0] = 0x85;			/* OPERATION CODE: 16 byte pass through */
-	cdb[1] = 4 << 1;		/* PROTOCOL: PIO Data-in */
-	cdb[2] = 0x2e;			/* OFF_LINE=0, CK_COND=1, T_DIR=1, BYT_BLOK=1, T_LENGTH=2 */
-	cdb[3] = 0;			/* FEATURES */
-	cdb[4] = 0;			/* FEATURES */
-	cdb[5] = 0;			/* SECTORS */
-	cdb[6] = 1;			/* SECTORS */
-	cdb[7] = 0;			/* LBA LOW */
-	cdb[8] = 0;			/* LBA LOW */
-	cdb[9] = 0;			/* LBA MID */
-	cdb[10] = 0;			/* LBA MID */
-	cdb[11] = 0;			/* LBA HIGH */
-	cdb[12] = 0;			/* LBA HIGH */
-	cdb[13] = 0;			/* DEVICE */
-	cdb[14] = 0xA1;			/* Command: ATA IDENTIFY PACKET DEVICE */;
-	cdb[15] = 0;			/* CONTROL */
-	memset(sense, 0, sizeof(sense));
-
-	memset(&io_v4, 0, sizeof(struct sg_io_v4));
-	io_v4.guard = 'Q';
-	io_v4.protocol = BSG_PROTOCOL_SCSI;
-	io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
-	io_v4.request_len = sizeof (cdb);
-	io_v4.request = (uintptr_t) cdb;
-	io_v4.max_response_len = sizeof (sense);
-	io_v4.response = (uintptr_t) sense;
-	io_v4.din_xfer_len = buf_len;
-	io_v4.din_xferp = (uintptr_t) buf;
-	io_v4.timeout = COMMAND_TIMEOUT_MSEC;
-
-	ret = ioctl(fd, SG_IO, &io_v4);
-	if (ret != 0) {
-		/* could be that the driver doesn't do version 4, try version 3 */
-		if (errno == EINVAL) {
-			struct sg_io_hdr io_hdr;
-
-			memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
-			io_hdr.interface_id = 'S';
-			io_hdr.cmdp = (unsigned char*) cdb;
-			io_hdr.cmd_len = sizeof (cdb);
-			io_hdr.dxferp = buf;
-			io_hdr.dxfer_len = buf_len;
-			io_hdr.sbp = sense;
-			io_hdr.mx_sb_len = sizeof (sense);
-			io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
-			io_hdr.timeout = COMMAND_TIMEOUT_MSEC;
-
-			ret = ioctl(fd, SG_IO, &io_hdr);
-			if (ret != 0)
-				goto out;
-		} else {
-			goto out;
-		}
-	}
-
-	if (!(sense[0] == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c)) {
-		errno = EIO;
-		ret = -1;
-		goto out;
-	}
+        struct sg_io_v4 io_v4;
+        uint8_t cdb[16];
+        uint8_t sense[32];
+        uint8_t *desc = sense+8;
+        int ret;
+
+        /*
+         * ATA Pass-Through 16 byte command, as described in
+         *
+         *  T10 04-262r8 ATA Command Pass-Through
+         *
+         * from http://www.t10.org/ftp/t10/document.04/04-262r8.pdf
+         */
+        memset(cdb, 0, sizeof(cdb));
+        cdb[0] = 0x85;                        /* OPERATION CODE: 16 byte pass through */
+        cdb[1] = 4 << 1;                /* PROTOCOL: PIO Data-in */
+        cdb[2] = 0x2e;                        /* OFF_LINE=0, CK_COND=1, T_DIR=1, BYT_BLOK=1, T_LENGTH=2 */
+        cdb[3] = 0;                        /* FEATURES */
+        cdb[4] = 0;                        /* FEATURES */
+        cdb[5] = 0;                        /* SECTORS */
+        cdb[6] = 1;                        /* SECTORS */
+        cdb[7] = 0;                        /* LBA LOW */
+        cdb[8] = 0;                        /* LBA LOW */
+        cdb[9] = 0;                        /* LBA MID */
+        cdb[10] = 0;                        /* LBA MID */
+        cdb[11] = 0;                        /* LBA HIGH */
+        cdb[12] = 0;                        /* LBA HIGH */
+        cdb[13] = 0;                        /* DEVICE */
+        cdb[14] = 0xA1;                        /* Command: ATA IDENTIFY PACKET DEVICE */;
+        cdb[15] = 0;                        /* CONTROL */
+        memset(sense, 0, sizeof(sense));
+
+        memset(&io_v4, 0, sizeof(struct sg_io_v4));
+        io_v4.guard = 'Q';
+        io_v4.protocol = BSG_PROTOCOL_SCSI;
+        io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
+        io_v4.request_len = sizeof (cdb);
+        io_v4.request = (uintptr_t) cdb;
+        io_v4.max_response_len = sizeof (sense);
+        io_v4.response = (uintptr_t) sense;
+        io_v4.din_xfer_len = buf_len;
+        io_v4.din_xferp = (uintptr_t) buf;
+        io_v4.timeout = COMMAND_TIMEOUT_MSEC;
+
+        ret = ioctl(fd, SG_IO, &io_v4);
+        if (ret != 0) {
+                /* could be that the driver doesn't do version 4, try version 3 */
+                if (errno == EINVAL) {
+                        struct sg_io_hdr io_hdr;
+
+                        memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
+                        io_hdr.interface_id = 'S';
+                        io_hdr.cmdp = (unsigned char*) cdb;
+                        io_hdr.cmd_len = sizeof (cdb);
+                        io_hdr.dxferp = buf;
+                        io_hdr.dxfer_len = buf_len;
+                        io_hdr.sbp = sense;
+                        io_hdr.mx_sb_len = sizeof (sense);
+                        io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
+                        io_hdr.timeout = COMMAND_TIMEOUT_MSEC;
+
+                        ret = ioctl(fd, SG_IO, &io_hdr);
+                        if (ret != 0)
+                                goto out;
+                } else {
+                        goto out;
+                }
+        }
+
+        if (!(sense[0] == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c)) {
+                errno = EIO;
+                ret = -1;
+                goto out;
+        }
 
  out:
-	return ret;
+        return ret;
 }
 
 /**
@@ -295,43 +295,43 @@ static int disk_identify_packet_device_command(int	  fd,
  * Copies the ATA string from @identify located at @offset_words into @dest.
  */
 static void disk_identify_get_string (uint8_t identify[512],
-				      unsigned int offset_words,
-				      char *dest,
-				      size_t dest_len)
+                                      unsigned int offset_words,
+                                      char *dest,
+                                      size_t dest_len)
 {
-	unsigned int c1;
-	unsigned int c2;
-
-	assert (identify != NULL);
-	assert (dest != NULL);
-	assert ((dest_len & 1) == 0);
-
-	while (dest_len > 0) {
-		c1 = ((uint16_t *) identify)[offset_words] >> 8;
-		c2 = ((uint16_t *) identify)[offset_words] & 0xff;
-		*dest = c1;
-		dest++;
-		*dest = c2;
-		dest++;
-		offset_words++;
-		dest_len -= 2;
-	}
+        unsigned int c1;
+        unsigned int c2;
+
+        assert (identify != NULL);
+        assert (dest != NULL);
+        assert ((dest_len & 1) == 0);
+
+        while (dest_len > 0) {
+                c1 = ((uint16_t *) identify)[offset_words] >> 8;
+                c2 = ((uint16_t *) identify)[offset_words] & 0xff;
+                *dest = c1;
+                dest++;
+                *dest = c2;
+                dest++;
+                offset_words++;
+                dest_len -= 2;
+        }
 }
 
 static void disk_identify_fixup_string (uint8_t identify[512],
-					unsigned int offset_words,
-					size_t len)
+                                        unsigned int offset_words,
+                                        size_t len)
 {
-	disk_identify_get_string(identify, offset_words,
-				 (char *) identify + offset_words * 2, len);
+        disk_identify_get_string(identify, offset_words,
+                                 (char *) identify + offset_words * 2, len);
 }
 
 static void disk_identify_fixup_uint16 (uint8_t identify[512], unsigned int offset_words)
 {
-	uint16_t *p;
+        uint16_t *p;
 
-	p = (uint16_t *) identify;
-	p[offset_words] = le16toh (p[offset_words]);
+        p = (uint16_t *) identify;
+        p[offset_words] = le16toh (p[offset_words]);
 }
 
 /**
@@ -352,375 +352,375 @@ static void disk_identify_fixup_uint16 (uint8_t identify[512], unsigned int offs
  * non-zero with errno set.
  */
 static int disk_identify (struct udev *udev,
-			  int	       fd,
-			  uint8_t      out_identify[512],
-			  int	      *out_is_packet_device)
+                          int               fd,
+                          uint8_t      out_identify[512],
+                          int              *out_is_packet_device)
 {
-	int ret;
-	uint8_t inquiry_buf[36];
-	int peripheral_device_type;
-	int all_nul_bytes;
-	int n;
-	int is_packet_device;
-
-	assert (out_identify != NULL);
-
-	/* init results */
-	ret = -1;
-	memset (out_identify, '\0', 512);
-	is_packet_device = 0;
-
-	/* If we were to use ATA PASS_THROUGH (12) on an ATAPI device
-	 * we could accidentally blank media. This is because MMC's BLANK
-	 * command has the same op-code (0x61).
-	 *
-	 * To prevent this from happening we bail out if the device
-	 * isn't a Direct Access Block Device, e.g. SCSI type 0x00
-	 * (CD/DVD devices are type 0x05). So we send a SCSI INQUIRY
-	 * command first... libata is handling this via its SCSI
-	 * emulation layer.
-	 *
-	 * This also ensures that we're actually dealing with a device
-	 * that understands SCSI commands.
-	 *
-	 * (Yes, it is a bit perverse that we're tunneling the ATA
-	 * command through SCSI and relying on the ATA driver
-	 * emulating SCSI well-enough...)
-	 *
-	 * (See commit 160b069c25690bfb0c785994c7c3710289179107 for
-	 * the original bug-fix and see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556635
-	 * for the original bug-report.)
-	 */
-	ret = disk_scsi_inquiry_command (fd, inquiry_buf, sizeof (inquiry_buf));
-	if (ret != 0)
-		goto out;
-
-	/* SPC-4, section 6.4.2: Standard INQUIRY data */
-	peripheral_device_type = inquiry_buf[0] & 0x1f;
-	if (peripheral_device_type == 0x05)
-	  {
-	    is_packet_device = 1;
-	    ret = disk_identify_packet_device_command(fd, out_identify, 512);
-	    goto check_nul_bytes;
-	  }
-	if (peripheral_device_type != 0x00) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
-
-	/* OK, now issue the IDENTIFY DEVICE command */
-	ret = disk_identify_command(fd, out_identify, 512);
-	if (ret != 0)
-		goto out;
+        int ret;
+        uint8_t inquiry_buf[36];
+        int peripheral_device_type;
+        int all_nul_bytes;
+        int n;
+        int is_packet_device;
+
+        assert (out_identify != NULL);
+
+        /* init results */
+        ret = -1;
+        memset (out_identify, '\0', 512);
+        is_packet_device = 0;
+
+        /* If we were to use ATA PASS_THROUGH (12) on an ATAPI device
+         * we could accidentally blank media. This is because MMC's BLANK
+         * command has the same op-code (0x61).
+         *
+         * To prevent this from happening we bail out if the device
+         * isn't a Direct Access Block Device, e.g. SCSI type 0x00
+         * (CD/DVD devices are type 0x05). So we send a SCSI INQUIRY
+         * command first... libata is handling this via its SCSI
+         * emulation layer.
+         *
+         * This also ensures that we're actually dealing with a device
+         * that understands SCSI commands.
+         *
+         * (Yes, it is a bit perverse that we're tunneling the ATA
+         * command through SCSI and relying on the ATA driver
+         * emulating SCSI well-enough...)
+         *
+         * (See commit 160b069c25690bfb0c785994c7c3710289179107 for
+         * the original bug-fix and see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556635
+         * for the original bug-report.)
+         */
+        ret = disk_scsi_inquiry_command (fd, inquiry_buf, sizeof (inquiry_buf));
+        if (ret != 0)
+                goto out;
+
+        /* SPC-4, section 6.4.2: Standard INQUIRY data */
+        peripheral_device_type = inquiry_buf[0] & 0x1f;
+        if (peripheral_device_type == 0x05)
+          {
+            is_packet_device = 1;
+            ret = disk_identify_packet_device_command(fd, out_identify, 512);
+            goto check_nul_bytes;
+          }
+        if (peripheral_device_type != 0x00) {
+                ret = -1;
+                errno = EIO;
+                goto out;
+        }
+
+        /* OK, now issue the IDENTIFY DEVICE command */
+        ret = disk_identify_command(fd, out_identify, 512);
+        if (ret != 0)
+                goto out;
 
  check_nul_bytes:
-	 /* Check if IDENTIFY data is all NUL bytes - if so, bail */
-	all_nul_bytes = 1;
-	for (n = 0; n < 512; n++) {
-		if (out_identify[n] != '\0') {
-			all_nul_bytes = 0;
-			break;
-		}
-	}
-
-	if (all_nul_bytes) {
-		ret = -1;
-		errno = EIO;
-		goto out;
-	}
+         /* Check if IDENTIFY data is all NUL bytes - if so, bail */
+        all_nul_bytes = 1;
+        for (n = 0; n < 512; n++) {
+                if (out_identify[n] != '\0') {
+                        all_nul_bytes = 0;
+                        break;
+                }
+        }
+
+        if (all_nul_bytes) {
+                ret = -1;
+                errno = EIO;
+                goto out;
+        }
 
 out:
-	if (out_is_packet_device != NULL)
-	  *out_is_packet_device = is_packet_device;
-	return ret;
+        if (out_is_packet_device != NULL)
+          *out_is_packet_device = is_packet_device;
+        return ret;
 }
 
 static void log_fn(struct udev *udev, int priority,
-		   const char *file, int line, const char *fn,
-		   const char *format, va_list args)
+                   const char *file, int line, const char *fn,
+                   const char *format, va_list args)
 {
-	vsyslog(priority, format, args);
+        vsyslog(priority, format, args);
 }
 
 int main(int argc, char *argv[])
 {
-	struct udev *udev;
-	struct hd_driveid id;
-	uint8_t identify[512];
-	uint16_t *identify_words;
-	char model[41];
-	char model_enc[256];
-	char serial[21];
-	char revision[9];
-	const char *node = NULL;
-	int export = 0;
-	int fd;
-	uint16_t word;
-	int rc = 0;
-	int is_packet_device = 0;
-	static const struct option options[] = {
-		{ "export", no_argument, NULL, 'x' },
-		{ "help", no_argument, NULL, 'h' },
-		{}
-	};
-
-	udev = udev_new();
-	if (udev == NULL)
-		goto exit;
-
-	udev_log_init("ata_id");
-	udev_set_log_fn(udev, log_fn);
-
-	while (1) {
-		int option;
-
-		option = getopt_long(argc, argv, "xh", options, NULL);
-		if (option == -1)
-			break;
-
-		switch (option) {
-		case 'x':
-			export = 1;
-			break;
-		case 'h':
-			printf("Usage: ata_id [--export] [--help] <device>\n"
-			       "  --export    print values as environment keys\n"
-			       "  --help      print this help text\n\n");
-			goto exit;
-		}
-	}
-
-	node = argv[optind];
-	if (node == NULL) {
-		err(udev, "no node specified\n");
-		rc = 1;
-		goto exit;
-	}
-
-	fd = open(node, O_RDONLY|O_NONBLOCK);
-	if (fd < 0) {
-		err(udev, "unable to open '%s'\n", node);
-		rc = 1;
-		goto exit;
-	}
-
-	if (disk_identify(udev, fd, identify, &is_packet_device) == 0) {
-		/*
-		 * fix up only the fields from the IDENTIFY data that we are going to
-		 * use and copy it into the hd_driveid struct for convenience
-		 */
-		disk_identify_fixup_string (identify,  10, 20);	/* serial */
-		disk_identify_fixup_string (identify,  23,  6);	/* fwrev */
-		disk_identify_fixup_string (identify,  27, 40);	/* model */
-		disk_identify_fixup_uint16 (identify,	0);	/* configuration */
-		disk_identify_fixup_uint16 (identify,  75);	/* queue depth */
-		disk_identify_fixup_uint16 (identify,  75);	/* SATA capabilities */
-		disk_identify_fixup_uint16 (identify,  82);	/* command set supported */
-		disk_identify_fixup_uint16 (identify,  83);	/* command set supported */
-		disk_identify_fixup_uint16 (identify,  84);	/* command set supported */
-		disk_identify_fixup_uint16 (identify,  85);	/* command set supported */
-		disk_identify_fixup_uint16 (identify,  86);	/* command set supported */
-		disk_identify_fixup_uint16 (identify,  87);	/* command set supported */
-		disk_identify_fixup_uint16 (identify,  89);	/* time required for SECURITY ERASE UNIT */
-		disk_identify_fixup_uint16 (identify,  90);	/* time required for enhanced SECURITY ERASE UNIT */
-		disk_identify_fixup_uint16 (identify,  91);	/* current APM values */
-		disk_identify_fixup_uint16 (identify,  94);	/* current AAM value */
-		disk_identify_fixup_uint16 (identify, 128);	/* device lock function */
-		disk_identify_fixup_uint16 (identify, 217);	/* nominal media rotation rate */
-		memcpy(&id, identify, sizeof id);
-	} else {
-		/* If this fails, then try HDIO_GET_IDENTITY */
-		if (ioctl(fd, HDIO_GET_IDENTITY, &id) != 0) {
-			if (errno == ENOTTY) {
-				info(udev, "HDIO_GET_IDENTITY unsupported for '%s'\n", node);
-				rc = 2;
-			} else {
-				err(udev, "HDIO_GET_IDENTITY failed for '%s': %m\n", node);
-				rc = 3;
-			}
-			goto close;
-		}
-	}
-	identify_words = (uint16_t *) identify;
-
-	memcpy (model, id.model, 40);
-	model[40] = '\0';
-	udev_util_encode_string(model, model_enc, sizeof(model_enc));
-	util_replace_whitespace((char *) id.model, model, 40);
-	util_replace_chars(model, NULL);
-	util_replace_whitespace((char *) id.serial_no, serial, 20);
-	util_replace_chars(serial, NULL);
-	util_replace_whitespace((char *) id.fw_rev, revision, 8);
-	util_replace_chars(revision, NULL);
-
-	if (export) {
-		/* Set this to convey the disk speaks the ATA protocol */
-		printf("ID_ATA=1\n");
-
-		if ((id.config >> 8) & 0x80) {
-			/* This is an ATAPI device */
-			switch ((id.config >> 8) & 0x1f) {
-			case 0:
-				printf("ID_TYPE=cd\n");
-				break;
-			case 1:
-				printf("ID_TYPE=tape\n");
-				break;
-			case 5:
-				printf("ID_TYPE=cd\n");
-				break;
-			case 7:
-				printf("ID_TYPE=optical\n");
-				break;
-			default:
-				printf("ID_TYPE=generic\n");
-				break;
-			}
-		} else {
-			printf("ID_TYPE=disk\n");
-		}
-		printf("ID_BUS=ata\n");
-		printf("ID_MODEL=%s\n", model);
-		printf("ID_MODEL_ENC=%s\n", model_enc);
-		printf("ID_REVISION=%s\n", revision);
-		if (serial[0] != '\0') {
-			printf("ID_SERIAL=%s_%s\n", model, serial);
-			printf("ID_SERIAL_SHORT=%s\n", serial);
-		} else {
-			printf("ID_SERIAL=%s\n", model);
-		}
-
-		if (id.command_set_1 & (1<<5)) {
-			printf ("ID_ATA_WRITE_CACHE=1\n");
-			printf ("ID_ATA_WRITE_CACHE_ENABLED=%d\n", (id.cfs_enable_1 & (1<<5)) ? 1 : 0);
-		}
-		if (id.command_set_1 & (1<<10)) {
-			printf("ID_ATA_FEATURE_SET_HPA=1\n");
-			printf("ID_ATA_FEATURE_SET_HPA_ENABLED=%d\n", (id.cfs_enable_1 & (1<<10)) ? 1 : 0);
-
-			/*
-			 * TODO: use the READ NATIVE MAX ADDRESS command to get the native max address
-			 * so it is easy to check whether the protected area is in use.
-			 */
-		}
-		if (id.command_set_1 & (1<<3)) {
-			printf("ID_ATA_FEATURE_SET_PM=1\n");
-			printf("ID_ATA_FEATURE_SET_PM_ENABLED=%d\n", (id.cfs_enable_1 & (1<<3)) ? 1 : 0);
-		}
-		if (id.command_set_1 & (1<<1)) {
-			printf("ID_ATA_FEATURE_SET_SECURITY=1\n");
-			printf("ID_ATA_FEATURE_SET_SECURITY_ENABLED=%d\n", (id.cfs_enable_1 & (1<<1)) ? 1 : 0);
-			printf("ID_ATA_FEATURE_SET_SECURITY_ERASE_UNIT_MIN=%d\n", id.trseuc * 2);
-			if ((id.cfs_enable_1 & (1<<1))) /* enabled */ {
-				if (id.dlf & (1<<8))
-					printf("ID_ATA_FEATURE_SET_SECURITY_LEVEL=maximum\n");
-				else
-					printf("ID_ATA_FEATURE_SET_SECURITY_LEVEL=high\n");
-			}
-			if (id.dlf & (1<<5))
-				printf("ID_ATA_FEATURE_SET_SECURITY_ENHANCED_ERASE_UNIT_MIN=%d\n", id.trsEuc * 2);
-			if (id.dlf & (1<<4))
-				printf("ID_ATA_FEATURE_SET_SECURITY_EXPIRE=1\n");
-			if (id.dlf & (1<<3))
-				printf("ID_ATA_FEATURE_SET_SECURITY_FROZEN=1\n");
-			if (id.dlf & (1<<2))
-				printf("ID_ATA_FEATURE_SET_SECURITY_LOCKED=1\n");
-		}
-		if (id.command_set_1 & (1<<0)) {
-			printf("ID_ATA_FEATURE_SET_SMART=1\n");
-			printf("ID_ATA_FEATURE_SET_SMART_ENABLED=%d\n", (id.cfs_enable_1 & (1<<0)) ? 1 : 0);
-		}
-		if (id.command_set_2 & (1<<9)) {
-			printf("ID_ATA_FEATURE_SET_AAM=1\n");
-			printf("ID_ATA_FEATURE_SET_AAM_ENABLED=%d\n", (id.cfs_enable_2 & (1<<9)) ? 1 : 0);
-			printf("ID_ATA_FEATURE_SET_AAM_VENDOR_RECOMMENDED_VALUE=%d\n", id.acoustic >> 8);
-			printf("ID_ATA_FEATURE_SET_AAM_CURRENT_VALUE=%d\n", id.acoustic & 0xff);
-		}
-		if (id.command_set_2 & (1<<5)) {
-			printf("ID_ATA_FEATURE_SET_PUIS=1\n");
-			printf("ID_ATA_FEATURE_SET_PUIS_ENABLED=%d\n", (id.cfs_enable_2 & (1<<5)) ? 1 : 0);
-		}
-		if (id.command_set_2 & (1<<3)) {
-			printf("ID_ATA_FEATURE_SET_APM=1\n");
-			printf("ID_ATA_FEATURE_SET_APM_ENABLED=%d\n", (id.cfs_enable_2 & (1<<3)) ? 1 : 0);
-			if ((id.cfs_enable_2 & (1<<3)))
-				printf("ID_ATA_FEATURE_SET_APM_CURRENT_VALUE=%d\n", id.CurAPMvalues & 0xff);
-		}
-		if (id.command_set_2 & (1<<0))
-			printf("ID_ATA_DOWNLOAD_MICROCODE=1\n");
-
-		/*
-		 * Word 76 indicates the capabilities of a SATA device. A PATA device shall set
-		 * word 76 to 0000h or FFFFh. If word 76 is set to 0000h or FFFFh, then
-		 * the device does not claim compliance with the Serial ATA specification and words
-		 * 76 through 79 are not valid and shall be ignored.
-		 */
-		word = *((uint16_t *) identify + 76);
-		if (word != 0x0000 && word != 0xffff) {
-			printf("ID_ATA_SATA=1\n");
-			/*
-			 * If bit 2 of word 76 is set to one, then the device supports the Gen2
-			 * signaling rate of 3.0 Gb/s (see SATA 2.6).
-			 *
-			 * If bit 1 of word 76 is set to one, then the device supports the Gen1
-			 * signaling rate of 1.5 Gb/s (see SATA 2.6).
-			 */
-			if (word & (1<<2))
-				printf("ID_ATA_SATA_SIGNAL_RATE_GEN2=1\n");
-			if (word & (1<<1))
-				printf("ID_ATA_SATA_SIGNAL_RATE_GEN1=1\n");
-		}
-
-		/* Word 217 indicates the nominal media rotation rate of the device */
-		word = *((uint16_t *) identify + 217);
-		if (word != 0x0000) {
-			if (word == 0x0001) {
-				printf ("ID_ATA_ROTATION_RATE_RPM=0\n"); /* non-rotating e.g. SSD */
-			} else if (word >= 0x0401 && word <= 0xfffe) {
-				printf ("ID_ATA_ROTATION_RATE_RPM=%d\n", word);
-			}
-		}
-
-		/*
-		 * Words 108-111 contain a mandatory World Wide Name (WWN) in the NAA IEEE Registered identifier
-		 * format. Word 108 bits (15:12) shall contain 5h, indicating that the naming authority is IEEE.
-		 * All other values are reserved.
-		 */
-		word = *((uint16_t *) identify + 108);
-		if ((word & 0xf000) == 0x5000) {
-			uint64_t wwwn;
-
-			wwwn   = *((uint16_t *) identify + 108);
-			wwwn <<= 16;
-			wwwn  |= *((uint16_t *) identify + 109);
-			wwwn <<= 16;
-			wwwn  |= *((uint16_t *) identify + 110);
-			wwwn <<= 16;
-			wwwn  |= *((uint16_t *) identify + 111);
-			printf("ID_WWN=0x%llx\n", (unsigned long long int) wwwn);
-			/* ATA devices have no vendor extension */
-			printf("ID_WWN_WITH_EXTENSION=0x%llx\n", (unsigned long long int) wwwn);
-		}
-
-		/* from Linux's include/linux/ata.h */
-		if (identify_words[0] == 0x848a || identify_words[0] == 0x844a) {
-			printf("ID_ATA_CFA=1\n");
-		} else {
-			if ((identify_words[83] & 0xc004) == 0x4004) {
-				printf("ID_ATA_CFA=1\n");
-			}
-		}
-	} else {
-		if (serial[0] != '\0')
-			printf("%s_%s\n", model, serial);
-		else
-			printf("%s\n", model);
-	}
+        struct udev *udev;
+        struct hd_driveid id;
+        uint8_t identify[512];
+        uint16_t *identify_words;
+        char model[41];
+        char model_enc[256];
+        char serial[21];
+        char revision[9];
+        const char *node = NULL;
+        int export = 0;
+        int fd;
+        uint16_t word;
+        int rc = 0;
+        int is_packet_device = 0;
+        static const struct option options[] = {
+                { "export", no_argument, NULL, 'x' },
+                { "help", no_argument, NULL, 'h' },
+                {}
+        };
+
+        udev = udev_new();
+        if (udev == NULL)
+                goto exit;
+
+        udev_log_init("ata_id");
+        udev_set_log_fn(udev, log_fn);
+
+        while (1) {
+                int option;
+
+                option = getopt_long(argc, argv, "xh", options, NULL);
+                if (option == -1)
+                        break;
+
+                switch (option) {
+                case 'x':
+                        export = 1;
+                        break;
+                case 'h':
+                        printf("Usage: ata_id [--export] [--help] <device>\n"
+                               "  --export    print values as environment keys\n"
+                               "  --help      print this help text\n\n");
+                        goto exit;
+                }
+        }
+
+        node = argv[optind];
+        if (node == NULL) {
+                err(udev, "no node specified\n");
+                rc = 1;
+                goto exit;
+        }
+
+        fd = open(node, O_RDONLY|O_NONBLOCK);
+        if (fd < 0) {
+                err(udev, "unable to open '%s'\n", node);
+                rc = 1;
+                goto exit;
+        }
+
+        if (disk_identify(udev, fd, identify, &is_packet_device) == 0) {
+                /*
+                 * fix up only the fields from the IDENTIFY data that we are going to
+                 * use and copy it into the hd_driveid struct for convenience
+                 */
+                disk_identify_fixup_string (identify,  10, 20);        /* serial */
+                disk_identify_fixup_string (identify,  23,  6);        /* fwrev */
+                disk_identify_fixup_string (identify,  27, 40);        /* model */
+                disk_identify_fixup_uint16 (identify,        0);        /* configuration */
+                disk_identify_fixup_uint16 (identify,  75);        /* queue depth */
+                disk_identify_fixup_uint16 (identify,  75);        /* SATA capabilities */
+                disk_identify_fixup_uint16 (identify,  82);        /* command set supported */
+                disk_identify_fixup_uint16 (identify,  83);        /* command set supported */
+                disk_identify_fixup_uint16 (identify,  84);        /* command set supported */
+                disk_identify_fixup_uint16 (identify,  85);        /* command set supported */
+                disk_identify_fixup_uint16 (identify,  86);        /* command set supported */
+                disk_identify_fixup_uint16 (identify,  87);        /* command set supported */
+                disk_identify_fixup_uint16 (identify,  89);        /* time required for SECURITY ERASE UNIT */
+                disk_identify_fixup_uint16 (identify,  90);        /* time required for enhanced SECURITY ERASE UNIT */
+                disk_identify_fixup_uint16 (identify,  91);        /* current APM values */
+                disk_identify_fixup_uint16 (identify,  94);        /* current AAM value */
+                disk_identify_fixup_uint16 (identify, 128);        /* device lock function */
+                disk_identify_fixup_uint16 (identify, 217);        /* nominal media rotation rate */
+                memcpy(&id, identify, sizeof id);
+        } else {
+                /* If this fails, then try HDIO_GET_IDENTITY */
+                if (ioctl(fd, HDIO_GET_IDENTITY, &id) != 0) {
+                        if (errno == ENOTTY) {
+                                info(udev, "HDIO_GET_IDENTITY unsupported for '%s'\n", node);
+                                rc = 2;
+                        } else {
+                                err(udev, "HDIO_GET_IDENTITY failed for '%s': %m\n", node);
+                                rc = 3;
+                        }
+                        goto close;
+                }
+        }
+        identify_words = (uint16_t *) identify;
+
+        memcpy (model, id.model, 40);
+        model[40] = '\0';
+        udev_util_encode_string(model, model_enc, sizeof(model_enc));
+        util_replace_whitespace((char *) id.model, model, 40);
+        util_replace_chars(model, NULL);
+        util_replace_whitespace((char *) id.serial_no, serial, 20);
+        util_replace_chars(serial, NULL);
+        util_replace_whitespace((char *) id.fw_rev, revision, 8);
+        util_replace_chars(revision, NULL);
+
+        if (export) {
+                /* Set this to convey the disk speaks the ATA protocol */
+                printf("ID_ATA=1\n");
+
+                if ((id.config >> 8) & 0x80) {
+                        /* This is an ATAPI device */
+                        switch ((id.config >> 8) & 0x1f) {
+                        case 0:
+                                printf("ID_TYPE=cd\n");
+                                break;
+                        case 1:
+                                printf("ID_TYPE=tape\n");
+                                break;
+                        case 5:
+                                printf("ID_TYPE=cd\n");
+                                break;
+                        case 7:
+                                printf("ID_TYPE=optical\n");
+                                break;
+                        default:
+                                printf("ID_TYPE=generic\n");
+                                break;
+                        }
+                } else {
+                        printf("ID_TYPE=disk\n");
+                }
+                printf("ID_BUS=ata\n");
+                printf("ID_MODEL=%s\n", model);
+                printf("ID_MODEL_ENC=%s\n", model_enc);
+                printf("ID_REVISION=%s\n", revision);
+                if (serial[0] != '\0') {
+                        printf("ID_SERIAL=%s_%s\n", model, serial);
+                        printf("ID_SERIAL_SHORT=%s\n", serial);
+                } else {
+                        printf("ID_SERIAL=%s\n", model);
+                }
+
+                if (id.command_set_1 & (1<<5)) {
+                        printf ("ID_ATA_WRITE_CACHE=1\n");
+                        printf ("ID_ATA_WRITE_CACHE_ENABLED=%d\n", (id.cfs_enable_1 & (1<<5)) ? 1 : 0);
+                }
+                if (id.command_set_1 & (1<<10)) {
+                        printf("ID_ATA_FEATURE_SET_HPA=1\n");
+                        printf("ID_ATA_FEATURE_SET_HPA_ENABLED=%d\n", (id.cfs_enable_1 & (1<<10)) ? 1 : 0);
+
+                        /*
+                         * TODO: use the READ NATIVE MAX ADDRESS command to get the native max address
+                         * so it is easy to check whether the protected area is in use.
+                         */
+                }
+                if (id.command_set_1 & (1<<3)) {
+                        printf("ID_ATA_FEATURE_SET_PM=1\n");
+                        printf("ID_ATA_FEATURE_SET_PM_ENABLED=%d\n", (id.cfs_enable_1 & (1<<3)) ? 1 : 0);
+                }
+                if (id.command_set_1 & (1<<1)) {
+                        printf("ID_ATA_FEATURE_SET_SECURITY=1\n");
+                        printf("ID_ATA_FEATURE_SET_SECURITY_ENABLED=%d\n", (id.cfs_enable_1 & (1<<1)) ? 1 : 0);
+                        printf("ID_ATA_FEATURE_SET_SECURITY_ERASE_UNIT_MIN=%d\n", id.trseuc * 2);
+                        if ((id.cfs_enable_1 & (1<<1))) /* enabled */ {
+                                if (id.dlf & (1<<8))
+                                        printf("ID_ATA_FEATURE_SET_SECURITY_LEVEL=maximum\n");
+                                else
+                                        printf("ID_ATA_FEATURE_SET_SECURITY_LEVEL=high\n");
+                        }
+                        if (id.dlf & (1<<5))
+                                printf("ID_ATA_FEATURE_SET_SECURITY_ENHANCED_ERASE_UNIT_MIN=%d\n", id.trsEuc * 2);
+                        if (id.dlf & (1<<4))
+                                printf("ID_ATA_FEATURE_SET_SECURITY_EXPIRE=1\n");
+                        if (id.dlf & (1<<3))
+                                printf("ID_ATA_FEATURE_SET_SECURITY_FROZEN=1\n");
+                        if (id.dlf & (1<<2))
+                                printf("ID_ATA_FEATURE_SET_SECURITY_LOCKED=1\n");
+                }
+                if (id.command_set_1 & (1<<0)) {
+                        printf("ID_ATA_FEATURE_SET_SMART=1\n");
+                        printf("ID_ATA_FEATURE_SET_SMART_ENABLED=%d\n", (id.cfs_enable_1 & (1<<0)) ? 1 : 0);
+                }
+                if (id.command_set_2 & (1<<9)) {
+                        printf("ID_ATA_FEATURE_SET_AAM=1\n");
+                        printf("ID_ATA_FEATURE_SET_AAM_ENABLED=%d\n", (id.cfs_enable_2 & (1<<9)) ? 1 : 0);
+                        printf("ID_ATA_FEATURE_SET_AAM_VENDOR_RECOMMENDED_VALUE=%d\n", id.acoustic >> 8);
+                        printf("ID_ATA_FEATURE_SET_AAM_CURRENT_VALUE=%d\n", id.acoustic & 0xff);
+                }
+                if (id.command_set_2 & (1<<5)) {
+                        printf("ID_ATA_FEATURE_SET_PUIS=1\n");
+                        printf("ID_ATA_FEATURE_SET_PUIS_ENABLED=%d\n", (id.cfs_enable_2 & (1<<5)) ? 1 : 0);
+                }
+                if (id.command_set_2 & (1<<3)) {
+                        printf("ID_ATA_FEATURE_SET_APM=1\n");
+                        printf("ID_ATA_FEATURE_SET_APM_ENABLED=%d\n", (id.cfs_enable_2 & (1<<3)) ? 1 : 0);
+                        if ((id.cfs_enable_2 & (1<<3)))
+                                printf("ID_ATA_FEATURE_SET_APM_CURRENT_VALUE=%d\n", id.CurAPMvalues & 0xff);
+                }
+                if (id.command_set_2 & (1<<0))
+                        printf("ID_ATA_DOWNLOAD_MICROCODE=1\n");
+
+                /*
+                 * Word 76 indicates the capabilities of a SATA device. A PATA device shall set
+                 * word 76 to 0000h or FFFFh. If word 76 is set to 0000h or FFFFh, then
+                 * the device does not claim compliance with the Serial ATA specification and words
+                 * 76 through 79 are not valid and shall be ignored.
+                 */
+                word = *((uint16_t *) identify + 76);
+                if (word != 0x0000 && word != 0xffff) {
+                        printf("ID_ATA_SATA=1\n");
+                        /*
+                         * If bit 2 of word 76 is set to one, then the device supports the Gen2
+                         * signaling rate of 3.0 Gb/s (see SATA 2.6).
+                         *
+                         * If bit 1 of word 76 is set to one, then the device supports the Gen1
+                         * signaling rate of 1.5 Gb/s (see SATA 2.6).
+                         */
+                        if (word & (1<<2))
+                                printf("ID_ATA_SATA_SIGNAL_RATE_GEN2=1\n");
+                        if (word & (1<<1))
+                                printf("ID_ATA_SATA_SIGNAL_RATE_GEN1=1\n");
+                }
+
+                /* Word 217 indicates the nominal media rotation rate of the device */
+                word = *((uint16_t *) identify + 217);
+                if (word != 0x0000) {
+                        if (word == 0x0001) {
+                                printf ("ID_ATA_ROTATION_RATE_RPM=0\n"); /* non-rotating e.g. SSD */
+                        } else if (word >= 0x0401 && word <= 0xfffe) {
+                                printf ("ID_ATA_ROTATION_RATE_RPM=%d\n", word);
+                        }
+                }
+
+                /*
+                 * Words 108-111 contain a mandatory World Wide Name (WWN) in the NAA IEEE Registered identifier
+                 * format. Word 108 bits (15:12) shall contain 5h, indicating that the naming authority is IEEE.
+                 * All other values are reserved.
+                 */
+                word = *((uint16_t *) identify + 108);
+                if ((word & 0xf000) == 0x5000) {
+                        uint64_t wwwn;
+
+                        wwwn   = *((uint16_t *) identify + 108);
+                        wwwn <<= 16;
+                        wwwn  |= *((uint16_t *) identify + 109);
+                        wwwn <<= 16;
+                        wwwn  |= *((uint16_t *) identify + 110);
+                        wwwn <<= 16;
+                        wwwn  |= *((uint16_t *) identify + 111);
+                        printf("ID_WWN=0x%llx\n", (unsigned long long int) wwwn);
+                        /* ATA devices have no vendor extension */
+                        printf("ID_WWN_WITH_EXTENSION=0x%llx\n", (unsigned long long int) wwwn);
+                }
+
+                /* from Linux's include/linux/ata.h */
+                if (identify_words[0] == 0x848a || identify_words[0] == 0x844a) {
+                        printf("ID_ATA_CFA=1\n");
+                } else {
+                        if ((identify_words[83] & 0xc004) == 0x4004) {
+                                printf("ID_ATA_CFA=1\n");
+                        }
+                }
+        } else {
+                if (serial[0] != '\0')
+                        printf("%s_%s\n", model, serial);
+                else
+                        printf("%s\n", model);
+        }
 close:
-	close(fd);
+        close(fd);
 exit:
-	udev_unref(udev);
-	udev_log_close();
-	return rc;
+        udev_unref(udev);
+        udev_log_close();
+        return rc;
 }
diff --git a/src/extras/cdrom_id/cdrom_id.c b/src/extras/cdrom_id/cdrom_id.c
index 664a00d2c7..daaebee14e 100644
--- a/src/extras/cdrom_id/cdrom_id.c
+++ b/src/extras/cdrom_id/cdrom_id.c
@@ -44,15 +44,15 @@
 static bool debug;
 
 static void log_fn(struct udev *udev, int priority,
-		   const char *file, int line, const char *fn,
-		   const char *format, va_list args)
+                   const char *file, int line, const char *fn,
+                   const char *format, va_list args)
 {
-	if (debug) {
-		fprintf(stderr, "%s: ", fn);
-		vfprintf(stderr, format, args);
-	} else {
-		vsyslog(priority, format, args);
-	}
+        if (debug) {
+                fprintf(stderr, "%s: ", fn);
+                vfprintf(stderr, format, args);
+        } else {
+                vsyslog(priority, format, args);
+        }
 }
 
 /* device info */
@@ -110,990 +110,990 @@ static unsigned int cd_media_track_count_data = 0;
 static unsigned int cd_media_track_count_audio = 0;
 static unsigned long long int cd_media_session_last_offset = 0;
 
-#define ERRCODE(s)	((((s)[2] & 0x0F) << 16) | ((s)[12] << 8) | ((s)[13]))
-#define SK(errcode)	(((errcode) >> 16) & 0xF)
-#define ASC(errcode)	(((errcode) >> 8) & 0xFF)
-#define ASCQ(errcode)	((errcode) & 0xFF)
+#define ERRCODE(s)        ((((s)[2] & 0x0F) << 16) | ((s)[12] << 8) | ((s)[13]))
+#define SK(errcode)        (((errcode) >> 16) & 0xF)
+#define ASC(errcode)        (((errcode) >> 8) & 0xFF)
+#define ASCQ(errcode)        ((errcode) & 0xFF)
 
 static int is_mounted(const char *device)
 {
-	struct stat statbuf;
-	FILE *fp;
-	int maj, min;
-	int mounted = 0;
-
-	if (stat(device, &statbuf) < 0)
-		return -ENODEV;
-
-	fp = fopen("/proc/self/mountinfo", "r");
-	if (fp == NULL)
-		return -ENOSYS;
-	while (fscanf(fp, "%*s %*s %i:%i %*[^\n]", &maj, &min) == 2) {
-		if (makedev(maj, min) == statbuf.st_rdev) {
-			mounted = 1;
-			break;
-		}
-	}
-	fclose(fp);
-	return mounted;
+        struct stat statbuf;
+        FILE *fp;
+        int maj, min;
+        int mounted = 0;
+
+        if (stat(device, &statbuf) < 0)
+                return -ENODEV;
+
+        fp = fopen("/proc/self/mountinfo", "r");
+        if (fp == NULL)
+                return -ENOSYS;
+        while (fscanf(fp, "%*s %*s %i:%i %*[^\n]", &maj, &min) == 2) {
+                if (makedev(maj, min) == statbuf.st_rdev) {
+                        mounted = 1;
+                        break;
+                }
+        }
+        fclose(fp);
+        return mounted;
 }
 
 static void info_scsi_cmd_err(struct udev *udev, char *cmd, int err)
 {
-	if (err == -1) {
-		info(udev, "%s failed\n", cmd);
-		return;
-	}
-	info(udev, "%s failed with SK=%Xh/ASC=%02Xh/ACQ=%02Xh\n", cmd, SK(err), ASC(err), ASCQ(err));
+        if (err == -1) {
+                info(udev, "%s failed\n", cmd);
+                return;
+        }
+        info(udev, "%s failed with SK=%Xh/ASC=%02Xh/ACQ=%02Xh\n", cmd, SK(err), ASC(err), ASCQ(err));
 }
 
 struct scsi_cmd {
-	struct cdrom_generic_command cgc;
-	union {
-		struct request_sense s;
-		unsigned char u[18];
-	} _sense;
-	struct sg_io_hdr sg_io;
+        struct cdrom_generic_command cgc;
+        union {
+                struct request_sense s;
+                unsigned char u[18];
+        } _sense;
+        struct sg_io_hdr sg_io;
 };
 
 static void scsi_cmd_init(struct udev *udev, struct scsi_cmd *cmd)
 {
-	memset(cmd, 0x00, sizeof(struct scsi_cmd));
-	cmd->cgc.quiet = 1;
-	cmd->cgc.sense = &cmd->_sense.s;
-	cmd->sg_io.interface_id = 'S';
-	cmd->sg_io.mx_sb_len = sizeof(cmd->_sense);
-	cmd->sg_io.cmdp = cmd->cgc.cmd;
-	cmd->sg_io.sbp = cmd->_sense.u;
-	cmd->sg_io.flags = SG_FLAG_LUN_INHIBIT | SG_FLAG_DIRECT_IO;
+        memset(cmd, 0x00, sizeof(struct scsi_cmd));
+        cmd->cgc.quiet = 1;
+        cmd->cgc.sense = &cmd->_sense.s;
+        cmd->sg_io.interface_id = 'S';
+        cmd->sg_io.mx_sb_len = sizeof(cmd->_sense);
+        cmd->sg_io.cmdp = cmd->cgc.cmd;
+        cmd->sg_io.sbp = cmd->_sense.u;
+        cmd->sg_io.flags = SG_FLAG_LUN_INHIBIT | SG_FLAG_DIRECT_IO;
 }
 
 static void scsi_cmd_set(struct udev *udev, struct scsi_cmd *cmd, size_t i, unsigned char arg)
 {
-	cmd->sg_io.cmd_len = i + 1;
-	cmd->cgc.cmd[i] = arg;
+        cmd->sg_io.cmd_len = i + 1;
+        cmd->cgc.cmd[i] = arg;
 }
 
 #define CHECK_CONDITION 0x01
 
 static int scsi_cmd_run(struct udev *udev, struct scsi_cmd *cmd, int fd, unsigned char *buf, size_t bufsize)
 {
-	int ret = 0;
-
-	if (bufsize > 0) {
-		cmd->sg_io.dxferp = buf;
-		cmd->sg_io.dxfer_len = bufsize;
-		cmd->sg_io.dxfer_direction = SG_DXFER_FROM_DEV;
-	} else {
-		cmd->sg_io.dxfer_direction = SG_DXFER_NONE;
-	}
-	if (ioctl(fd, SG_IO, &cmd->sg_io))
-		return -1;
-
-	if ((cmd->sg_io.info & SG_INFO_OK_MASK) != SG_INFO_OK) {
-		errno = EIO;
-		ret = -1;
-		if (cmd->sg_io.masked_status & CHECK_CONDITION) {
-			ret = ERRCODE(cmd->_sense.u);
-			if (ret == 0)
-				ret = -1;
-		}
-	}
-	return ret;
+        int ret = 0;
+
+        if (bufsize > 0) {
+                cmd->sg_io.dxferp = buf;
+                cmd->sg_io.dxfer_len = bufsize;
+                cmd->sg_io.dxfer_direction = SG_DXFER_FROM_DEV;
+        } else {
+                cmd->sg_io.dxfer_direction = SG_DXFER_NONE;
+        }
+        if (ioctl(fd, SG_IO, &cmd->sg_io))
+                return -1;
+
+        if ((cmd->sg_io.info & SG_INFO_OK_MASK) != SG_INFO_OK) {
+                errno = EIO;
+                ret = -1;
+                if (cmd->sg_io.masked_status & CHECK_CONDITION) {
+                        ret = ERRCODE(cmd->_sense.u);
+                        if (ret == 0)
+                                ret = -1;
+                }
+        }
+        return ret;
 }
 
 static int media_lock(struct udev *udev, int fd, bool lock)
 {
-	int err;
+        int err;
 
-	/* disable the kernel's lock logic */
-	err = ioctl(fd, CDROM_CLEAR_OPTIONS, CDO_LOCK);
-	if (err < 0)
-		info(udev, "CDROM_CLEAR_OPTIONS, CDO_LOCK failed\n");
+        /* disable the kernel's lock logic */
+        err = ioctl(fd, CDROM_CLEAR_OPTIONS, CDO_LOCK);
+        if (err < 0)
+                info(udev, "CDROM_CLEAR_OPTIONS, CDO_LOCK failed\n");
 
-	err = ioctl(fd, CDROM_LOCKDOOR, lock ? 1 : 0);
-	if (err < 0)
-		info(udev, "CDROM_LOCKDOOR failed\n");
+        err = ioctl(fd, CDROM_LOCKDOOR, lock ? 1 : 0);
+        if (err < 0)
+                info(udev, "CDROM_LOCKDOOR failed\n");
 
-	return err;
+        return err;
 }
 
 static int media_eject(struct udev *udev, int fd)
 {
-	struct scsi_cmd sc;
-	int err;
-
-	scsi_cmd_init(udev, &sc);
-	scsi_cmd_set(udev, &sc, 0, 0x1b);
-	scsi_cmd_set(udev, &sc, 4, 0x02);
-	scsi_cmd_set(udev, &sc, 5, 0);
-	err = scsi_cmd_run(udev, &sc, fd, NULL, 0);
-	if ((err != 0)) {
-		info_scsi_cmd_err(udev, "START_STOP_UNIT", err);
-		return -1;
-	}
-	return 0;
+        struct scsi_cmd sc;
+        int err;
+
+        scsi_cmd_init(udev, &sc);
+        scsi_cmd_set(udev, &sc, 0, 0x1b);
+        scsi_cmd_set(udev, &sc, 4, 0x02);
+        scsi_cmd_set(udev, &sc, 5, 0);
+        err = scsi_cmd_run(udev, &sc, fd, NULL, 0);
+        if ((err != 0)) {
+                info_scsi_cmd_err(udev, "START_STOP_UNIT", err);
+                return -1;
+        }
+        return 0;
 }
 
 static int cd_capability_compat(struct udev *udev, int fd)
 {
-	int capability;
-
-	capability = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
-	if (capability < 0) {
-		info(udev, "CDROM_GET_CAPABILITY failed\n");
-		return -1;
-	}
-
-	if (capability & CDC_CD_R)
-		cd_cd_r = 1;
-	if (capability & CDC_CD_RW)
-		cd_cd_rw = 1;
-	if (capability & CDC_DVD)
-		cd_dvd_rom = 1;
-	if (capability & CDC_DVD_R)
-		cd_dvd_r = 1;
-	if (capability & CDC_DVD_RAM)
-		cd_dvd_ram = 1;
-	if (capability & CDC_MRW)
-		cd_mrw = 1;
-	if (capability & CDC_MRW_W)
-		cd_mrw_w = 1;
-	return 0;
+        int capability;
+
+        capability = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
+        if (capability < 0) {
+                info(udev, "CDROM_GET_CAPABILITY failed\n");
+                return -1;
+        }
+
+        if (capability & CDC_CD_R)
+                cd_cd_r = 1;
+        if (capability & CDC_CD_RW)
+                cd_cd_rw = 1;
+        if (capability & CDC_DVD)
+                cd_dvd_rom = 1;
+        if (capability & CDC_DVD_R)
+                cd_dvd_r = 1;
+        if (capability & CDC_DVD_RAM)
+                cd_dvd_ram = 1;
+        if (capability & CDC_MRW)
+                cd_mrw = 1;
+        if (capability & CDC_MRW_W)
+                cd_mrw_w = 1;
+        return 0;
 }
 
 static int cd_media_compat(struct udev *udev, int fd)
 {
-	if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) != CDS_DISC_OK) {
-		info(udev, "CDROM_DRIVE_STATUS != CDS_DISC_OK\n");
-		return -1;
-	}
-	cd_media = 1;
-	return 0;
+        if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) != CDS_DISC_OK) {
+                info(udev, "CDROM_DRIVE_STATUS != CDS_DISC_OK\n");
+                return -1;
+        }
+        cd_media = 1;
+        return 0;
 }
 
 static int cd_inquiry(struct udev *udev, int fd)
 {
-	struct scsi_cmd sc;
-	unsigned char inq[128];
-	int err;
-
-	scsi_cmd_init(udev, &sc);
-	scsi_cmd_set(udev, &sc, 0, 0x12);
-	scsi_cmd_set(udev, &sc, 4, 36);
-	scsi_cmd_set(udev, &sc, 5, 0);
-	err = scsi_cmd_run(udev, &sc, fd, inq, 36);
-	if ((err != 0)) {
-		info_scsi_cmd_err(udev, "INQUIRY", err);
-		return -1;
-	}
-
-	if ((inq[0] & 0x1F) != 5) {
-		info(udev, "not an MMC unit\n");
-		return -1;
-	}
-
-	info(udev, "INQUIRY: [%.8s][%.16s][%.4s]\n", inq + 8, inq + 16, inq + 32);
-	return 0;
+        struct scsi_cmd sc;
+        unsigned char inq[128];
+        int err;
+
+        scsi_cmd_init(udev, &sc);
+        scsi_cmd_set(udev, &sc, 0, 0x12);
+        scsi_cmd_set(udev, &sc, 4, 36);
+        scsi_cmd_set(udev, &sc, 5, 0);
+        err = scsi_cmd_run(udev, &sc, fd, inq, 36);
+        if ((err != 0)) {
+                info_scsi_cmd_err(udev, "INQUIRY", err);
+                return -1;
+        }
+
+        if ((inq[0] & 0x1F) != 5) {
+                info(udev, "not an MMC unit\n");
+                return -1;
+        }
+
+        info(udev, "INQUIRY: [%.8s][%.16s][%.4s]\n", inq + 8, inq + 16, inq + 32);
+        return 0;
 }
 
 static void feature_profile_media(struct udev *udev, int cur_profile)
 {
-	switch (cur_profile) {
-	case 0x03:
-	case 0x04:
-	case 0x05:
-		info(udev, "profile 0x%02x \n", cur_profile);
-		cd_media = 1;
-		cd_media_mo = 1;
-		break;
-	case 0x08:
-		info(udev, "profile 0x%02x media_cd_rom\n", cur_profile);
-		cd_media = 1;
-		cd_media_cd_rom = 1;
-		break;
-	case 0x09:
-		info(udev, "profile 0x%02x media_cd_r\n", cur_profile);
-		cd_media = 1;
-		cd_media_cd_r = 1;
-		break;
-	case 0x0a:
-		info(udev, "profile 0x%02x media_cd_rw\n", cur_profile);
-		cd_media = 1;
-		cd_media_cd_rw = 1;
-		break;
-	case 0x10:
-		info(udev, "profile 0x%02x media_dvd_ro\n", cur_profile);
-		cd_media = 1;
-		cd_media_dvd_rom = 1;
-		break;
-	case 0x11:
-		info(udev, "profile 0x%02x media_dvd_r\n", cur_profile);
-		cd_media = 1;
-		cd_media_dvd_r = 1;
-		break;
-	case 0x12:
-		info(udev, "profile 0x%02x media_dvd_ram\n", cur_profile);
-		cd_media = 1;
-		cd_media_dvd_ram = 1;
-		break;
-	case 0x13:
-		info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile);
-		cd_media = 1;
-		cd_media_dvd_rw = 1;
-		cd_media_dvd_rw_ro = 1;
-		break;
-	case 0x14:
-		info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile);
-		cd_media = 1;
-		cd_media_dvd_rw = 1;
-		cd_media_dvd_rw_seq = 1;
-		break;
-	case 0x1B:
-		info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile);
-		cd_media = 1;
-		cd_media_dvd_plus_r = 1;
-		break;
-	case 0x1A:
-		info(udev, "profile 0x%02x media_dvd_plus_rw\n", cur_profile);
-		cd_media = 1;
-		cd_media_dvd_plus_rw = 1;
-		break;
-	case 0x2A:
-		info(udev, "profile 0x%02x media_dvd_plus_rw_dl\n", cur_profile);
-		cd_media = 1;
-		cd_media_dvd_plus_rw_dl = 1;
-		break;
-	case 0x2B:
-		info(udev, "profile 0x%02x media_dvd_plus_r_dl\n", cur_profile);
-		cd_media = 1;
-		cd_media_dvd_plus_r_dl = 1;
-		break;
-	case 0x40:
-		info(udev, "profile 0x%02x media_bd\n", cur_profile);
-		cd_media = 1;
-		cd_media_bd = 1;
-		break;
-	case 0x41:
-	case 0x42:
-		info(udev, "profile 0x%02x media_bd_r\n", cur_profile);
-		cd_media = 1;
-		cd_media_bd_r = 1;
-		break;
-	case 0x43:
-		info(udev, "profile 0x%02x media_bd_re\n", cur_profile);
-		cd_media = 1;
-		cd_media_bd_re = 1;
-		break;
-	case 0x50:
-		info(udev, "profile 0x%02x media_hddvd\n", cur_profile);
-		cd_media = 1;
-		cd_media_hddvd = 1;
-		break;
-	case 0x51:
-		info(udev, "profile 0x%02x media_hddvd_r\n", cur_profile);
-		cd_media = 1;
-		cd_media_hddvd_r = 1;
-		break;
-	case 0x52:
-		info(udev, "profile 0x%02x media_hddvd_rw\n", cur_profile);
-		cd_media = 1;
-		cd_media_hddvd_rw = 1;
-		break;
-	default:
-		info(udev, "profile 0x%02x <ignored>\n", cur_profile);
-		break;
-	}
+        switch (cur_profile) {
+        case 0x03:
+        case 0x04:
+        case 0x05:
+                info(udev, "profile 0x%02x \n", cur_profile);
+                cd_media = 1;
+                cd_media_mo = 1;
+                break;
+        case 0x08:
+                info(udev, "profile 0x%02x media_cd_rom\n", cur_profile);
+                cd_media = 1;
+                cd_media_cd_rom = 1;
+                break;
+        case 0x09:
+                info(udev, "profile 0x%02x media_cd_r\n", cur_profile);
+                cd_media = 1;
+                cd_media_cd_r = 1;
+                break;
+        case 0x0a:
+                info(udev, "profile 0x%02x media_cd_rw\n", cur_profile);
+                cd_media = 1;
+                cd_media_cd_rw = 1;
+                break;
+        case 0x10:
+                info(udev, "profile 0x%02x media_dvd_ro\n", cur_profile);
+                cd_media = 1;
+                cd_media_dvd_rom = 1;
+                break;
+        case 0x11:
+                info(udev, "profile 0x%02x media_dvd_r\n", cur_profile);
+                cd_media = 1;
+                cd_media_dvd_r = 1;
+                break;
+        case 0x12:
+                info(udev, "profile 0x%02x media_dvd_ram\n", cur_profile);
+                cd_media = 1;
+                cd_media_dvd_ram = 1;
+                break;
+        case 0x13:
+                info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile);
+                cd_media = 1;
+                cd_media_dvd_rw = 1;
+                cd_media_dvd_rw_ro = 1;
+                break;
+        case 0x14:
+                info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile);
+                cd_media = 1;
+                cd_media_dvd_rw = 1;
+                cd_media_dvd_rw_seq = 1;
+                break;
+        case 0x1B:
+                info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile);
+                cd_media = 1;
+                cd_media_dvd_plus_r = 1;
+                break;
+        case 0x1A:
+                info(udev, "profile 0x%02x media_dvd_plus_rw\n", cur_profile);
+                cd_media = 1;
+                cd_media_dvd_plus_rw = 1;
+                break;
+        case 0x2A:
+                info(udev, "profile 0x%02x media_dvd_plus_rw_dl\n", cur_profile);
+                cd_media = 1;
+                cd_media_dvd_plus_rw_dl = 1;
+                break;
+        case 0x2B:
+                info(udev, "profile 0x%02x media_dvd_plus_r_dl\n", cur_profile);
+                cd_media = 1;
+                cd_media_dvd_plus_r_dl = 1;
+                break;
+        case 0x40:
+                info(udev, "profile 0x%02x media_bd\n", cur_profile);
+                cd_media = 1;
+                cd_media_bd = 1;
+                break;
+        case 0x41:
+        case 0x42:
+                info(udev, "profile 0x%02x media_bd_r\n", cur_profile);
+                cd_media = 1;
+                cd_media_bd_r = 1;
+                break;
+        case 0x43:
+                info(udev, "profile 0x%02x media_bd_re\n", cur_profile);
+                cd_media = 1;
+                cd_media_bd_re = 1;
+                break;
+        case 0x50:
+                info(udev, "profile 0x%02x media_hddvd\n", cur_profile);
+                cd_media = 1;
+                cd_media_hddvd = 1;
+                break;
+        case 0x51:
+                info(udev, "profile 0x%02x media_hddvd_r\n", cur_profile);
+                cd_media = 1;
+                cd_media_hddvd_r = 1;
+                break;
+        case 0x52:
+                info(udev, "profile 0x%02x media_hddvd_rw\n", cur_profile);
+                cd_media = 1;
+                cd_media_hddvd_rw = 1;
+                break;
+        default:
+                info(udev, "profile 0x%02x <ignored>\n", cur_profile);
+                break;
+        }
 }
 
 static int feature_profiles(struct udev *udev, const unsigned char *profiles, size_t size)
 {
-	unsigned int i;
-
-	for (i = 0; i+4 <= size; i += 4) {
-		int profile;
-
-		profile = profiles[i] << 8 | profiles[i+1];
-		switch (profile) {
-		case 0x03:
-		case 0x04:
-		case 0x05:
-			info(udev, "profile 0x%02x mo\n", profile);
-			cd_mo = 1;
-			break;
-		case 0x08:
-			info(udev, "profile 0x%02x cd_rom\n", profile);
-			cd_cd_rom = 1;
-			break;
-		case 0x09:
-			info(udev, "profile 0x%02x cd_r\n", profile);
-			cd_cd_r = 1;
-			break;
-		case 0x0A:
-			info(udev, "profile 0x%02x cd_rw\n", profile);
-			cd_cd_rw = 1;
-			break;
-		case 0x10:
-			info(udev, "profile 0x%02x dvd_rom\n", profile);
-			cd_dvd_rom = 1;
-			break;
-		case 0x12:
-			info(udev, "profile 0x%02x dvd_ram\n", profile);
-			cd_dvd_ram = 1;
-			break;
-		case 0x13:
-		case 0x14:
-			info(udev, "profile 0x%02x dvd_rw\n", profile);
-			cd_dvd_rw = 1;
-			break;
-		case 0x1B:
-			info(udev, "profile 0x%02x dvd_plus_r\n", profile);
-			cd_dvd_plus_r = 1;
-			break;
-		case 0x1A:
-			info(udev, "profile 0x%02x dvd_plus_rw\n", profile);
-			cd_dvd_plus_rw = 1;
-			break;
-		case 0x2A:
-			info(udev, "profile 0x%02x dvd_plus_rw_dl\n", profile);
-			cd_dvd_plus_rw_dl = 1;
-			break;
-		case 0x2B:
-			info(udev, "profile 0x%02x dvd_plus_r_dl\n", profile);
-			cd_dvd_plus_r_dl = 1;
-			break;
-		case 0x40:
-			cd_bd = 1;
-			info(udev, "profile 0x%02x bd\n", profile);
-			break;
-		case 0x41:
-		case 0x42:
-			cd_bd_r = 1;
-			info(udev, "profile 0x%02x bd_r\n", profile);
-			break;
-		case 0x43:
-			cd_bd_re = 1;
-			info(udev, "profile 0x%02x bd_re\n", profile);
-			break;
-		case 0x50:
-			cd_hddvd = 1;
-			info(udev, "profile 0x%02x hddvd\n", profile);
-			break;
-		case 0x51:
-			cd_hddvd_r = 1;
-			info(udev, "profile 0x%02x hddvd_r\n", profile);
-			break;
-		case 0x52:
-			cd_hddvd_rw = 1;
-			info(udev, "profile 0x%02x hddvd_rw\n", profile);
-			break;
-		default:
-			info(udev, "profile 0x%02x <ignored>\n", profile);
-			break;
-		}
-	}
-	return 0;
+        unsigned int i;
+
+        for (i = 0; i+4 <= size; i += 4) {
+                int profile;
+
+                profile = profiles[i] << 8 | profiles[i+1];
+                switch (profile) {
+                case 0x03:
+                case 0x04:
+                case 0x05:
+                        info(udev, "profile 0x%02x mo\n", profile);
+                        cd_mo = 1;
+                        break;
+                case 0x08:
+                        info(udev, "profile 0x%02x cd_rom\n", profile);
+                        cd_cd_rom = 1;
+                        break;
+                case 0x09:
+                        info(udev, "profile 0x%02x cd_r\n", profile);
+                        cd_cd_r = 1;
+                        break;
+                case 0x0A:
+                        info(udev, "profile 0x%02x cd_rw\n", profile);
+                        cd_cd_rw = 1;
+                        break;
+                case 0x10:
+                        info(udev, "profile 0x%02x dvd_rom\n", profile);
+                        cd_dvd_rom = 1;
+                        break;
+                case 0x12:
+                        info(udev, "profile 0x%02x dvd_ram\n", profile);
+                        cd_dvd_ram = 1;
+                        break;
+                case 0x13:
+                case 0x14:
+                        info(udev, "profile 0x%02x dvd_rw\n", profile);
+                        cd_dvd_rw = 1;
+                        break;
+                case 0x1B:
+                        info(udev, "profile 0x%02x dvd_plus_r\n", profile);
+                        cd_dvd_plus_r = 1;
+                        break;
+                case 0x1A:
+                        info(udev, "profile 0x%02x dvd_plus_rw\n", profile);
+                        cd_dvd_plus_rw = 1;
+                        break;
+                case 0x2A:
+                        info(udev, "profile 0x%02x dvd_plus_rw_dl\n", profile);
+                        cd_dvd_plus_rw_dl = 1;
+                        break;
+                case 0x2B:
+                        info(udev, "profile 0x%02x dvd_plus_r_dl\n", profile);
+                        cd_dvd_plus_r_dl = 1;
+                        break;
+                case 0x40:
+                        cd_bd = 1;
+                        info(udev, "profile 0x%02x bd\n", profile);
+                        break;
+                case 0x41:
+                case 0x42:
+                        cd_bd_r = 1;
+                        info(udev, "profile 0x%02x bd_r\n", profile);
+                        break;
+                case 0x43:
+                        cd_bd_re = 1;
+                        info(udev, "profile 0x%02x bd_re\n", profile);
+                        break;
+                case 0x50:
+                        cd_hddvd = 1;
+                        info(udev, "profile 0x%02x hddvd\n", profile);
+                        break;
+                case 0x51:
+                        cd_hddvd_r = 1;
+                        info(udev, "profile 0x%02x hddvd_r\n", profile);
+                        break;
+                case 0x52:
+                        cd_hddvd_rw = 1;
+                        info(udev, "profile 0x%02x hddvd_rw\n", profile);
+                        break;
+                default:
+                        info(udev, "profile 0x%02x <ignored>\n", profile);
+                        break;
+                }
+        }
+        return 0;
 }
 
 /* returns 0 if media was detected */
 static int cd_profiles_old_mmc(struct udev *udev, int fd)
 {
-	struct scsi_cmd sc;
-	int err;
-
-	unsigned char header[32];
-
-	scsi_cmd_init(udev, &sc);
-	scsi_cmd_set(udev, &sc, 0, 0x51);
-	scsi_cmd_set(udev, &sc, 8, sizeof(header));
-	scsi_cmd_set(udev, &sc, 9, 0);
-	err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
-	if ((err != 0)) {
-		info_scsi_cmd_err(udev, "READ DISC INFORMATION", err);
-		if (cd_media == 1) {
-			info(udev, "no current profile, but disc is present; assuming CD-ROM\n");
-			cd_media_cd_rom = 1;
-			return 0;
-		} else {
-			info(udev, "no current profile, assuming no media\n");
-			return -1;
-		}
-	};
-
-	cd_media = 1;
-
-	if (header[2] & 16) {
-		cd_media_cd_rw = 1;
-		info(udev, "profile 0x0a media_cd_rw\n");
-	} else if ((header[2] & 3) < 2 && cd_cd_r) {
-		cd_media_cd_r = 1;
-		info(udev, "profile 0x09 media_cd_r\n");
-	} else {
-		cd_media_cd_rom = 1;
-		info(udev, "profile 0x08 media_cd_rom\n");
-	}
-	return 0;
+        struct scsi_cmd sc;
+        int err;
+
+        unsigned char header[32];
+
+        scsi_cmd_init(udev, &sc);
+        scsi_cmd_set(udev, &sc, 0, 0x51);
+        scsi_cmd_set(udev, &sc, 8, sizeof(header));
+        scsi_cmd_set(udev, &sc, 9, 0);
+        err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
+        if ((err != 0)) {
+                info_scsi_cmd_err(udev, "READ DISC INFORMATION", err);
+                if (cd_media == 1) {
+                        info(udev, "no current profile, but disc is present; assuming CD-ROM\n");
+                        cd_media_cd_rom = 1;
+                        return 0;
+                } else {
+                        info(udev, "no current profile, assuming no media\n");
+                        return -1;
+                }
+        };
+
+        cd_media = 1;
+
+        if (header[2] & 16) {
+                cd_media_cd_rw = 1;
+                info(udev, "profile 0x0a media_cd_rw\n");
+        } else if ((header[2] & 3) < 2 && cd_cd_r) {
+                cd_media_cd_r = 1;
+                info(udev, "profile 0x09 media_cd_r\n");
+        } else {
+                cd_media_cd_rom = 1;
+                info(udev, "profile 0x08 media_cd_rom\n");
+        }
+        return 0;
 }
 
 /* returns 0 if media was detected */
 static int cd_profiles(struct udev *udev, int fd)
 {
-	struct scsi_cmd sc;
-	unsigned char features[65530];
-	unsigned int cur_profile = 0;
-	unsigned int len;
-	unsigned int i;
-	int err;
-	int ret;
-
-	ret = -1;
-
-	/* First query the current profile */
-	scsi_cmd_init(udev, &sc);
-	scsi_cmd_set(udev, &sc, 0, 0x46);
-	scsi_cmd_set(udev, &sc, 8, 8);
-	scsi_cmd_set(udev, &sc, 9, 0);
-	err = scsi_cmd_run(udev, &sc, fd, features, 8);
-	if ((err != 0)) {
-		info_scsi_cmd_err(udev, "GET CONFIGURATION", err);
-		/* handle pre-MMC2 drives which do not support GET CONFIGURATION */
-		if (SK(err) == 0x5 && ASC(err) == 0x20) {
-			info(udev, "drive is pre-MMC2 and does not support 46h get configuration command\n");
-			info(udev, "trying to work around the problem\n");
-			ret = cd_profiles_old_mmc(udev, fd);
-		}
-		goto out;
-	}
-
-	cur_profile = features[6] << 8 | features[7];
-	if (cur_profile > 0) {
-		info(udev, "current profile 0x%02x\n", cur_profile);
-		feature_profile_media (udev, cur_profile);
-		ret = 0; /* we have media */
-	} else {
-		info(udev, "no current profile, assuming no media\n");
-	}
-
-	len = features[0] << 24 | features[1] << 16 | features[2] << 8 | features[3];
-	info(udev, "GET CONFIGURATION: size of features buffer 0x%04x\n", len);
-
-	if (len > sizeof(features)) {
-		info(udev, "can not get features in a single query, truncating\n");
-		len = sizeof(features);
-	} else if (len <= 8) {
-		len = sizeof(features);
-	}
-
-	/* Now get the full feature buffer */
-	scsi_cmd_init(udev, &sc);
-	scsi_cmd_set(udev, &sc, 0, 0x46);
-	scsi_cmd_set(udev, &sc, 7, ( len >> 8 ) & 0xff);
-	scsi_cmd_set(udev, &sc, 8, len & 0xff);
-	scsi_cmd_set(udev, &sc, 9, 0);
-	err = scsi_cmd_run(udev, &sc, fd, features, len);
-	if ((err != 0)) {
-		info_scsi_cmd_err(udev, "GET CONFIGURATION", err);
-		return -1;
-	}
-
-	/* parse the length once more, in case the drive decided to have other features suddenly :) */
-	len = features[0] << 24 | features[1] << 16 | features[2] << 8 | features[3];
-	info(udev, "GET CONFIGURATION: size of features buffer 0x%04x\n", len);
-
-	if (len > sizeof(features)) {
-		info(udev, "can not get features in a single query, truncating\n");
-		len = sizeof(features);
-	}
-
-	/* device features */
-	for (i = 8; i+4 < len; i += (4 + features[i+3])) {
-		unsigned int feature;
-
-		feature = features[i] << 8 | features[i+1];
-
-		switch (feature) {
-		case 0x00:
-			info(udev, "GET CONFIGURATION: feature 'profiles', with %i entries\n", features[i+3] / 4);
-			feature_profiles(udev, &features[i]+4, features[i+3]);
-			break;
-		default:
-			info(udev, "GET CONFIGURATION: feature 0x%04x <ignored>, with 0x%02x bytes\n", feature, features[i+3]);
-			break;
-		}
-	}
+        struct scsi_cmd sc;
+        unsigned char features[65530];
+        unsigned int cur_profile = 0;
+        unsigned int len;
+        unsigned int i;
+        int err;
+        int ret;
+
+        ret = -1;
+
+        /* First query the current profile */
+        scsi_cmd_init(udev, &sc);
+        scsi_cmd_set(udev, &sc, 0, 0x46);
+        scsi_cmd_set(udev, &sc, 8, 8);
+        scsi_cmd_set(udev, &sc, 9, 0);
+        err = scsi_cmd_run(udev, &sc, fd, features, 8);
+        if ((err != 0)) {
+                info_scsi_cmd_err(udev, "GET CONFIGURATION", err);
+                /* handle pre-MMC2 drives which do not support GET CONFIGURATION */
+                if (SK(err) == 0x5 && ASC(err) == 0x20) {
+                        info(udev, "drive is pre-MMC2 and does not support 46h get configuration command\n");
+                        info(udev, "trying to work around the problem\n");
+                        ret = cd_profiles_old_mmc(udev, fd);
+                }
+                goto out;
+        }
+
+        cur_profile = features[6] << 8 | features[7];
+        if (cur_profile > 0) {
+                info(udev, "current profile 0x%02x\n", cur_profile);
+                feature_profile_media (udev, cur_profile);
+                ret = 0; /* we have media */
+        } else {
+                info(udev, "no current profile, assuming no media\n");
+        }
+
+        len = features[0] << 24 | features[1] << 16 | features[2] << 8 | features[3];
+        info(udev, "GET CONFIGURATION: size of features buffer 0x%04x\n", len);
+
+        if (len > sizeof(features)) {
+                info(udev, "can not get features in a single query, truncating\n");
+                len = sizeof(features);
+        } else if (len <= 8) {
+                len = sizeof(features);
+        }
+
+        /* Now get the full feature buffer */
+        scsi_cmd_init(udev, &sc);
+        scsi_cmd_set(udev, &sc, 0, 0x46);
+        scsi_cmd_set(udev, &sc, 7, ( len >> 8 ) & 0xff);
+        scsi_cmd_set(udev, &sc, 8, len & 0xff);
+        scsi_cmd_set(udev, &sc, 9, 0);
+        err = scsi_cmd_run(udev, &sc, fd, features, len);
+        if ((err != 0)) {
+                info_scsi_cmd_err(udev, "GET CONFIGURATION", err);
+                return -1;
+        }
+
+        /* parse the length once more, in case the drive decided to have other features suddenly :) */
+        len = features[0] << 24 | features[1] << 16 | features[2] << 8 | features[3];
+        info(udev, "GET CONFIGURATION: size of features buffer 0x%04x\n", len);
+
+        if (len > sizeof(features)) {
+                info(udev, "can not get features in a single query, truncating\n");
+                len = sizeof(features);
+        }
+
+        /* device features */
+        for (i = 8; i+4 < len; i += (4 + features[i+3])) {
+                unsigned int feature;
+
+                feature = features[i] << 8 | features[i+1];
+
+                switch (feature) {
+                case 0x00:
+                        info(udev, "GET CONFIGURATION: feature 'profiles', with %i entries\n", features[i+3] / 4);
+                        feature_profiles(udev, &features[i]+4, features[i+3]);
+                        break;
+                default:
+                        info(udev, "GET CONFIGURATION: feature 0x%04x <ignored>, with 0x%02x bytes\n", feature, features[i+3]);
+                        break;
+                }
+        }
 out:
-	return ret;
+        return ret;
 }
 
 static int cd_media_info(struct udev *udev, int fd)
 {
-	struct scsi_cmd sc;
-	unsigned char header[32];
-	static const char *media_status[] = {
-		"blank",
-		"appendable",
-		"complete",
-		"other"
-	};
-	int err;
-
-	scsi_cmd_init(udev, &sc);
-	scsi_cmd_set(udev, &sc, 0, 0x51);
-	scsi_cmd_set(udev, &sc, 8, sizeof(header) & 0xff);
-	scsi_cmd_set(udev, &sc, 9, 0);
-	err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
-	if ((err != 0)) {
-		info_scsi_cmd_err(udev, "READ DISC INFORMATION", err);
-		return -1;
-	};
-
-	cd_media = 1;
-	info(udev, "disk type %02x\n", header[8]);
-	info(udev, "hardware reported media status: %s\n", media_status[header[2] & 3]);
-
-	/* exclude plain CDROM, some fake cdroms return 0 for "blank" media here */
-	if (!cd_media_cd_rom)
-		cd_media_state = media_status[header[2] & 3];
-
-	/* fresh DVD-RW in restricted overwite mode reports itself as
-	 * "appendable"; change it to "blank" to make it consistent with what
-	 * gets reported after blanking, and what userspace expects  */
-	if (cd_media_dvd_rw_ro && (header[2] & 3) == 1)
-		cd_media_state = media_status[0];
-
-	/* DVD+RW discs (and DVD-RW in restricted mode) once formatted are
-	 * always "complete", DVD-RAM are "other" or "complete" if the disc is
-	 * write protected; we need to check the contents if it is blank */
-	if ((cd_media_dvd_rw_ro || cd_media_dvd_plus_rw || cd_media_dvd_plus_rw_dl || cd_media_dvd_ram) && (header[2] & 3) > 1) {
-		unsigned char buffer[32 * 2048];
-		unsigned char result, len;
-		int block, offset;
-
-		if (cd_media_dvd_ram) {
-			/* a write protected dvd-ram may report "complete" status */
-
-			unsigned char dvdstruct[8];
-			unsigned char format[12];
-
-			scsi_cmd_init(udev, &sc);
-			scsi_cmd_set(udev, &sc, 0, 0xAD);
-			scsi_cmd_set(udev, &sc, 7, 0xC0);
-			scsi_cmd_set(udev, &sc, 9, sizeof(dvdstruct));
-			scsi_cmd_set(udev, &sc, 11, 0);
-			err = scsi_cmd_run(udev, &sc, fd, dvdstruct, sizeof(dvdstruct));
-			if ((err != 0)) {
-				info_scsi_cmd_err(udev, "READ DVD STRUCTURE", err);
-				return -1;
-			}
-			if (dvdstruct[4] & 0x02) {
-				cd_media_state = media_status[2];
-				info(udev, "write-protected DVD-RAM media inserted\n");
-				goto determined;
-			}
-
-			/* let's make sure we don't try to read unformatted media */
-			scsi_cmd_init(udev, &sc);
-			scsi_cmd_set(udev, &sc, 0, 0x23);
-			scsi_cmd_set(udev, &sc, 8, sizeof(format));
-			scsi_cmd_set(udev, &sc, 9, 0);
-			err = scsi_cmd_run(udev, &sc, fd, format, sizeof(format));
-			if ((err != 0)) {
-				info_scsi_cmd_err(udev, "READ DVD FORMAT CAPACITIES", err);
-				return -1;
-			}
-
-			len = format[3];
-			if (len & 7 || len < 16) {
-				info(udev, "invalid format capacities length\n");
-				return -1;
-			}
-
-			switch(format[8] & 3) {
-			    case 1:
-				info(udev, "unformatted DVD-RAM media inserted\n");
-				/* This means that last format was interrupted
-				 * or failed, blank dvd-ram discs are factory
-				 * formatted. Take no action here as it takes
-				 * quite a while to reformat a dvd-ram and it's
-				 * not automatically started */
-				goto determined;
-
-			    case 2:
-				info(udev, "formatted DVD-RAM media inserted\n");
-				break;
-
-			    case 3:
-				cd_media = 0; //return no media
-				info(udev, "format capacities returned no media\n");
-				return -1;
-			}
-		}
-
-		/* Take a closer look at formatted media (unformatted DVD+RW
-		 * has "blank" status", DVD-RAM was examined earlier) and check
-		 * for ISO and UDF PVDs or a fs superblock presence and do it
-		 * in one ioctl (we need just sectors 0 and 16) */
-		scsi_cmd_init(udev, &sc);
-		scsi_cmd_set(udev, &sc, 0, 0x28);
-		scsi_cmd_set(udev, &sc, 5, 0);
-		scsi_cmd_set(udev, &sc, 8, 32);
-		scsi_cmd_set(udev, &sc, 9, 0);
-		err = scsi_cmd_run(udev, &sc, fd, buffer, sizeof(buffer));
-		if ((err != 0)) {
-			cd_media = 0;
-			info_scsi_cmd_err(udev, "READ FIRST 32 BLOCKS", err);
-			return -1;
-		}
-
-		/* if any non-zero data is found in sector 16 (iso and udf) or
-		 * eventually 0 (fat32 boot sector, ext2 superblock, etc), disc
-		 * is assumed non-blank */
-		result = 0;
-
-		for (block = 32768; block >= 0 && !result; block -= 32768) {
-			offset = block;
-			while (offset < (block + 2048) && !result) {
-				result = buffer [offset];
-				offset++;
-			}
-		}
-
-		if (!result) {
-			cd_media_state = media_status[0];
-			info(udev, "no data in blocks 0 or 16, assuming blank\n");
-		} else {
-			info(udev, "data in blocks 0 or 16, assuming complete\n");
-		}
-	}
+        struct scsi_cmd sc;
+        unsigned char header[32];
+        static const char *media_status[] = {
+                "blank",
+                "appendable",
+                "complete",
+                "other"
+        };
+        int err;
+
+        scsi_cmd_init(udev, &sc);
+        scsi_cmd_set(udev, &sc, 0, 0x51);
+        scsi_cmd_set(udev, &sc, 8, sizeof(header) & 0xff);
+        scsi_cmd_set(udev, &sc, 9, 0);
+        err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
+        if ((err != 0)) {
+                info_scsi_cmd_err(udev, "READ DISC INFORMATION", err);
+                return -1;
+        };
+
+        cd_media = 1;
+        info(udev, "disk type %02x\n", header[8]);
+        info(udev, "hardware reported media status: %s\n", media_status[header[2] & 3]);
+
+        /* exclude plain CDROM, some fake cdroms return 0 for "blank" media here */
+        if (!cd_media_cd_rom)
+                cd_media_state = media_status[header[2] & 3];
+
+        /* fresh DVD-RW in restricted overwite mode reports itself as
+         * "appendable"; change it to "blank" to make it consistent with what
+         * gets reported after blanking, and what userspace expects  */
+        if (cd_media_dvd_rw_ro && (header[2] & 3) == 1)
+                cd_media_state = media_status[0];
+
+        /* DVD+RW discs (and DVD-RW in restricted mode) once formatted are
+         * always "complete", DVD-RAM are "other" or "complete" if the disc is
+         * write protected; we need to check the contents if it is blank */
+        if ((cd_media_dvd_rw_ro || cd_media_dvd_plus_rw || cd_media_dvd_plus_rw_dl || cd_media_dvd_ram) && (header[2] & 3) > 1) {
+                unsigned char buffer[32 * 2048];
+                unsigned char result, len;
+                int block, offset;
+
+                if (cd_media_dvd_ram) {
+                        /* a write protected dvd-ram may report "complete" status */
+
+                        unsigned char dvdstruct[8];
+                        unsigned char format[12];
+
+                        scsi_cmd_init(udev, &sc);
+                        scsi_cmd_set(udev, &sc, 0, 0xAD);
+                        scsi_cmd_set(udev, &sc, 7, 0xC0);
+                        scsi_cmd_set(udev, &sc, 9, sizeof(dvdstruct));
+                        scsi_cmd_set(udev, &sc, 11, 0);
+                        err = scsi_cmd_run(udev, &sc, fd, dvdstruct, sizeof(dvdstruct));
+                        if ((err != 0)) {
+                                info_scsi_cmd_err(udev, "READ DVD STRUCTURE", err);
+                                return -1;
+                        }
+                        if (dvdstruct[4] & 0x02) {
+                                cd_media_state = media_status[2];
+                                info(udev, "write-protected DVD-RAM media inserted\n");
+                                goto determined;
+                        }
+
+                        /* let's make sure we don't try to read unformatted media */
+                        scsi_cmd_init(udev, &sc);
+                        scsi_cmd_set(udev, &sc, 0, 0x23);
+                        scsi_cmd_set(udev, &sc, 8, sizeof(format));
+                        scsi_cmd_set(udev, &sc, 9, 0);
+                        err = scsi_cmd_run(udev, &sc, fd, format, sizeof(format));
+                        if ((err != 0)) {
+                                info_scsi_cmd_err(udev, "READ DVD FORMAT CAPACITIES", err);
+                                return -1;
+                        }
+
+                        len = format[3];
+                        if (len & 7 || len < 16) {
+                                info(udev, "invalid format capacities length\n");
+                                return -1;
+                        }
+
+                        switch(format[8] & 3) {
+                            case 1:
+                                info(udev, "unformatted DVD-RAM media inserted\n");
+                                /* This means that last format was interrupted
+                                 * or failed, blank dvd-ram discs are factory
+                                 * formatted. Take no action here as it takes
+                                 * quite a while to reformat a dvd-ram and it's
+                                 * not automatically started */
+                                goto determined;
+
+                            case 2:
+                                info(udev, "formatted DVD-RAM media inserted\n");
+                                break;
+
+                            case 3:
+                                cd_media = 0; //return no media
+                                info(udev, "format capacities returned no media\n");
+                                return -1;
+                        }
+                }
+
+                /* Take a closer look at formatted media (unformatted DVD+RW
+                 * has "blank" status", DVD-RAM was examined earlier) and check
+                 * for ISO and UDF PVDs or a fs superblock presence and do it
+                 * in one ioctl (we need just sectors 0 and 16) */
+                scsi_cmd_init(udev, &sc);
+                scsi_cmd_set(udev, &sc, 0, 0x28);
+                scsi_cmd_set(udev, &sc, 5, 0);
+                scsi_cmd_set(udev, &sc, 8, 32);
+                scsi_cmd_set(udev, &sc, 9, 0);
+                err = scsi_cmd_run(udev, &sc, fd, buffer, sizeof(buffer));
+                if ((err != 0)) {
+                        cd_media = 0;
+                        info_scsi_cmd_err(udev, "READ FIRST 32 BLOCKS", err);
+                        return -1;
+                }
+
+                /* if any non-zero data is found in sector 16 (iso and udf) or
+                 * eventually 0 (fat32 boot sector, ext2 superblock, etc), disc
+                 * is assumed non-blank */
+                result = 0;
+
+                for (block = 32768; block >= 0 && !result; block -= 32768) {
+                        offset = block;
+                        while (offset < (block + 2048) && !result) {
+                                result = buffer [offset];
+                                offset++;
+                        }
+                }
+
+                if (!result) {
+                        cd_media_state = media_status[0];
+                        info(udev, "no data in blocks 0 or 16, assuming blank\n");
+                } else {
+                        info(udev, "data in blocks 0 or 16, assuming complete\n");
+                }
+        }
 
 determined:
-	/* "other" is e. g. DVD-RAM, can't append sessions there; DVDs in
-	 * restricted overwrite mode can never append, only in sequential mode */
-	if ((header[2] & 3) < 2 && !cd_media_dvd_rw_ro)
-		cd_media_session_next = header[10] << 8 | header[5];
-	cd_media_session_count = header[9] << 8 | header[4];
-	cd_media_track_count = header[11] << 8 | header[6];
-
-	return 0;
+        /* "other" is e. g. DVD-RAM, can't append sessions there; DVDs in
+         * restricted overwrite mode can never append, only in sequential mode */
+        if ((header[2] & 3) < 2 && !cd_media_dvd_rw_ro)
+                cd_media_session_next = header[10] << 8 | header[5];
+        cd_media_session_count = header[9] << 8 | header[4];
+        cd_media_track_count = header[11] << 8 | header[6];
+
+        return 0;
 }
 
 static int cd_media_toc(struct udev *udev, int fd)
 {
-	struct scsi_cmd sc;
-	unsigned char header[12];
-	unsigned char toc[65536];
-	unsigned int len, i, num_tracks;
-	unsigned char *p;
-	int err;
-
-	scsi_cmd_init(udev, &sc);
-	scsi_cmd_set(udev, &sc, 0, 0x43);
-	scsi_cmd_set(udev, &sc, 6, 1);
-	scsi_cmd_set(udev, &sc, 8, sizeof(header) & 0xff);
-	scsi_cmd_set(udev, &sc, 9, 0);
-	err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
-	if ((err != 0)) {
-		info_scsi_cmd_err(udev, "READ TOC", err);
-		return -1;
-	}
-
-	len = (header[0] << 8 | header[1]) + 2;
-	info(udev, "READ TOC: len: %d, start track: %d, end track: %d\n", len, header[2], header[3]);
-	if (len > sizeof(toc))
-		return -1;
-	if (len < 2)
-		return -1;
-	/* 2: first track, 3: last track */
-	num_tracks = header[3] - header[2] + 1;
-
-	/* empty media has no tracks */
-	if (len < 8)
-		return 0;
-
-	scsi_cmd_init(udev, &sc);
-	scsi_cmd_set(udev, &sc, 0, 0x43);
-	scsi_cmd_set(udev, &sc, 6, header[2]); /* First Track/Session Number */
-	scsi_cmd_set(udev, &sc, 7, (len >> 8) & 0xff);
-	scsi_cmd_set(udev, &sc, 8, len & 0xff);
-	scsi_cmd_set(udev, &sc, 9, 0);
-	err = scsi_cmd_run(udev, &sc, fd, toc, len);
-	if ((err != 0)) {
-		info_scsi_cmd_err(udev, "READ TOC (tracks)", err);
-		return -1;
-	}
-
-	/* Take care to not iterate beyond the last valid track as specified in
-	 * the TOC, but also avoid going beyond the TOC length, just in case
-	 * the last track number is invalidly large */
-	for (p = toc+4, i = 4; i < len-8 && num_tracks > 0; i += 8, p += 8, --num_tracks) {
-		unsigned int block;
-		unsigned int is_data_track;
-
-		is_data_track = (p[1] & 0x04) != 0;
-
-		block = p[4] << 24 | p[5] << 16 | p[6] << 8 | p[7];
-		info(udev, "track=%u info=0x%x(%s) start_block=%u\n",
-		     p[2], p[1] & 0x0f, is_data_track ? "data":"audio", block);
-
-		if (is_data_track)
-			cd_media_track_count_data++;
-		else
-			cd_media_track_count_audio++;
-	}
-
-	scsi_cmd_init(udev, &sc);
-	scsi_cmd_set(udev, &sc, 0, 0x43);
-	scsi_cmd_set(udev, &sc, 2, 1); /* Session Info */
-	scsi_cmd_set(udev, &sc, 8, sizeof(header));
-	scsi_cmd_set(udev, &sc, 9, 0);
-	err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
-	if ((err != 0)) {
-		info_scsi_cmd_err(udev, "READ TOC (multi session)", err);
-		return -1;
-	}
-	len = header[4+4] << 24 | header[4+5] << 16 | header[4+6] << 8 | header[4+7];
-	info(udev, "last track %u starts at block %u\n", header[4+2], len);
-	cd_media_session_last_offset = (unsigned long long int)len * 2048;
-	return 0;
+        struct scsi_cmd sc;
+        unsigned char header[12];
+        unsigned char toc[65536];
+        unsigned int len, i, num_tracks;
+        unsigned char *p;
+        int err;
+
+        scsi_cmd_init(udev, &sc);
+        scsi_cmd_set(udev, &sc, 0, 0x43);
+        scsi_cmd_set(udev, &sc, 6, 1);
+        scsi_cmd_set(udev, &sc, 8, sizeof(header) & 0xff);
+        scsi_cmd_set(udev, &sc, 9, 0);
+        err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
+        if ((err != 0)) {
+                info_scsi_cmd_err(udev, "READ TOC", err);
+                return -1;
+        }
+
+        len = (header[0] << 8 | header[1]) + 2;
+        info(udev, "READ TOC: len: %d, start track: %d, end track: %d\n", len, header[2], header[3]);
+        if (len > sizeof(toc))
+                return -1;
+        if (len < 2)
+                return -1;
+        /* 2: first track, 3: last track */
+        num_tracks = header[3] - header[2] + 1;
+
+        /* empty media has no tracks */
+        if (len < 8)
+                return 0;
+
+        scsi_cmd_init(udev, &sc);
+        scsi_cmd_set(udev, &sc, 0, 0x43);
+        scsi_cmd_set(udev, &sc, 6, header[2]); /* First Track/Session Number */
+        scsi_cmd_set(udev, &sc, 7, (len >> 8) & 0xff);
+        scsi_cmd_set(udev, &sc, 8, len & 0xff);
+        scsi_cmd_set(udev, &sc, 9, 0);
+        err = scsi_cmd_run(udev, &sc, fd, toc, len);
+        if ((err != 0)) {
+                info_scsi_cmd_err(udev, "READ TOC (tracks)", err);
+                return -1;
+        }
+
+        /* Take care to not iterate beyond the last valid track as specified in
+         * the TOC, but also avoid going beyond the TOC length, just in case
+         * the last track number is invalidly large */
+        for (p = toc+4, i = 4; i < len-8 && num_tracks > 0; i += 8, p += 8, --num_tracks) {
+                unsigned int block;
+                unsigned int is_data_track;
+
+                is_data_track = (p[1] & 0x04) != 0;
+
+                block = p[4] << 24 | p[5] << 16 | p[6] << 8 | p[7];
+                info(udev, "track=%u info=0x%x(%s) start_block=%u\n",
+                     p[2], p[1] & 0x0f, is_data_track ? "data":"audio", block);
+
+                if (is_data_track)
+                        cd_media_track_count_data++;
+                else
+                        cd_media_track_count_audio++;
+        }
+
+        scsi_cmd_init(udev, &sc);
+        scsi_cmd_set(udev, &sc, 0, 0x43);
+        scsi_cmd_set(udev, &sc, 2, 1); /* Session Info */
+        scsi_cmd_set(udev, &sc, 8, sizeof(header));
+        scsi_cmd_set(udev, &sc, 9, 0);
+        err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
+        if ((err != 0)) {
+                info_scsi_cmd_err(udev, "READ TOC (multi session)", err);
+                return -1;
+        }
+        len = header[4+4] << 24 | header[4+5] << 16 | header[4+6] << 8 | header[4+7];
+        info(udev, "last track %u starts at block %u\n", header[4+2], len);
+        cd_media_session_last_offset = (unsigned long long int)len * 2048;
+        return 0;
 }
 
 int main(int argc, char *argv[])
 {
-	struct udev *udev;
-	static const struct option options[] = {
-		{ "lock-media", no_argument, NULL, 'l' },
-		{ "unlock-media", no_argument, NULL, 'u' },
-		{ "eject-media", no_argument, NULL, 'e' },
-		{ "debug", no_argument, NULL, 'd' },
-		{ "help", no_argument, NULL, 'h' },
-		{}
-	};
-	bool eject = false;
-	bool lock = false;
-	bool unlock = false;
-	const char *node = NULL;
-	int fd = -1;
-	int cnt;
-	int rc = 0;
-
-	udev = udev_new();
-	if (udev == NULL)
-		goto exit;
-
-	udev_log_init("cdrom_id");
-	udev_set_log_fn(udev, log_fn);
-
-	while (1) {
-		int option;
-
-		option = getopt_long(argc, argv, "deluh", options, NULL);
-		if (option == -1)
-			break;
-
-		switch (option) {
-		case 'l':
-			lock = true;
-			break;
-		case 'u':
-			unlock = true;
-			break;
-		case 'e':
-			eject = true;
-			break;
-		case 'd':
-			debug = true;
-			if (udev_get_log_priority(udev) < LOG_INFO)
-				udev_set_log_priority(udev, LOG_INFO);
-			break;
-		case 'h':
-			printf("Usage: cdrom_id [options] <device>\n"
-			       "  --lock-media    lock the media (to enable eject request events)\n"
-			       "  --unlock-media  unlock the media\n"
-			       "  --eject-media   eject the media\n"
-			       "  --debug         debug to stderr\n"
-			       "  --help          print this help text\n\n");
-			goto exit;
-		default:
-			rc = 1;
-			goto exit;
-		}
-	}
-
-	node = argv[optind];
-	if (!node) {
-		err(udev, "no device\n");
-		fprintf(stderr, "no device\n");
-		rc = 1;
-		goto exit;
-	}
-
-	srand((unsigned int)getpid());
-	for (cnt = 20; cnt > 0; cnt--) {
-		struct timespec duration;
-
-		fd = open(node, O_RDONLY|O_NONBLOCK|(is_mounted(node) ? 0 : O_EXCL));
-		if (fd >= 0 || errno != EBUSY)
-			break;
-		duration.tv_sec = 0;
-		duration.tv_nsec = (100 * 1000 * 1000) + (rand() % 100 * 1000 * 1000);
-		nanosleep(&duration, NULL);
-	}
-	if (fd < 0) {
-		info(udev, "unable to open '%s'\n", node);
-		fprintf(stderr, "unable to open '%s'\n", node);
-		rc = 1;
-		goto exit;
-	}
-	info(udev, "probing: '%s'\n", node);
-
-	/* same data as original cdrom_id */
-	if (cd_capability_compat(udev, fd) < 0) {
-		rc = 1;
-		goto exit;
-	}
-
-	/* check for media - don't bail if there's no media as we still need to
+        struct udev *udev;
+        static const struct option options[] = {
+                { "lock-media", no_argument, NULL, 'l' },
+                { "unlock-media", no_argument, NULL, 'u' },
+                { "eject-media", no_argument, NULL, 'e' },
+                { "debug", no_argument, NULL, 'd' },
+                { "help", no_argument, NULL, 'h' },
+                {}
+        };
+        bool eject = false;
+        bool lock = false;
+        bool unlock = false;
+        const char *node = NULL;
+        int fd = -1;
+        int cnt;
+        int rc = 0;
+
+        udev = udev_new();
+        if (udev == NULL)
+                goto exit;
+
+        udev_log_init("cdrom_id");
+        udev_set_log_fn(udev, log_fn);
+
+        while (1) {
+                int option;
+
+                option = getopt_long(argc, argv, "deluh", options, NULL);
+                if (option == -1)
+                        break;
+
+                switch (option) {
+                case 'l':
+                        lock = true;
+                        break;
+                case 'u':
+                        unlock = true;
+                        break;
+                case 'e':
+                        eject = true;
+                        break;
+                case 'd':
+                        debug = true;
+                        if (udev_get_log_priority(udev) < LOG_INFO)
+                                udev_set_log_priority(udev, LOG_INFO);
+                        break;
+                case 'h':
+                        printf("Usage: cdrom_id [options] <device>\n"
+                               "  --lock-media    lock the media (to enable eject request events)\n"
+                               "  --unlock-media  unlock the media\n"
+                               "  --eject-media   eject the media\n"
+                               "  --debug         debug to stderr\n"
+                               "  --help          print this help text\n\n");
+                        goto exit;
+                default:
+                        rc = 1;
+                        goto exit;
+                }
+        }
+
+        node = argv[optind];
+        if (!node) {
+                err(udev, "no device\n");
+                fprintf(stderr, "no device\n");
+                rc = 1;
+                goto exit;
+        }
+
+        srand((unsigned int)getpid());
+        for (cnt = 20; cnt > 0; cnt--) {
+                struct timespec duration;
+
+                fd = open(node, O_RDONLY|O_NONBLOCK|(is_mounted(node) ? 0 : O_EXCL));
+                if (fd >= 0 || errno != EBUSY)
+                        break;
+                duration.tv_sec = 0;
+                duration.tv_nsec = (100 * 1000 * 1000) + (rand() % 100 * 1000 * 1000);
+                nanosleep(&duration, NULL);
+        }
+        if (fd < 0) {
+                info(udev, "unable to open '%s'\n", node);
+                fprintf(stderr, "unable to open '%s'\n", node);
+                rc = 1;
+                goto exit;
+        }
+        info(udev, "probing: '%s'\n", node);
+
+        /* same data as original cdrom_id */
+        if (cd_capability_compat(udev, fd) < 0) {
+                rc = 1;
+                goto exit;
+        }
+
+        /* check for media - don't bail if there's no media as we still need to
          * to read profiles */
-	cd_media_compat(udev, fd);
+        cd_media_compat(udev, fd);
 
-	/* check if drive talks MMC */
-	if (cd_inquiry(udev, fd) < 0)
-		goto work;
+        /* check if drive talks MMC */
+        if (cd_inquiry(udev, fd) < 0)
+                goto work;
 
-	/* read drive and possibly current profile */
-	if (cd_profiles(udev, fd) != 0)
-		goto work;
+        /* read drive and possibly current profile */
+        if (cd_profiles(udev, fd) != 0)
+                goto work;
 
-	/* at this point we are guaranteed to have media in the drive - find out more about it */
+        /* at this point we are guaranteed to have media in the drive - find out more about it */
 
-	/* get session/track info */
-	cd_media_toc(udev, fd);
+        /* get session/track info */
+        cd_media_toc(udev, fd);
 
-	/* get writable media state */
-	cd_media_info(udev, fd);
+        /* get writable media state */
+        cd_media_info(udev, fd);
 
 work:
-	/* lock the media, so we enable eject button events */
-	if (lock && cd_media) {
-		info(udev, "PREVENT_ALLOW_MEDIUM_REMOVAL (lock)\n");
-		media_lock(udev, fd, true);
-	}
-
-	if (unlock && cd_media) {
-		info(udev, "PREVENT_ALLOW_MEDIUM_REMOVAL (unlock)\n");
-		media_lock(udev, fd, false);
-	}
-
-	if (eject) {
-		info(udev, "PREVENT_ALLOW_MEDIUM_REMOVAL (unlock)\n");
-		media_lock(udev, fd, false);
-		info(udev, "START_STOP_UNIT (eject)\n");
-		media_eject(udev, fd);
-	}
-
-	printf("ID_CDROM=1\n");
-	if (cd_cd_rom)
-		printf("ID_CDROM_CD=1\n");
-	if (cd_cd_r)
-		printf("ID_CDROM_CD_R=1\n");
-	if (cd_cd_rw)
-		printf("ID_CDROM_CD_RW=1\n");
-	if (cd_dvd_rom)
-		printf("ID_CDROM_DVD=1\n");
-	if (cd_dvd_r)
-		printf("ID_CDROM_DVD_R=1\n");
-	if (cd_dvd_rw)
-		printf("ID_CDROM_DVD_RW=1\n");
-	if (cd_dvd_ram)
-		printf("ID_CDROM_DVD_RAM=1\n");
-	if (cd_dvd_plus_r)
-		printf("ID_CDROM_DVD_PLUS_R=1\n");
-	if (cd_dvd_plus_rw)
-		printf("ID_CDROM_DVD_PLUS_RW=1\n");
-	if (cd_dvd_plus_r_dl)
-		printf("ID_CDROM_DVD_PLUS_R_DL=1\n");
-	if (cd_dvd_plus_rw_dl)
-		printf("ID_CDROM_DVD_PLUS_RW_DL=1\n");
-	if (cd_bd)
-		printf("ID_CDROM_BD=1\n");
-	if (cd_bd_r)
-		printf("ID_CDROM_BD_R=1\n");
-	if (cd_bd_re)
-		printf("ID_CDROM_BD_RE=1\n");
-	if (cd_hddvd)
-		printf("ID_CDROM_HDDVD=1\n");
-	if (cd_hddvd_r)
-		printf("ID_CDROM_HDDVD_R=1\n");
-	if (cd_hddvd_rw)
-		printf("ID_CDROM_HDDVD_RW=1\n");
-	if (cd_mo)
-		printf("ID_CDROM_MO=1\n");
-	if (cd_mrw)
-		printf("ID_CDROM_MRW=1\n");
-	if (cd_mrw_w)
-		printf("ID_CDROM_MRW_W=1\n");
-
-	if (cd_media)
-		printf("ID_CDROM_MEDIA=1\n");
-	if (cd_media_mo)
-		printf("ID_CDROM_MEDIA_MO=1\n");
-	if (cd_media_mrw)
-		printf("ID_CDROM_MEDIA_MRW=1\n");
-	if (cd_media_mrw_w)
-		printf("ID_CDROM_MEDIA_MRW_W=1\n");
-	if (cd_media_cd_rom)
-		printf("ID_CDROM_MEDIA_CD=1\n");
-	if (cd_media_cd_r)
-		printf("ID_CDROM_MEDIA_CD_R=1\n");
-	if (cd_media_cd_rw)
-		printf("ID_CDROM_MEDIA_CD_RW=1\n");
-	if (cd_media_dvd_rom)
-		printf("ID_CDROM_MEDIA_DVD=1\n");
-	if (cd_media_dvd_r)
-		printf("ID_CDROM_MEDIA_DVD_R=1\n");
-	if (cd_media_dvd_ram)
-		printf("ID_CDROM_MEDIA_DVD_RAM=1\n");
-	if (cd_media_dvd_rw)
-		printf("ID_CDROM_MEDIA_DVD_RW=1\n");
-	if (cd_media_dvd_plus_r)
-		printf("ID_CDROM_MEDIA_DVD_PLUS_R=1\n");
-	if (cd_media_dvd_plus_rw)
-		printf("ID_CDROM_MEDIA_DVD_PLUS_RW=1\n");
-	if (cd_media_dvd_plus_rw_dl)
-		printf("ID_CDROM_MEDIA_DVD_PLUS_RW_DL=1\n");
-	if (cd_media_dvd_plus_r_dl)
-		printf("ID_CDROM_MEDIA_DVD_PLUS_R_DL=1\n");
-	if (cd_media_bd)
-		printf("ID_CDROM_MEDIA_BD=1\n");
-	if (cd_media_bd_r)
-		printf("ID_CDROM_MEDIA_BD_R=1\n");
-	if (cd_media_bd_re)
-		printf("ID_CDROM_MEDIA_BD_RE=1\n");
-	if (cd_media_hddvd)
-		printf("ID_CDROM_MEDIA_HDDVD=1\n");
-	if (cd_media_hddvd_r)
-		printf("ID_CDROM_MEDIA_HDDVD_R=1\n");
-	if (cd_media_hddvd_rw)
-		printf("ID_CDROM_MEDIA_HDDVD_RW=1\n");
-
-	if (cd_media_state != NULL)
-		printf("ID_CDROM_MEDIA_STATE=%s\n", cd_media_state);
-	if (cd_media_session_next > 0)
-		printf("ID_CDROM_MEDIA_SESSION_NEXT=%d\n", cd_media_session_next);
-	if (cd_media_session_count > 0)
-		printf("ID_CDROM_MEDIA_SESSION_COUNT=%d\n", cd_media_session_count);
-	if (cd_media_session_count > 1 && cd_media_session_last_offset > 0)
-		printf("ID_CDROM_MEDIA_SESSION_LAST_OFFSET=%llu\n", cd_media_session_last_offset);
-	if (cd_media_track_count > 0)
-		printf("ID_CDROM_MEDIA_TRACK_COUNT=%d\n", cd_media_track_count);
-	if (cd_media_track_count_audio > 0)
-		printf("ID_CDROM_MEDIA_TRACK_COUNT_AUDIO=%d\n", cd_media_track_count_audio);
-	if (cd_media_track_count_data > 0)
-		printf("ID_CDROM_MEDIA_TRACK_COUNT_DATA=%d\n", cd_media_track_count_data);
+        /* lock the media, so we enable eject button events */
+        if (lock && cd_media) {
+                info(udev, "PREVENT_ALLOW_MEDIUM_REMOVAL (lock)\n");
+                media_lock(udev, fd, true);
+        }
+
+        if (unlock && cd_media) {
+                info(udev, "PREVENT_ALLOW_MEDIUM_REMOVAL (unlock)\n");
+                media_lock(udev, fd, false);
+        }
+
+        if (eject) {
+                info(udev, "PREVENT_ALLOW_MEDIUM_REMOVAL (unlock)\n");
+                media_lock(udev, fd, false);
+                info(udev, "START_STOP_UNIT (eject)\n");
+                media_eject(udev, fd);
+        }
+
+        printf("ID_CDROM=1\n");
+        if (cd_cd_rom)
+                printf("ID_CDROM_CD=1\n");
+        if (cd_cd_r)
+                printf("ID_CDROM_CD_R=1\n");
+        if (cd_cd_rw)
+                printf("ID_CDROM_CD_RW=1\n");
+        if (cd_dvd_rom)
+                printf("ID_CDROM_DVD=1\n");
+        if (cd_dvd_r)
+                printf("ID_CDROM_DVD_R=1\n");
+        if (cd_dvd_rw)
+                printf("ID_CDROM_DVD_RW=1\n");
+        if (cd_dvd_ram)
+                printf("ID_CDROM_DVD_RAM=1\n");
+        if (cd_dvd_plus_r)
+                printf("ID_CDROM_DVD_PLUS_R=1\n");
+        if (cd_dvd_plus_rw)
+                printf("ID_CDROM_DVD_PLUS_RW=1\n");
+        if (cd_dvd_plus_r_dl)
+                printf("ID_CDROM_DVD_PLUS_R_DL=1\n");
+        if (cd_dvd_plus_rw_dl)
+                printf("ID_CDROM_DVD_PLUS_RW_DL=1\n");
+        if (cd_bd)
+                printf("ID_CDROM_BD=1\n");
+        if (cd_bd_r)
+                printf("ID_CDROM_BD_R=1\n");
+        if (cd_bd_re)
+                printf("ID_CDROM_BD_RE=1\n");
+        if (cd_hddvd)
+                printf("ID_CDROM_HDDVD=1\n");
+        if (cd_hddvd_r)
+                printf("ID_CDROM_HDDVD_R=1\n");
+        if (cd_hddvd_rw)
+                printf("ID_CDROM_HDDVD_RW=1\n");
+        if (cd_mo)
+                printf("ID_CDROM_MO=1\n");
+        if (cd_mrw)
+                printf("ID_CDROM_MRW=1\n");
+        if (cd_mrw_w)
+                printf("ID_CDROM_MRW_W=1\n");
+
+        if (cd_media)
+                printf("ID_CDROM_MEDIA=1\n");
+        if (cd_media_mo)
+                printf("ID_CDROM_MEDIA_MO=1\n");
+        if (cd_media_mrw)
+                printf("ID_CDROM_MEDIA_MRW=1\n");
+        if (cd_media_mrw_w)
+                printf("ID_CDROM_MEDIA_MRW_W=1\n");
+        if (cd_media_cd_rom)
+                printf("ID_CDROM_MEDIA_CD=1\n");
+        if (cd_media_cd_r)
+                printf("ID_CDROM_MEDIA_CD_R=1\n");
+        if (cd_media_cd_rw)
+                printf("ID_CDROM_MEDIA_CD_RW=1\n");
+        if (cd_media_dvd_rom)
+                printf("ID_CDROM_MEDIA_DVD=1\n");
+        if (cd_media_dvd_r)
+                printf("ID_CDROM_MEDIA_DVD_R=1\n");
+        if (cd_media_dvd_ram)
+                printf("ID_CDROM_MEDIA_DVD_RAM=1\n");
+        if (cd_media_dvd_rw)
+                printf("ID_CDROM_MEDIA_DVD_RW=1\n");
+        if (cd_media_dvd_plus_r)
+                printf("ID_CDROM_MEDIA_DVD_PLUS_R=1\n");
+        if (cd_media_dvd_plus_rw)
+                printf("ID_CDROM_MEDIA_DVD_PLUS_RW=1\n");
+        if (cd_media_dvd_plus_rw_dl)
+                printf("ID_CDROM_MEDIA_DVD_PLUS_RW_DL=1\n");
+        if (cd_media_dvd_plus_r_dl)
+                printf("ID_CDROM_MEDIA_DVD_PLUS_R_DL=1\n");
+        if (cd_media_bd)
+                printf("ID_CDROM_MEDIA_BD=1\n");
+        if (cd_media_bd_r)
+                printf("ID_CDROM_MEDIA_BD_R=1\n");
+        if (cd_media_bd_re)
+                printf("ID_CDROM_MEDIA_BD_RE=1\n");
+        if (cd_media_hddvd)
+                printf("ID_CDROM_MEDIA_HDDVD=1\n");
+        if (cd_media_hddvd_r)
+                printf("ID_CDROM_MEDIA_HDDVD_R=1\n");
+        if (cd_media_hddvd_rw)
+                printf("ID_CDROM_MEDIA_HDDVD_RW=1\n");
+
+        if (cd_media_state != NULL)
+                printf("ID_CDROM_MEDIA_STATE=%s\n", cd_media_state);
+        if (cd_media_session_next > 0)
+                printf("ID_CDROM_MEDIA_SESSION_NEXT=%d\n", cd_media_session_next);
+        if (cd_media_session_count > 0)
+                printf("ID_CDROM_MEDIA_SESSION_COUNT=%d\n", cd_media_session_count);
+        if (cd_media_session_count > 1 && cd_media_session_last_offset > 0)
+                printf("ID_CDROM_MEDIA_SESSION_LAST_OFFSET=%llu\n", cd_media_session_last_offset);
+        if (cd_media_track_count > 0)
+                printf("ID_CDROM_MEDIA_TRACK_COUNT=%d\n", cd_media_track_count);
+        if (cd_media_track_count_audio > 0)
+                printf("ID_CDROM_MEDIA_TRACK_COUNT_AUDIO=%d\n", cd_media_track_count_audio);
+        if (cd_media_track_count_data > 0)
+                printf("ID_CDROM_MEDIA_TRACK_COUNT_DATA=%d\n", cd_media_track_count_data);
 exit:
-	if (fd >= 0)
-		close(fd);
-	udev_unref(udev);
-	udev_log_close();
-	return rc;
+        if (fd >= 0)
+                close(fd);
+        udev_unref(udev);
+        udev_log_close();
+        return rc;
 }
diff --git a/src/extras/collect/collect.c b/src/extras/collect/collect.c
index f78f3b778e..076fe479e2 100644
--- a/src/extras/collect/collect.c
+++ b/src/extras/collect/collect.c
@@ -34,19 +34,19 @@
 #include "libudev.h"
 #include "libudev-private.h"
 
-#define BUFSIZE			16
-#define UDEV_ALARM_TIMEOUT	180
+#define BUFSIZE                        16
+#define UDEV_ALARM_TIMEOUT        180
 
 enum collect_state {
-	STATE_NONE,
-	STATE_OLD,
-	STATE_CONFIRMED,
+        STATE_NONE,
+        STATE_OLD,
+        STATE_CONFIRMED,
 };
 
 struct _mate {
-	struct udev_list_node node;
-	char *name;
-	enum collect_state state;
+        struct udev_list_node node;
+        char *name;
+        enum collect_state state;
 };
 
 static struct udev_list_node bunch;
@@ -57,29 +57,29 @@ static size_t bufsize = BUFSIZE;
 
 static struct _mate *node_to_mate(struct udev_list_node *node)
 {
-	char *mate;
+        char *mate;
 
-	mate = (char *)node;
-	mate -= offsetof(struct _mate, node);
-	return (struct _mate *)mate;
+        mate = (char *)node;
+        mate -= offsetof(struct _mate, node);
+        return (struct _mate *)mate;
 }
 
 static void sig_alrm(int signo)
 {
-	exit(4);
+        exit(4);
 }
 
 static void usage(void)
 {
-	printf("usage: collect [--add|--remove] [--debug] <checkpoint> <id> <idlist>\n"
-	       "\n"
-	       "  Adds ID <id> to the list governed by <checkpoint>.\n"
-	       "  <id> must be part of the list <idlist>.\n"
-	       "  If all IDs given by <idlist> are listed (ie collect has been\n"
-	       "  invoked for each ID in <idlist>) collect returns 0, the\n"
-	       "  number of missing IDs otherwise.\n"
-	       "  On error a negative number is returned.\n"
-	       "\n");
+        printf("usage: collect [--add|--remove] [--debug] <checkpoint> <id> <idlist>\n"
+               "\n"
+               "  Adds ID <id> to the list governed by <checkpoint>.\n"
+               "  <id> must be part of the list <idlist>.\n"
+               "  If all IDs given by <idlist> are listed (ie collect has been\n"
+               "  invoked for each ID in <idlist>) collect returns 0, the\n"
+               "  number of missing IDs otherwise.\n"
+               "  On error a negative number is returned.\n"
+               "\n");
 }
 
 /*
@@ -89,34 +89,34 @@ static void usage(void)
  */
 static int prepare(char *dir, char *filename)
 {
-	struct stat statbuf;
-	char buf[512];
-	int fd;
-
-	if (stat(dir, &statbuf) < 0)
-		mkdir(dir, 0700);
-
-	sprintf(buf, "%s/%s", dir, filename);
-
-	fd = open(buf,O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
-	if (fd < 0)
-		fprintf(stderr, "Cannot open %s: %s\n", buf, strerror(errno));
-
-	if (lockf(fd,F_TLOCK,0) < 0) {
-		if (debug)
-			fprintf(stderr, "Lock taken, wait for %d seconds\n", UDEV_ALARM_TIMEOUT);
-		if (errno == EAGAIN || errno == EACCES) {
-			alarm(UDEV_ALARM_TIMEOUT);
-			lockf(fd, F_LOCK, 0);
-			if (debug)
-				fprintf(stderr, "Acquired lock on %s\n", buf);
-		} else {
-			if (debug)
-				fprintf(stderr, "Could not get lock on %s: %s\n", buf, strerror(errno));
-		}
-	}
-
-	return fd;
+        struct stat statbuf;
+        char buf[512];
+        int fd;
+
+        if (stat(dir, &statbuf) < 0)
+                mkdir(dir, 0700);
+
+        sprintf(buf, "%s/%s", dir, filename);
+
+        fd = open(buf,O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
+        if (fd < 0)
+                fprintf(stderr, "Cannot open %s: %s\n", buf, strerror(errno));
+
+        if (lockf(fd,F_TLOCK,0) < 0) {
+                if (debug)
+                        fprintf(stderr, "Lock taken, wait for %d seconds\n", UDEV_ALARM_TIMEOUT);
+                if (errno == EAGAIN || errno == EACCES) {
+                        alarm(UDEV_ALARM_TIMEOUT);
+                        lockf(fd, F_LOCK, 0);
+                        if (debug)
+                                fprintf(stderr, "Acquired lock on %s\n", buf);
+                } else {
+                        if (debug)
+                                fprintf(stderr, "Could not get lock on %s: %s\n", buf, strerror(errno));
+                }
+        }
+
+        return fd;
 }
 
 /*
@@ -136,58 +136,58 @@ static int prepare(char *dir, char *filename)
  */
 static int checkout(int fd)
 {
-	int len;
-	char *buf, *ptr, *word = NULL;
-	struct _mate *him;
+        int len;
+        char *buf, *ptr, *word = NULL;
+        struct _mate *him;
 
  restart:
-	len = bufsize >> 1;
-	buf = calloc(1,bufsize + 1);
-	if (!buf) {
-		fprintf(stderr, "Out of memory\n");
-		return -1;
-	}
-	memset(buf, ' ', bufsize);
-	ptr = buf + len;
-	while ((read(fd, buf + len, len)) > 0) {
-		while (ptr && *ptr) {
-			word = ptr;
-			ptr = strpbrk(word," \n\t\r");
-			if (!ptr && word < (buf + len)) {
-				bufsize = bufsize << 1;
-				if (debug)
-					fprintf(stderr, "ID overflow, restarting with size %zi\n", bufsize);
-				free(buf);
-				lseek(fd, 0, SEEK_SET);
-				goto restart;
-			}
-			if (ptr) {
-				*ptr = '\0';
-				ptr++;
-				if (!strlen(word))
-					continue;
-
-				if (debug)
-					fprintf(stderr, "Found word %s\n", word);
-				him = malloc(sizeof (struct _mate));
-				him->name = strdup(word);
-				him->state = STATE_OLD;
-				udev_list_node_append(&him->node, &bunch);
-				word = NULL;
-			}
-		}
-		memcpy(buf, buf + len, len);
-		memset(buf + len, ' ', len);
-
-		if (!ptr)
-			ptr = word;
-		if (!ptr)
-			break;
-		ptr -= len;
-	}
-
-	free(buf);
-	return 0;
+        len = bufsize >> 1;
+        buf = calloc(1,bufsize + 1);
+        if (!buf) {
+                fprintf(stderr, "Out of memory\n");
+                return -1;
+        }
+        memset(buf, ' ', bufsize);
+        ptr = buf + len;
+        while ((read(fd, buf + len, len)) > 0) {
+                while (ptr && *ptr) {
+                        word = ptr;
+                        ptr = strpbrk(word," \n\t\r");
+                        if (!ptr && word < (buf + len)) {
+                                bufsize = bufsize << 1;
+                                if (debug)
+                                        fprintf(stderr, "ID overflow, restarting with size %zi\n", bufsize);
+                                free(buf);
+                                lseek(fd, 0, SEEK_SET);
+                                goto restart;
+                        }
+                        if (ptr) {
+                                *ptr = '\0';
+                                ptr++;
+                                if (!strlen(word))
+                                        continue;
+
+                                if (debug)
+                                        fprintf(stderr, "Found word %s\n", word);
+                                him = malloc(sizeof (struct _mate));
+                                him->name = strdup(word);
+                                him->state = STATE_OLD;
+                                udev_list_node_append(&him->node, &bunch);
+                                word = NULL;
+                        }
+                }
+                memcpy(buf, buf + len, len);
+                memset(buf + len, ' ', len);
+
+                if (!ptr)
+                        ptr = word;
+                if (!ptr)
+                        break;
+                ptr -= len;
+        }
+
+        free(buf);
+        return 0;
 }
 
 /*
@@ -198,22 +198,22 @@ static int checkout(int fd)
  */
 static void invite(char *us)
 {
-	struct udev_list_node *him_node;
-	struct _mate *who = NULL;
+        struct udev_list_node *him_node;
+        struct _mate *who = NULL;
 
-	if (debug)
-		fprintf(stderr, "Adding ID '%s'\n", us);
+        if (debug)
+                fprintf(stderr, "Adding ID '%s'\n", us);
 
-	udev_list_node_foreach(him_node, &bunch) {
-		struct _mate *him = node_to_mate(him_node);
+        udev_list_node_foreach(him_node, &bunch) {
+                struct _mate *him = node_to_mate(him_node);
 
-		if (!strcmp(him->name, us)) {
-			him->state = STATE_CONFIRMED;
-			who = him;
-		}
-	}
-	if (debug && !who)
-		fprintf(stderr, "ID '%s' not in database\n", us);
+                if (!strcmp(him->name, us)) {
+                        him->state = STATE_CONFIRMED;
+                        who = him;
+                }
+        }
+        if (debug && !who)
+                fprintf(stderr, "ID '%s' not in database\n", us);
 
 }
 
@@ -226,22 +226,22 @@ static void invite(char *us)
  */
 static void reject(char *us)
 {
-	struct udev_list_node *him_node;
-	struct _mate *who = NULL;
-
-	if (debug)
-		fprintf(stderr, "Removing ID '%s'\n", us);
-
-	udev_list_node_foreach(him_node, &bunch) {
-		struct _mate *him = node_to_mate(him_node);
-
-		if (!strcmp(him->name, us)) {
-			him->state = STATE_NONE;
-			who = him;
-		}
-	}
-	if (debug && !who)
-		fprintf(stderr, "ID '%s' not in database\n", us);
+        struct udev_list_node *him_node;
+        struct _mate *who = NULL;
+
+        if (debug)
+                fprintf(stderr, "Removing ID '%s'\n", us);
+
+        udev_list_node_foreach(him_node, &bunch) {
+                struct _mate *him = node_to_mate(him_node);
+
+                if (!strcmp(him->name, us)) {
+                        him->state = STATE_NONE;
+                        who = him;
+                }
+        }
+        if (debug && !who)
+                fprintf(stderr, "ID '%s' not in database\n", us);
 }
 
 /*
@@ -252,18 +252,18 @@ static void reject(char *us)
  */
 static void kickout(void)
 {
-	struct udev_list_node *him_node;
-	struct udev_list_node *tmp;
-
-	udev_list_node_foreach_safe(him_node, tmp, &bunch) {
-		struct _mate *him = node_to_mate(him_node);
-
-		if (him->state == STATE_OLD) {
-			udev_list_node_remove(&him->node);
-			free(him->name);
-			free(him);
-		}
-	}
+        struct udev_list_node *him_node;
+        struct udev_list_node *tmp;
+
+        udev_list_node_foreach_safe(him_node, tmp, &bunch) {
+                struct _mate *him = node_to_mate(him_node);
+
+                if (him->state == STATE_OLD) {
+                        udev_list_node_remove(&him->node);
+                        free(him->name);
+                        free(him);
+                }
+        }
 }
 
 /*
@@ -273,38 +273,38 @@ static void kickout(void)
  */
 static int missing(int fd)
 {
-	char *buf;
-	int ret = 0;
-	struct udev_list_node *him_node;
-
-	buf = malloc(bufsize);
-	if (!buf)
-		return -1;
-
-	udev_list_node_foreach(him_node, &bunch) {
-		struct _mate *him = node_to_mate(him_node);
-
-		if (him->state == STATE_NONE) {
-			ret++;
-		} else {
-			while (strlen(him->name)+1 >= bufsize) {
-				char *tmpbuf;
-
-				bufsize = bufsize << 1;
-				tmpbuf = realloc(buf, bufsize);
-				if (!tmpbuf) {
-					free(buf);
-					return -1;
-				}
-				buf = tmpbuf;
-			}
-			snprintf(buf, strlen(him->name)+2, "%s ", him->name);
-			write(fd, buf, strlen(buf));
-		}
-	}
-
-	free(buf);
-	return ret;
+        char *buf;
+        int ret = 0;
+        struct udev_list_node *him_node;
+
+        buf = malloc(bufsize);
+        if (!buf)
+                return -1;
+
+        udev_list_node_foreach(him_node, &bunch) {
+                struct _mate *him = node_to_mate(him_node);
+
+                if (him->state == STATE_NONE) {
+                        ret++;
+                } else {
+                        while (strlen(him->name)+1 >= bufsize) {
+                                char *tmpbuf;
+
+                                bufsize = bufsize << 1;
+                                tmpbuf = realloc(buf, bufsize);
+                                if (!tmpbuf) {
+                                        free(buf);
+                                        return -1;
+                                }
+                                buf = tmpbuf;
+                        }
+                        snprintf(buf, strlen(him->name)+2, "%s ", him->name);
+                        write(fd, buf, strlen(buf));
+                }
+        }
+
+        free(buf);
+        return ret;
 }
 
 /*
@@ -314,160 +314,160 @@ static int missing(int fd)
  */
 static void everybody(void)
 {
-	struct udev_list_node *him_node;
-	const char *state = "";
-
-	udev_list_node_foreach(him_node, &bunch) {
-		struct _mate *him = node_to_mate(him_node);
-
-		switch (him->state) {
-		case STATE_NONE:
-			state = "none";
-			break;
-		case STATE_OLD:
-			state = "old";
-			break;
-		case STATE_CONFIRMED:
-			state = "confirmed";
-			break;
-		}
-		fprintf(stderr, "ID: %s=%s\n", him->name, state);
-	}
+        struct udev_list_node *him_node;
+        const char *state = "";
+
+        udev_list_node_foreach(him_node, &bunch) {
+                struct _mate *him = node_to_mate(him_node);
+
+                switch (him->state) {
+                case STATE_NONE:
+                        state = "none";
+                        break;
+                case STATE_OLD:
+                        state = "old";
+                        break;
+                case STATE_CONFIRMED:
+                        state = "confirmed";
+                        break;
+                }
+                fprintf(stderr, "ID: %s=%s\n", him->name, state);
+        }
 }
 
 int main(int argc, char **argv)
 {
-	struct udev *udev;
-	static const struct option options[] = {
-		{ "add", no_argument, NULL, 'a' },
-		{ "remove", no_argument, NULL, 'r' },
-		{ "debug", no_argument, NULL, 'd' },
-		{ "help", no_argument, NULL, 'h' },
-		{}
-	};
-	int argi;
-	char *checkpoint, *us;
-	int fd;
-	int i;
-	int ret = EXIT_SUCCESS;
-	int prune = 0;
-	char tmpdir[UTIL_PATH_SIZE];
-
-	udev = udev_new();
-	if (udev == NULL) {
-		ret = EXIT_FAILURE;
-		goto exit;
-	}
-
-	while (1) {
-		int option;
-
-		option = getopt_long(argc, argv, "ardh", options, NULL);
-		if (option == -1)
-			break;
-
-		switch (option) {
-		case 'a':
-			prune = 0;
-			break;
-		case 'r':
-			prune = 1;
-			break;
-		case 'd':
-			debug = 1;
-			break;
-		case 'h':
-			usage();
-			goto exit;
-		default:
-			ret = 1;
-			goto exit;
-		}
-	}
-
-	argi = optind;
-	if (argi + 2 > argc) {
-		printf("Missing parameter(s)\n");
-		ret = 1;
-		goto exit;
-	}
-	checkpoint = argv[argi++];
-	us = argv[argi++];
-
-	if (signal(SIGALRM, sig_alrm) == SIG_ERR) {
-		fprintf(stderr, "Cannot set SIGALRM: %s\n", strerror(errno));
-		ret = 2;
-		goto exit;
-	}
-
-	udev_list_node_init(&bunch);
-
-	if (debug)
-		fprintf(stderr, "Using checkpoint '%s'\n", checkpoint);
-
-	util_strscpyl(tmpdir, sizeof(tmpdir), udev_get_run_path(udev), "/collect", NULL);
-	fd = prepare(tmpdir, checkpoint);
-	if (fd < 0) {
-		ret = 3;
-		goto out;
-	}
-
-	if (checkout(fd) < 0) {
-		ret = 2;
-		goto out;
-	}
-
-	for (i = argi; i < argc; i++) {
-		struct udev_list_node *him_node;
-		struct _mate *who;
-
-		who = NULL;
-		udev_list_node_foreach(him_node, &bunch) {
-			struct _mate *him = node_to_mate(him_node);
-
-			if (!strcmp(him->name, argv[i]))
-				who = him;
-		}
-		if (!who) {
-			struct _mate *him;
-
-			if (debug)
-				fprintf(stderr, "ID %s: not in database\n", argv[i]);
-			him = malloc(sizeof (struct _mate));
-			him->name = malloc(strlen(argv[i]) + 1);
-			strcpy(him->name, argv[i]);
-			him->state = STATE_NONE;
-			udev_list_node_append(&him->node, &bunch);
-		} else {
-			if (debug)
-				fprintf(stderr, "ID %s: found in database\n", argv[i]);
-			who->state = STATE_CONFIRMED;
-		}
-	}
-
-	if (prune)
-		reject(us);
-	else
-		invite(us);
-
-	if (debug) {
-		everybody();
-		fprintf(stderr, "Prune lists\n");
-	}
-	kickout();
-
-	lseek(fd, 0, SEEK_SET);
-	ftruncate(fd, 0);
-	ret = missing(fd);
-
-	lockf(fd, F_ULOCK, 0);
-	close(fd);
+        struct udev *udev;
+        static const struct option options[] = {
+                { "add", no_argument, NULL, 'a' },
+                { "remove", no_argument, NULL, 'r' },
+                { "debug", no_argument, NULL, 'd' },
+                { "help", no_argument, NULL, 'h' },
+                {}
+        };
+        int argi;
+        char *checkpoint, *us;
+        int fd;
+        int i;
+        int ret = EXIT_SUCCESS;
+        int prune = 0;
+        char tmpdir[UTIL_PATH_SIZE];
+
+        udev = udev_new();
+        if (udev == NULL) {
+                ret = EXIT_FAILURE;
+                goto exit;
+        }
+
+        while (1) {
+                int option;
+
+                option = getopt_long(argc, argv, "ardh", options, NULL);
+                if (option == -1)
+                        break;
+
+                switch (option) {
+                case 'a':
+                        prune = 0;
+                        break;
+                case 'r':
+                        prune = 1;
+                        break;
+                case 'd':
+                        debug = 1;
+                        break;
+                case 'h':
+                        usage();
+                        goto exit;
+                default:
+                        ret = 1;
+                        goto exit;
+                }
+        }
+
+        argi = optind;
+        if (argi + 2 > argc) {
+                printf("Missing parameter(s)\n");
+                ret = 1;
+                goto exit;
+        }
+        checkpoint = argv[argi++];
+        us = argv[argi++];
+
+        if (signal(SIGALRM, sig_alrm) == SIG_ERR) {
+                fprintf(stderr, "Cannot set SIGALRM: %s\n", strerror(errno));
+                ret = 2;
+                goto exit;
+        }
+
+        udev_list_node_init(&bunch);
+
+        if (debug)
+                fprintf(stderr, "Using checkpoint '%s'\n", checkpoint);
+
+        util_strscpyl(tmpdir, sizeof(tmpdir), udev_get_run_path(udev), "/collect", NULL);
+        fd = prepare(tmpdir, checkpoint);
+        if (fd < 0) {
+                ret = 3;
+                goto out;
+        }
+
+        if (checkout(fd) < 0) {
+                ret = 2;
+                goto out;
+        }
+
+        for (i = argi; i < argc; i++) {
+                struct udev_list_node *him_node;
+                struct _mate *who;
+
+                who = NULL;
+                udev_list_node_foreach(him_node, &bunch) {
+                        struct _mate *him = node_to_mate(him_node);
+
+                        if (!strcmp(him->name, argv[i]))
+                                who = him;
+                }
+                if (!who) {
+                        struct _mate *him;
+
+                        if (debug)
+                                fprintf(stderr, "ID %s: not in database\n", argv[i]);
+                        him = malloc(sizeof (struct _mate));
+                        him->name = malloc(strlen(argv[i]) + 1);
+                        strcpy(him->name, argv[i]);
+                        him->state = STATE_NONE;
+                        udev_list_node_append(&him->node, &bunch);
+                } else {
+                        if (debug)
+                                fprintf(stderr, "ID %s: found in database\n", argv[i]);
+                        who->state = STATE_CONFIRMED;
+                }
+        }
+
+        if (prune)
+                reject(us);
+        else
+                invite(us);
+
+        if (debug) {
+                everybody();
+                fprintf(stderr, "Prune lists\n");
+        }
+        kickout();
+
+        lseek(fd, 0, SEEK_SET);
+        ftruncate(fd, 0);
+        ret = missing(fd);
+
+        lockf(fd, F_ULOCK, 0);
+        close(fd);
 out:
-	if (debug)
-		everybody();
-	if (ret >= 0)
-		printf("COLLECT_%s=%d\n", checkpoint, ret);
+        if (debug)
+                everybody();
+        if (ret >= 0)
+                printf("COLLECT_%s=%d\n", checkpoint, ret);
 exit:
-	udev_unref(udev);
-	return ret;
+        udev_unref(udev);
+        return ret;
 }
diff --git a/src/extras/edd_id/edd_id.c b/src/extras/edd_id/edd_id.c
index ac4da07611..471ea60533 100644
--- a/src/extras/edd_id/edd_id.c
+++ b/src/extras/edd_id/edd_id.c
@@ -36,161 +36,161 @@
 #include "libudev-private.h"
 
 static void log_fn(struct udev *udev, int priority,
-		   const char *file, int line, const char *fn,
-		   const char *format, va_list args)
+                   const char *file, int line, const char *fn,
+                   const char *format, va_list args)
 {
-	vsyslog(priority, format, args);
+        vsyslog(priority, format, args);
 }
 
 int main(int argc, char *argv[])
 {
-	struct udev *udev;
-	const char *node = NULL;
-	int i;
-	int export = 0;
-	uint32_t disk_id;
-	uint16_t mbr_valid;
-	struct dirent *dent;
-	int disk_fd;
-	int sysfs_fd;
-	DIR *dir = NULL;
-	int rc = 1;
-	char filename[UTIL_PATH_SIZE];
-	char match[UTIL_PATH_SIZE];
-
-	udev = udev_new();
-	if (udev == NULL)
-		goto exit;
-
-	udev_log_init("edd_id");
-	udev_set_log_fn(udev, log_fn);
-
-	for (i = 1 ; i < argc; i++) {
-		char *arg = argv[i];
-
-		if (strcmp(arg, "--export") == 0) {
-			export = 1;
-		} else
-			node = arg;
-	}
-	if (node == NULL) {
-		err(udev, "no node specified\n");
-		fprintf(stderr, "no node specified\n");
-		goto exit;
-	}
-
-	/* check for kernel support */
-	util_strscpyl(filename, sizeof(filename), udev_get_sys_path(udev), "/firmware/edd", NULL);
-	dir = opendir(filename);
-	if (dir == NULL) {
-		info(udev, "no kernel EDD support\n");
-		fprintf(stderr, "no kernel EDD support\n");
-		rc = 2;
-		goto exit;
-	}
-
-	disk_fd = open(node, O_RDONLY);
-	if (disk_fd < 0) {
-		info(udev, "unable to open '%s'\n", node);
-		fprintf(stderr, "unable to open '%s'\n", node);
-		rc = 3;
-		goto closedir;
-	}
-
-	/* check for valid MBR signature */
-	if (lseek(disk_fd, 510, SEEK_SET) < 0) {
-		info(udev, "seek to MBR validity failed '%s'\n", node);
-		rc = 4;
-		goto close;
-	}
-	if (read(disk_fd, &mbr_valid, sizeof(mbr_valid)) != sizeof(mbr_valid)) {
-		info(udev, "read MBR validity failed '%s'\n", node);
-		rc = 5;
-		goto close;
-	}
-	if (mbr_valid != 0xAA55) {
-		fprintf(stderr, "no valid MBR signature '%s'\n", node);
-		info(udev, "no valid MBR signature '%s'\n", node);
-		rc=6;
-		goto close;
-	}
-
-	/* read EDD signature */
-	if (lseek(disk_fd, 440, SEEK_SET) < 0) {
-		info(udev, "seek to signature failed '%s'\n", node);
-		rc = 7;
-		goto close;
-	}
-	if (read(disk_fd, &disk_id, sizeof(disk_id)) != sizeof(disk_id)) {
-		info(udev, "read signature failed '%s'\n", node);
-		rc = 8;
-		goto close;
-	}
-	/* all zero is invalid */
-	info(udev, "read id 0x%08x from '%s'\n", disk_id, node);
-	if (disk_id == 0) {
-		fprintf(stderr, "no EDD signature '%s'\n", node);
-		info(udev, "'%s' signature is zero\n", node);
-		rc = 9;
-		goto close;
-	}
-
-	/* lookup signature in sysfs to determine the name */
-	match[0] = '\0';
-	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-		char sysfs_id_buf[256];
-		uint32_t sysfs_id;
-		ssize_t size;
-
-		if (dent->d_name[0] == '.')
-			continue;
-
-		util_strscpyl(filename, sizeof(filename), dent->d_name, "/mbr_signature", NULL);
-		sysfs_fd = openat(dirfd(dir), filename, O_RDONLY);
-		if (sysfs_fd < 0) {
-			info(udev, "unable to open sysfs '%s'\n", filename);
-			continue;
-		}
-
-		size = read(sysfs_fd, sysfs_id_buf, sizeof(sysfs_id_buf)-1);
-		close(sysfs_fd);
-		if (size <= 0) {
-			info(udev, "read sysfs '%s' failed\n", filename);
-			continue;
-		}
-		sysfs_id_buf[size] = '\0';
-		info(udev, "read '%s' from '%s'\n", sysfs_id_buf, filename);
-		sysfs_id = strtoul(sysfs_id_buf, NULL, 16);
-
-		/* look for matching value, that appears only once */
-		if (disk_id == sysfs_id) {
-			if (match[0] == '\0') {
-				/* store id */
-				util_strscpy(match, sizeof(match), dent->d_name);
-			} else {
-				/* error, same signature for another device */
-				info(udev, "'%s' does not have a unique signature\n", node);
-				fprintf(stderr, "'%s' does not have a unique signature\n", node);
-				rc = 10;
-				goto exit;
-			}
-		}
-	}
-
-	if (match[0] != '\0') {
-		if (export)
-			printf("ID_EDD=%s\n", match);
-		else
-			printf("%s\n", match);
-		rc = 0;
-	}
+        struct udev *udev;
+        const char *node = NULL;
+        int i;
+        int export = 0;
+        uint32_t disk_id;
+        uint16_t mbr_valid;
+        struct dirent *dent;
+        int disk_fd;
+        int sysfs_fd;
+        DIR *dir = NULL;
+        int rc = 1;
+        char filename[UTIL_PATH_SIZE];
+        char match[UTIL_PATH_SIZE];
+
+        udev = udev_new();
+        if (udev == NULL)
+                goto exit;
+
+        udev_log_init("edd_id");
+        udev_set_log_fn(udev, log_fn);
+
+        for (i = 1 ; i < argc; i++) {
+                char *arg = argv[i];
+
+                if (strcmp(arg, "--export") == 0) {
+                        export = 1;
+                } else
+                        node = arg;
+        }
+        if (node == NULL) {
+                err(udev, "no node specified\n");
+                fprintf(stderr, "no node specified\n");
+                goto exit;
+        }
+
+        /* check for kernel support */
+        util_strscpyl(filename, sizeof(filename), udev_get_sys_path(udev), "/firmware/edd", NULL);
+        dir = opendir(filename);
+        if (dir == NULL) {
+                info(udev, "no kernel EDD support\n");
+                fprintf(stderr, "no kernel EDD support\n");
+                rc = 2;
+                goto exit;
+        }
+
+        disk_fd = open(node, O_RDONLY);
+        if (disk_fd < 0) {
+                info(udev, "unable to open '%s'\n", node);
+                fprintf(stderr, "unable to open '%s'\n", node);
+                rc = 3;
+                goto closedir;
+        }
+
+        /* check for valid MBR signature */
+        if (lseek(disk_fd, 510, SEEK_SET) < 0) {
+                info(udev, "seek to MBR validity failed '%s'\n", node);
+                rc = 4;
+                goto close;
+        }
+        if (read(disk_fd, &mbr_valid, sizeof(mbr_valid)) != sizeof(mbr_valid)) {
+                info(udev, "read MBR validity failed '%s'\n", node);
+                rc = 5;
+                goto close;
+        }
+        if (mbr_valid != 0xAA55) {
+                fprintf(stderr, "no valid MBR signature '%s'\n", node);
+                info(udev, "no valid MBR signature '%s'\n", node);
+                rc=6;
+                goto close;
+        }
+
+        /* read EDD signature */
+        if (lseek(disk_fd, 440, SEEK_SET) < 0) {
+                info(udev, "seek to signature failed '%s'\n", node);
+                rc = 7;
+                goto close;
+        }
+        if (read(disk_fd, &disk_id, sizeof(disk_id)) != sizeof(disk_id)) {
+                info(udev, "read signature failed '%s'\n", node);
+                rc = 8;
+                goto close;
+        }
+        /* all zero is invalid */
+        info(udev, "read id 0x%08x from '%s'\n", disk_id, node);
+        if (disk_id == 0) {
+                fprintf(stderr, "no EDD signature '%s'\n", node);
+                info(udev, "'%s' signature is zero\n", node);
+                rc = 9;
+                goto close;
+        }
+
+        /* lookup signature in sysfs to determine the name */
+        match[0] = '\0';
+        for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+                char sysfs_id_buf[256];
+                uint32_t sysfs_id;
+                ssize_t size;
+
+                if (dent->d_name[0] == '.')
+                        continue;
+
+                util_strscpyl(filename, sizeof(filename), dent->d_name, "/mbr_signature", NULL);
+                sysfs_fd = openat(dirfd(dir), filename, O_RDONLY);
+                if (sysfs_fd < 0) {
+                        info(udev, "unable to open sysfs '%s'\n", filename);
+                        continue;
+                }
+
+                size = read(sysfs_fd, sysfs_id_buf, sizeof(sysfs_id_buf)-1);
+                close(sysfs_fd);
+                if (size <= 0) {
+                        info(udev, "read sysfs '%s' failed\n", filename);
+                        continue;
+                }
+                sysfs_id_buf[size] = '\0';
+                info(udev, "read '%s' from '%s'\n", sysfs_id_buf, filename);
+                sysfs_id = strtoul(sysfs_id_buf, NULL, 16);
+
+                /* look for matching value, that appears only once */
+                if (disk_id == sysfs_id) {
+                        if (match[0] == '\0') {
+                                /* store id */
+                                util_strscpy(match, sizeof(match), dent->d_name);
+                        } else {
+                                /* error, same signature for another device */
+                                info(udev, "'%s' does not have a unique signature\n", node);
+                                fprintf(stderr, "'%s' does not have a unique signature\n", node);
+                                rc = 10;
+                                goto exit;
+                        }
+                }
+        }
+
+        if (match[0] != '\0') {
+                if (export)
+                        printf("ID_EDD=%s\n", match);
+                else
+                        printf("%s\n", match);
+                rc = 0;
+        }
 
 close:
-	close(disk_fd);
+        close(disk_fd);
 closedir:
-	closedir(dir);
+        closedir(dir);
 exit:
-	udev_unref(udev);
-	udev_log_close();
-	return rc;
+        udev_unref(udev);
+        udev_log_close();
+        return rc;
 }
diff --git a/src/extras/floppy/create_floppy_devices.c b/src/extras/floppy/create_floppy_devices.c
index 47724f8b04..f71ef0d809 100644
--- a/src/extras/floppy/create_floppy_devices.c
+++ b/src/extras/floppy/create_floppy_devices.c
@@ -34,12 +34,12 @@
 #include "libudev-private.h"
 
 static char *table[] = {
-	"", "d360", "h1200", "u360", "u720", "h360", "h720",
-	"u1440", "u2880", "CompaQ", "h1440", "u1680", "h410",
-	"u820", "h1476", "u1722", "h420", "u830", "h1494", "u1743",
-	"h880", "u1040", "u1120", "h1600", "u1760", "u1920",
-	"u3200", "u3520", "u3840", "u1840", "u800", "u1600",
-	NULL
+        "", "d360", "h1200", "u360", "u720", "h360", "h720",
+        "u1440", "u2880", "CompaQ", "h1440", "u1680", "h410",
+        "u820", "h1476", "u1722", "h420", "u830", "h1494", "u1743",
+        "h880", "u1040", "u1120", "h1600", "u1760", "u1920",
+        "u3200", "u3520", "u3840", "u1840", "u800", "u1600",
+        NULL
 };
 
 static int t360[] = { 1, 0 };
@@ -48,130 +48,130 @@ static int t3in[] = { 8, 9, 26, 27, 28, 7, 11, 15, 19, 24, 25, 29, 31, 3, 4, 13,
 static int *table_sup[] = { NULL, t360, t1200, t3in+5+8, t3in+5, t3in, t3in };
 
 static void log_fn(struct udev *udev, int priority,
-		   const char *file, int line, const char *fn,
-		   const char *format, va_list args)
+                   const char *file, int line, const char *fn,
+                   const char *format, va_list args)
 {
-	vsyslog(priority, format, args);
+        vsyslog(priority, format, args);
 }
 
 int main(int argc, char **argv)
 {
-	struct udev *udev;
-	char *dev;
-	char *devname;
-	char node[64];
-	int type = 0, i, fdnum, c;
-	int major = 2, minor;
-	uid_t uid = 0;
-	gid_t gid = 0;
-	mode_t mode = 0660;
-	int create_nodes = 0;
-	int print_nodes = 0;
-	int is_err = 0;
-
-	udev = udev_new();
-	if (udev == NULL)
-		goto exit;
-
-	udev_log_init("create_floppy_devices");
-	udev_set_log_fn(udev, log_fn);
-	udev_selinux_init(udev);
-
-	while ((c = getopt(argc, argv, "cudm:U:G:M:t:")) != -1) {
-		switch (c) {
-		case 'c':
-			create_nodes = 1;
-			break;
-		case 'd':
-			print_nodes = 1;
-			break;
-		case 'U':
-			uid = util_lookup_user(udev, optarg);
-			break;
-		case 'G':
-			gid = util_lookup_group(udev, optarg);
-			break;
-		case 'M':
-			mode = strtol(optarg, NULL, 0);
-			mode = mode & 0666;
-			break;
-		case 'm':
-			major = strtol(optarg, NULL, 0);
-			break;
-		case 't':
-			type = strtol(optarg, NULL, 0);
-			break;
-		default:
-			is_err++;
-			break;
-		}
-	}
-
-	if (is_err || optind >= argc) {
-		printf("Usage:  %s [OPTION] device\n"
-		       "  -c   create\n"
-		       "  -d   debug\n"
-		       "  -m   Major number\n"
-		       "  -t   floppy type number\n"
-		       "  -U   device node user ownership\n"
-		       "  -G   device node group owner\n"
-		       "  -M   device node mode\n"
-		       "\n", argv[0]);
-		return 1;
-	}
-
-	dev = argv[optind];
-	devname = strrchr(dev, '/');
-	if (devname != NULL)
-		devname = &devname[1];
-	else
-		devname = dev;
-	if (strncmp(devname, "fd", 2) != 0) {
-		fprintf(stderr,"Device '%s' is not a floppy device\n", dev);
-		return 1;
-	}
-
-	fdnum = strtol(&devname[2], NULL, 10);
-	if (fdnum < 0 || fdnum > 7) {
-		fprintf(stderr,"Floppy device number %d out of range (0-7)\n", fdnum);
-		return 1;
-	}
-	if (fdnum > 3)
-		fdnum += 124;
-
-	if (major < 1) {
-		fprintf(stderr,"Invalid major number %d\n", major);
-		return 1;
-	}
-
-	if (type < 0 || type >= (int) ARRAY_SIZE(table_sup)) {
-		fprintf(stderr,"Invalid CMOS type %d\n", type);
-		return 1;
-	}
-
-	if (type == 0)
-		return 0;
-
-	i = 0;
-	while (table_sup[type][i]) {
-		sprintf(node, "%s%s", dev, table[table_sup[type][i]]);
-		minor = (table_sup[type][i] << 2) + fdnum;
-		if (print_nodes)
-			printf("%s b %.4o %d %d\n", node, mode, major, minor);
-		if (create_nodes) {
-			unlink(node);
-			udev_selinux_setfscreatecon(udev, node, S_IFBLK | mode);
-			mknod(node, S_IFBLK | mode, makedev(major,minor));
-			udev_selinux_resetfscreatecon(udev);
-			chown(node, uid, gid);
-			chmod(node, S_IFBLK | mode);
-		}
-		i++;
-	}
-
-	udev_selinux_exit(udev);
-	udev_unref(udev);
-	udev_log_close();
+        struct udev *udev;
+        char *dev;
+        char *devname;
+        char node[64];
+        int type = 0, i, fdnum, c;
+        int major = 2, minor;
+        uid_t uid = 0;
+        gid_t gid = 0;
+        mode_t mode = 0660;
+        int create_nodes = 0;
+        int print_nodes = 0;
+        int is_err = 0;
+
+        udev = udev_new();
+        if (udev == NULL)
+                goto exit;
+
+        udev_log_init("create_floppy_devices");
+        udev_set_log_fn(udev, log_fn);
+        udev_selinux_init(udev);
+
+        while ((c = getopt(argc, argv, "cudm:U:G:M:t:")) != -1) {
+                switch (c) {
+                case 'c':
+                        create_nodes = 1;
+                        break;
+                case 'd':
+                        print_nodes = 1;
+                        break;
+                case 'U':
+                        uid = util_lookup_user(udev, optarg);
+                        break;
+                case 'G':
+                        gid = util_lookup_group(udev, optarg);
+                        break;
+                case 'M':
+                        mode = strtol(optarg, NULL, 0);
+                        mode = mode & 0666;
+                        break;
+                case 'm':
+                        major = strtol(optarg, NULL, 0);
+                        break;
+                case 't':
+                        type = strtol(optarg, NULL, 0);
+                        break;
+                default:
+                        is_err++;
+                        break;
+                }
+        }
+
+        if (is_err || optind >= argc) {
+                printf("Usage:  %s [OPTION] device\n"
+                       "  -c   create\n"
+                       "  -d   debug\n"
+                       "  -m   Major number\n"
+                       "  -t   floppy type number\n"
+                       "  -U   device node user ownership\n"
+                       "  -G   device node group owner\n"
+                       "  -M   device node mode\n"
+                       "\n", argv[0]);
+                return 1;
+        }
+
+        dev = argv[optind];
+        devname = strrchr(dev, '/');
+        if (devname != NULL)
+                devname = &devname[1];
+        else
+                devname = dev;
+        if (strncmp(devname, "fd", 2) != 0) {
+                fprintf(stderr,"Device '%s' is not a floppy device\n", dev);
+                return 1;
+        }
+
+        fdnum = strtol(&devname[2], NULL, 10);
+        if (fdnum < 0 || fdnum > 7) {
+                fprintf(stderr,"Floppy device number %d out of range (0-7)\n", fdnum);
+                return 1;
+        }
+        if (fdnum > 3)
+                fdnum += 124;
+
+        if (major < 1) {
+                fprintf(stderr,"Invalid major number %d\n", major);
+                return 1;
+        }
+
+        if (type < 0 || type >= (int) ARRAY_SIZE(table_sup)) {
+                fprintf(stderr,"Invalid CMOS type %d\n", type);
+                return 1;
+        }
+
+        if (type == 0)
+                return 0;
+
+        i = 0;
+        while (table_sup[type][i]) {
+                sprintf(node, "%s%s", dev, table[table_sup[type][i]]);
+                minor = (table_sup[type][i] << 2) + fdnum;
+                if (print_nodes)
+                        printf("%s b %.4o %d %d\n", node, mode, major, minor);
+                if (create_nodes) {
+                        unlink(node);
+                        udev_selinux_setfscreatecon(udev, node, S_IFBLK | mode);
+                        mknod(node, S_IFBLK | mode, makedev(major,minor));
+                        udev_selinux_resetfscreatecon(udev);
+                        chown(node, uid, gid);
+                        chmod(node, S_IFBLK | mode);
+                }
+                i++;
+        }
+
+        udev_selinux_exit(udev);
+        udev_unref(udev);
+        udev_log_close();
 exit:
-	return 0;
+        return 0;
 }
diff --git a/src/extras/gudev/COPYING b/src/extras/gudev/COPYING
index 47044a8c58..da97db2bd0 100644
--- a/src/extras/gudev/COPYING
+++ b/src/extras/gudev/COPYING
@@ -1,5 +1,5 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
      51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
diff --git a/src/extras/gudev/docs/Makefile.am b/src/extras/gudev/docs/Makefile.am
index 65e69975b5..3512197660 100644
--- a/src/extras/gudev/docs/Makefile.am
+++ b/src/extras/gudev/docs/Makefile.am
@@ -78,14 +78,14 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS = \
-	$(DBUS_GLIB_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-I$(top_srcdir)/src/extras/gudev \
-	-I$(top_builddir)/src/extras/gudev
+        $(DBUS_GLIB_CFLAGS) \
+        $(GLIB_CFLAGS) \
+        -I$(top_srcdir)/src/extras/gudev \
+        -I$(top_builddir)/src/extras/gudev
 
 GTKDOC_LIBS = \
-	$(GLIB_LIBS) \
-	$(top_builddir)/src/extras/gudev/libgudev-1.0.la
+        $(GLIB_LIBS) \
+        $(top_builddir)/src/extras/gudev/libgudev-1.0.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/src/extras/gudev/docs/gudev-docs.xml b/src/extras/gudev/docs/gudev-docs.xml
index 65fdfff8e5..f876c3bc05 100644
--- a/src/extras/gudev/docs/gudev-docs.xml
+++ b/src/extras/gudev/docs/gudev-docs.xml
@@ -9,22 +9,22 @@
     <releaseinfo>For GUdev version &version;</releaseinfo>
     <authorgroup>
       <author>
-	<firstname>David</firstname>
-	<surname>Zeuthen</surname>
-	<affiliation>
-	  <address>
-	    <email>davidz@redhat.com</email>
-	  </address>
-	</affiliation>
+        <firstname>David</firstname>
+        <surname>Zeuthen</surname>
+        <affiliation>
+          <address>
+            <email>davidz@redhat.com</email>
+          </address>
+        </affiliation>
       </author>
       <author>
-	<firstname>Bastien</firstname>
-	<surname>Nocera</surname>
-	<affiliation>
-	  <address>
-	    <email>hadess@hadess.net</email>
-	  </address>
-	</affiliation>
+        <firstname>Bastien</firstname>
+        <surname>Nocera</surname>
+        <affiliation>
+          <address>
+            <email>hadess@hadess.net</email>
+          </address>
+        </affiliation>
       </author>
     </authorgroup>
 
@@ -35,32 +35,32 @@
 
     <legalnotice>
       <para>
-	Permission is granted to copy, distribute and/or modify this
-	document under the terms of the <citetitle>GNU Free
-	Documentation License</citetitle>, Version 1.1 or any later
-	version published by the Free Software Foundation with no
-	Invariant Sections, no Front-Cover Texts, and no Back-Cover
-	Texts. You may obtain a copy of the <citetitle>GNU Free
-	Documentation License</citetitle> from the Free Software
-	Foundation by visiting <ulink type="http"
-	url="http://www.fsf.org">their Web site</ulink> or by writing
-	to:
+        Permission is granted to copy, distribute and/or modify this
+        document under the terms of the <citetitle>GNU Free
+        Documentation License</citetitle>, Version 1.1 or any later
+        version published by the Free Software Foundation with no
+        Invariant Sections, no Front-Cover Texts, and no Back-Cover
+        Texts. You may obtain a copy of the <citetitle>GNU Free
+        Documentation License</citetitle> from the Free Software
+        Foundation by visiting <ulink type="http"
+        url="http://www.fsf.org">their Web site</ulink> or by writing
+        to:
 
-	<address>
-	  The Free Software Foundation, Inc.,
-	  <street>59 Temple Place</street> - Suite 330,
-	  <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>,
-	  <country>USA</country>
-	</address>
+        <address>
+          The Free Software Foundation, Inc.,
+          <street>59 Temple Place</street> - Suite 330,
+          <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>,
+          <country>USA</country>
+        </address>
       </para>
 
       <para>
-	Many of the names used by companies to distinguish their
-	products and services are claimed as trademarks. Where those
-	names appear in any freedesktop.org documentation, and those
-	trademarks are made aware to the members of the
-	freedesktop.org Project, the names have been printed in caps
-	or initial caps.
+        Many of the names used by companies to distinguish their
+        products and services are claimed as trademarks. Where those
+        names appear in any freedesktop.org documentation, and those
+        trademarks are made aware to the members of the
+        freedesktop.org Project, the names have been printed in caps
+        or initial caps.
       </para>
     </legalnotice>
   </bookinfo>
@@ -69,8 +69,8 @@
     <title>API Reference</title>
     <partintro>
       <para>
-	This part presents the class and function reference for the
-	<literal>libgudev</literal> library.
+        This part presents the class and function reference for the
+        <literal>libgudev</literal> library.
       </para>
     </partintro>
     <xi:include href="xml/gudevclient.xml"/>
diff --git a/src/extras/gudev/gudevclient.c b/src/extras/gudev/gudevclient.c
index a6465ad943..2b94102ac5 100644
--- a/src/extras/gudev/gudevclient.c
+++ b/src/extras/gudev/gudevclient.c
@@ -87,8 +87,8 @@ G_DEFINE_TYPE (GUdevClient, g_udev_client, G_TYPE_OBJECT)
 
 static gboolean
 monitor_event (GIOChannel *source,
-	       GIOCondition condition,
-	       gpointer data)
+               GIOCondition condition,
+               gpointer data)
 {
   GUdevClient *client = (GUdevClient *) data;
   GUdevDevice *device;
diff --git a/src/extras/keymap/check-keymaps.sh b/src/extras/keymap/check-keymaps.sh
index ea77b69c24..f81b6aac36 100755
--- a/src/extras/keymap/check-keymaps.sh
+++ b/src/extras/keymap/check-keymaps.sh
@@ -9,30 +9,30 @@ KEYMAPS_DIR=$SRCDIR/src/extras/keymap/keymaps #extras/keymap/keymaps
 RULES=$SRCDIR/src/extras/keymap/95-keymap.rules
 
 [ -e "$KEYLIST" ] || {
-    echo "need $KEYLIST please build first" >&2
-    exit 1
+        echo "need $KEYLIST please build first" >&2
+        exit 1
 }
 
 missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) \
                     <(grep -hv '^#' ${KEYMAPS_DIR}/*| awk '{print $2}' | sort -u))
 [ -z "$missing" ] || {
-    echo "ERROR: unknown key names in extras/keymap/keymaps/*:" >&2
-    echo "$missing" >&2
-    exit 1
+        echo "ERROR: unknown key names in extras/keymap/keymaps/*:" >&2
+        echo "$missing" >&2
+        exit 1
 }
 
 # check that all maps referred to in $RULES exist
 maps=$(sed -rn '/keymap \$name/ { s/^.*\$name ([^"[:space:]]+).*$/\1/; p }' $RULES)
 for m in $maps; do
-    # ignore inline mappings
-    [ "$m" = "${m#0x}" ] || continue
+        # ignore inline mappings
+        [ "$m" = "${m#0x}" ] || continue
 
-    [ -e ${KEYMAPS_DIR}/$m ] || {
-	echo "ERROR: unknown map name in $RULES: $m" >&2
-	exit 1
-    }
-    grep -q "extras/keymap/keymaps/$m\>" $SRCDIR/Makefile.am || {
-	echo "ERROR: map file $m is not added to Makefile.am" >&2
-	exit 1
-    }
+        [ -e ${KEYMAPS_DIR}/$m ] || {
+                echo "ERROR: unknown map name in $RULES: $m" >&2
+                exit 1
+        }
+        grep -q "extras/keymap/keymaps/$m\>" $SRCDIR/Makefile.am || {
+                echo "ERROR: map file $m is not added to Makefile.am" >&2
+                exit 1
+        }
 done
diff --git a/src/extras/keymap/findkeyboards b/src/extras/keymap/findkeyboards
index eba3737a96..9ce27429b2 100755
--- a/src/extras/keymap/findkeyboards
+++ b/src/extras/keymap/findkeyboards
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh -e
 # Find "real" keyboard devices and print their device path.
 # Author: Martin Pitt <martin.pitt@ubuntu.com>
 #
@@ -14,58 +14,55 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
 
-set -e
-
 # returns OK if $1 contains $2
 strstr() {
-    [ "${1#*$2*}" != "$1" ]
+        [ "${1#*$2*}" != "$1" ]
 }
 
 # returns OK if $1 contains $2 at the beginning
 str_starts() {
-    [ "${1#$2*}" != "$1" ]
+        [ "${1#$2*}" != "$1" ]
 }
 
 str_line_starts() {
-    while read a; do str_starts "$a" "$1" && return 0;done
-    return 1;
+        while read a; do str_starts "$a" "$1" && return 0;done
+        return 1;
 }
 
 # print a list of input devices which are keyboard-like
 keyboard_devices() {
-    # standard AT keyboard
-    for dev in `udevadm trigger --dry-run --verbose --property-match=ID_INPUT_KEYBOARD=1`; do
-        walk=`udevadm info --attribute-walk --path=$dev`
-        env=`udevadm info --query=env --path=$dev`
-        # filter out non-event devices, such as the parent input devices which
-        # have no devnode
-        if ! echo "$env" | str_line_starts 'DEVNAME='; then
-            continue
-        fi
-        if strstr "$walk" 'DRIVERS=="atkbd"'; then
-            echo -n 'AT keyboard: '
-        elif echo "$env" | str_line_starts 'ID_USB_DRIVER=usbhid'; then
-            echo -n 'USB keyboard: '
-        else
-            echo -n 'Unknown type: '
-        fi
-        udevadm info --query=name --path=$dev
-    done
+        # standard AT keyboard
+        for dev in `udevadm trigger --dry-run --verbose --property-match=ID_INPUT_KEYBOARD=1`; do
+                walk=`udevadm info --attribute-walk --path=$dev`
+                env=`udevadm info --query=env --path=$dev`
+                # filter out non-event devices, such as the parent input devices which have no devnode
+                if ! echo "$env" | str_line_starts 'DEVNAME='; then
+                        continue
+                fi
+                if strstr "$walk" 'DRIVERS=="atkbd"'; then
+                        echo -n 'AT keyboard: '
+                elif echo "$env" | str_line_starts 'ID_USB_DRIVER=usbhid'; then
+                        echo -n 'USB keyboard: '
+                else
+                        echo -n 'Unknown type: '
+               fi
+                       udevadm info --query=name --path=$dev
+        done
 
-    # modules
-    module=$(udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='*Extra Buttons')
-    module="$module
-$(udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='*extra buttons')"
-    module="$module
-$(udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='Sony Vaio Keys')"
-    for m in $module; do
-        for evdev in $m/event*/dev; do
-            if [ -e "$evdev" ]; then
-		echo -n 'module: '
-		udevadm info --query=name --path=${evdev%%/dev}
-            fi
-	done
-    done
+        # modules
+        module=$(udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='*Extra Buttons')
+        module="$module
+        $(udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='*extra buttons')"
+        module="$module
+        $(udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='Sony Vaio Keys')"
+        for m in $module; do
+                for evdev in $m/event*/dev; do
+                        if [ -e "$evdev" ]; then
+                                echo -n 'module: '
+                                udevadm info --query=name --path=${evdev%%/dev}
+                        fi
+                done
+        done
 }
 
 keyboard_devices
diff --git a/src/extras/keymap/keyboard-force-release.sh.in b/src/extras/keymap/keyboard-force-release.sh.in
index 154be3d733..dd040cebc3 100755
--- a/src/extras/keymap/keyboard-force-release.sh.in
+++ b/src/extras/keymap/keyboard-force-release.sh.in
@@ -5,18 +5,18 @@
 # $2 file with scancode list (hex or dec)
 
 case "$2" in
-	/*) scf="$2" ;;
-	*)  scf="@pkglibexecdir@/keymaps/force-release/$2" ;;
+        /*) scf="$2" ;;
+        *)  scf="@pkglibexecdir@/keymaps/force-release/$2" ;;
 esac
 
 read attr <"/sys/$1/force_release"
 while read scancode dummy; do
-	case "$scancode" in
-		\#*) ;;
-		*)
-			scancode=$(($scancode))
-			attr="$attr${attr:+,}$scancode"
-			;;
-	esac
+        case "$scancode" in
+                \#*) ;;
+                *)
+                        scancode=$(($scancode))
+                        attr="$attr${attr:+,}$scancode"
+                        ;;
+        esac
 done <"$scf"
 echo "$attr" >"/sys/$1/force_release"
diff --git a/src/extras/keymap/keymap.c b/src/extras/keymap/keymap.c
index 6bcfaefa18..92ec67b3a6 100644
--- a/src/extras/keymap/keymap.c
+++ b/src/extras/keymap/keymap.c
@@ -45,403 +45,403 @@ const struct key* lookup_key (const char *str, unsigned int len);
 
 static int evdev_open(const char *dev)
 {
-	int fd;
-	char fn[PATH_MAX];
-
-	if (strncmp(dev, "/dev", 4) != 0) {
-		snprintf(fn, sizeof(fn), "/dev/%s", dev);
-		dev = fn;
-	}
-
-	if ((fd = open(dev, O_RDWR)) < 0) {
-		fprintf(stderr, "error open('%s'): %m\n", dev);
-		return -1;
-	}
-	return fd;
+        int fd;
+        char fn[PATH_MAX];
+
+        if (strncmp(dev, "/dev", 4) != 0) {
+                snprintf(fn, sizeof(fn), "/dev/%s", dev);
+                dev = fn;
+        }
+
+        if ((fd = open(dev, O_RDWR)) < 0) {
+                fprintf(stderr, "error open('%s'): %m\n", dev);
+                return -1;
+        }
+        return fd;
 }
 
 static int evdev_get_keycode(int fd, int scancode, int e)
 {
-	int codes[2];
-
-	codes[0] = scancode;
-	if (ioctl(fd, EVIOCGKEYCODE, codes) < 0) {
-		if (e && errno == EINVAL) {
-			return -2;
-		} else {
-			fprintf(stderr, "EVIOCGKEYCODE: %m\n");
-			return -1;
-		}
-	}
-	return codes[1];
+        int codes[2];
+
+        codes[0] = scancode;
+        if (ioctl(fd, EVIOCGKEYCODE, codes) < 0) {
+                if (e && errno == EINVAL) {
+                        return -2;
+                } else {
+                        fprintf(stderr, "EVIOCGKEYCODE: %m\n");
+                        return -1;
+                }
+        }
+        return codes[1];
 }
 
 static int evdev_set_keycode(int fd, int scancode, int keycode)
 {
-	int codes[2];
+        int codes[2];
 
-	codes[0] = scancode;
-	codes[1] = keycode;
+        codes[0] = scancode;
+        codes[1] = keycode;
 
-	if (ioctl(fd, EVIOCSKEYCODE, codes) < 0) {
-		fprintf(stderr, "EVIOCSKEYCODE: %m\n");
-		return -1;
-	}
-	return 0;
+        if (ioctl(fd, EVIOCSKEYCODE, codes) < 0) {
+                fprintf(stderr, "EVIOCSKEYCODE: %m\n");
+                return -1;
+        }
+        return 0;
 }
 
 static int evdev_driver_version(int fd, char *v, size_t l)
 {
-	int version;
+        int version;
 
-	if (ioctl(fd, EVIOCGVERSION, &version)) {
-		fprintf(stderr, "EVIOCGVERSION: %m\n");
-		return -1;
-	}
+        if (ioctl(fd, EVIOCGVERSION, &version)) {
+                fprintf(stderr, "EVIOCGVERSION: %m\n");
+                return -1;
+        }
 
-	snprintf(v, l, "%i.%i.%i.", version >> 16, (version >> 8) & 0xff, version & 0xff);
-	return 0;
+        snprintf(v, l, "%i.%i.%i.", version >> 16, (version >> 8) & 0xff, version & 0xff);
+        return 0;
 }
 
 static int evdev_device_name(int fd, char *n, size_t l)
 {
-	if (ioctl(fd, EVIOCGNAME(l), n) < 0) {
-		fprintf(stderr, "EVIOCGNAME: %m\n");
-		return -1;
-	}
-	return 0;
+        if (ioctl(fd, EVIOCGNAME(l), n) < 0) {
+                fprintf(stderr, "EVIOCGNAME: %m\n");
+                return -1;
+        }
+        return 0;
 }
 
 /* Return a lower-case string with KEY_ prefix removed */
 static const char* format_keyname(const char* key) {
-	static char result[101];
-	const char* s;
-	int len;
-
-	for (s = key+4, len = 0; *s && len < 100; ++len, ++s)
-		result[len] = tolower(*s);
-	result[len] = '\0';
-	return result;
+        static char result[101];
+        const char* s;
+        int len;
+
+        for (s = key+4, len = 0; *s && len < 100; ++len, ++s)
+                result[len] = tolower(*s);
+        result[len] = '\0';
+        return result;
 }
 
 static int dump_table(int fd) {
-	char version[256], name[256];
-	int scancode, r = -1;
+        char version[256], name[256];
+        int scancode, r = -1;
 
-	if (evdev_driver_version(fd, version, sizeof(version)) < 0)
-		goto fail;
+        if (evdev_driver_version(fd, version, sizeof(version)) < 0)
+                goto fail;
 
-	if (evdev_device_name(fd, name, sizeof(name)) < 0)
-		goto fail;
+        if (evdev_device_name(fd, name, sizeof(name)) < 0)
+                goto fail;
 
-	printf("### evdev %s, driver '%s'\n", version, name);
+        printf("### evdev %s, driver '%s'\n", version, name);
 
-	r = 0;
-	for (scancode = 0; scancode < MAX_SCANCODES; scancode++) {
-		int keycode;
+        r = 0;
+        for (scancode = 0; scancode < MAX_SCANCODES; scancode++) {
+                int keycode;
 
-		if ((keycode = evdev_get_keycode(fd, scancode, 1)) < 0) {
-			if (keycode == -2)
-				continue;
-			r = -1;
-			break;
-		}
+                if ((keycode = evdev_get_keycode(fd, scancode, 1)) < 0) {
+                        if (keycode == -2)
+                                continue;
+                        r = -1;
+                        break;
+                }
 
-		if (keycode < KEY_MAX && key_names[keycode])
-			printf("0x%03x %s\n", scancode, format_keyname(key_names[keycode]));
-		else
-			printf("0x%03x 0x%03x\n", scancode, keycode);
-	}
+                if (keycode < KEY_MAX && key_names[keycode])
+                        printf("0x%03x %s\n", scancode, format_keyname(key_names[keycode]));
+                else
+                        printf("0x%03x 0x%03x\n", scancode, keycode);
+        }
 fail:
-	return r;
+        return r;
 }
 
 static void set_key(int fd, const char* scancode_str, const char* keyname)
 {
-	unsigned scancode;
-	char *endptr;
-	char t[105] = "KEY_UNKNOWN";
-	const struct key *k;
-
-	scancode = (unsigned) strtol(scancode_str, &endptr, 0);
-	if (*endptr != '\0') {
-		fprintf(stderr, "ERROR: Invalid scancode\n");
-		exit(1);
-	}
-
-	snprintf(t, sizeof(t), "KEY_%s", keyname);
-
-	if (!(k = lookup_key(t, strlen(t)))) {
-		fprintf(stderr, "ERROR: Unknown key name '%s'\n", keyname);
-		exit(1);
-	}
-
-	if (evdev_set_keycode(fd, scancode, k->id) < 0)
-		fprintf(stderr, "setting scancode 0x%2X to key code %i failed\n",
-			scancode, k->id);
-	else
-		printf("setting scancode 0x%2X to key code %i\n",
-			scancode, k->id);
+        unsigned scancode;
+        char *endptr;
+        char t[105] = "KEY_UNKNOWN";
+        const struct key *k;
+
+        scancode = (unsigned) strtol(scancode_str, &endptr, 0);
+        if (*endptr != '\0') {
+                fprintf(stderr, "ERROR: Invalid scancode\n");
+                exit(1);
+        }
+
+        snprintf(t, sizeof(t), "KEY_%s", keyname);
+
+        if (!(k = lookup_key(t, strlen(t)))) {
+                fprintf(stderr, "ERROR: Unknown key name '%s'\n", keyname);
+                exit(1);
+        }
+
+        if (evdev_set_keycode(fd, scancode, k->id) < 0)
+                fprintf(stderr, "setting scancode 0x%2X to key code %i failed\n",
+                        scancode, k->id);
+        else
+                printf("setting scancode 0x%2X to key code %i\n",
+                        scancode, k->id);
 }
 
 static int merge_table(int fd, FILE *f) {
-	int r = 0;
-	int line = 0;
-
-	while (!feof(f)) {
-		char s[256], *p;
-		int scancode, new_keycode, old_keycode;
-
-		if (!fgets(s, sizeof(s), f))
-			break;
-
-		line++;
-		p = s+strspn(s, "\t ");
-		if (*p == '#' || *p == '\n')
-			continue;
-
-		if (sscanf(p, "%i %i", &scancode, &new_keycode) != 2) {
-			char t[105] = "KEY_UNKNOWN";
-			const struct key *k;
-
-			if (sscanf(p, "%i %100s", &scancode, t+4) != 2) {
-				fprintf(stderr, "WARNING: Parse failure at line %i, ignoring.\n", line);
-				r = -1;
-				continue;
-			}
-
-			if (!(k = lookup_key(t, strlen(t)))) {
-				fprintf(stderr, "WARNING: Unknown key '%s' at line %i, ignoring.\n", t, line);
-				r = -1;
-				continue;
-			}
-
-			new_keycode = k->id;
-		}
-
-
-		if ((old_keycode = evdev_get_keycode(fd, scancode, 0)) < 0) {
-			r = -1;
-			goto fail;
-		}
-
-		if (evdev_set_keycode(fd, scancode, new_keycode) < 0) {
-			r = -1;
-			goto fail;
-		}
-
-		if (new_keycode != old_keycode)
-			fprintf(stderr, "Remapped scancode 0x%02x to 0x%02x (prior: 0x%02x)\n",
-				scancode, new_keycode, old_keycode);
-	}
+        int r = 0;
+        int line = 0;
+
+        while (!feof(f)) {
+                char s[256], *p;
+                int scancode, new_keycode, old_keycode;
+
+                if (!fgets(s, sizeof(s), f))
+                        break;
+
+                line++;
+                p = s+strspn(s, "\t ");
+                if (*p == '#' || *p == '\n')
+                        continue;
+
+                if (sscanf(p, "%i %i", &scancode, &new_keycode) != 2) {
+                        char t[105] = "KEY_UNKNOWN";
+                        const struct key *k;
+
+                        if (sscanf(p, "%i %100s", &scancode, t+4) != 2) {
+                                fprintf(stderr, "WARNING: Parse failure at line %i, ignoring.\n", line);
+                                r = -1;
+                                continue;
+                        }
+
+                        if (!(k = lookup_key(t, strlen(t)))) {
+                                fprintf(stderr, "WARNING: Unknown key '%s' at line %i, ignoring.\n", t, line);
+                                r = -1;
+                                continue;
+                        }
+
+                        new_keycode = k->id;
+                }
+
+
+                if ((old_keycode = evdev_get_keycode(fd, scancode, 0)) < 0) {
+                        r = -1;
+                        goto fail;
+                }
+
+                if (evdev_set_keycode(fd, scancode, new_keycode) < 0) {
+                        r = -1;
+                        goto fail;
+                }
+
+                if (new_keycode != old_keycode)
+                        fprintf(stderr, "Remapped scancode 0x%02x to 0x%02x (prior: 0x%02x)\n",
+                                scancode, new_keycode, old_keycode);
+        }
 fail:
-	fclose(f);
-	return r;
+        fclose(f);
+        return r;
 }
 
 
 /* read one event; return 1 if valid */
 static int read_event(int fd, struct input_event* ev)
 {
-	int ret;
-	ret = read(fd, ev, sizeof(struct input_event));
-
-	if (ret < 0) {
-		perror("read");
-		return 0;
-	}
-	if (ret != sizeof(struct input_event)) {
-		fprintf(stderr, "did not get enough data for event struct, aborting\n");
-		return 0;
-	}
-
-	return 1;
+        int ret;
+        ret = read(fd, ev, sizeof(struct input_event));
+
+        if (ret < 0) {
+                perror("read");
+                return 0;
+        }
+        if (ret != sizeof(struct input_event)) {
+                fprintf(stderr, "did not get enough data for event struct, aborting\n");
+                return 0;
+        }
+
+        return 1;
 }
 
 static void print_key(uint32_t scancode, uint16_t keycode, int has_scan, int has_key)
 {
-	const char *keyname;
-
-	/* ignore key release events */
-	if (has_key == 1)
-		return;
-
-	if (has_key == 0 && has_scan != 0) {
-		fprintf(stderr, "got scan code event 0x%02X without a key code event\n",
-			scancode);
-		return;
-	}
-
-	if (has_scan != 0)
-		printf("scan code: 0x%02X   ", scancode);
-	else
-		printf("(no scan code received)  ");
-
-	keyname = key_names[keycode];
-	if (keyname != NULL)
-		printf("key code: %s\n", format_keyname(keyname));
-	else
-		printf("key code: %03X\n", keycode);
+        const char *keyname;
+
+        /* ignore key release events */
+        if (has_key == 1)
+                return;
+
+        if (has_key == 0 && has_scan != 0) {
+                fprintf(stderr, "got scan code event 0x%02X without a key code event\n",
+                        scancode);
+                return;
+        }
+
+        if (has_scan != 0)
+                printf("scan code: 0x%02X   ", scancode);
+        else
+                printf("(no scan code received)  ");
+
+        keyname = key_names[keycode];
+        if (keyname != NULL)
+                printf("key code: %s\n", format_keyname(keyname));
+        else
+                printf("key code: %03X\n", keycode);
 }
 
 static void interactive(int fd)
 {
-	struct input_event ev;
-	uint32_t last_scan = 0;
-	uint16_t last_key = 0;
-	int has_scan; /* boolean */
-	int has_key; /* 0: none, 1: release, 2: press */
-
-	/* grab input device */
-	ioctl(fd, EVIOCGRAB, 1);
-	puts("Press ESC to finish, or Control-C if this device is not your primary keyboard");
-
-	has_scan = has_key = 0;
-	while (read_event(fd, &ev)) {
-		/* Drivers usually send the scan code first, then the key code,
-		 * then a SYN. Some drivers (like thinkpad_acpi) send the key
-		 * code first, and some drivers might not send SYN events, so
-		 * keep a robust state machine which can deal with any of those
-		 */
-
-		if (ev.type == EV_MSC && ev.code == MSC_SCAN) {
-			if (has_scan) {
-				fputs("driver did not send SYN event in between key events; previous event:\n",
-				      stderr);
-				print_key(last_scan, last_key, has_scan, has_key);
-				has_key = 0;
-			}
-
-			last_scan = ev.value;
-			has_scan = 1;
-			/*printf("--- got scan %u; has scan %i key %i\n", last_scan, has_scan, has_key); */
-		}
-		else if (ev.type == EV_KEY) {
-			if (has_key) {
-				fputs("driver did not send SYN event in between key events; previous event:\n",
-				      stderr);
-				print_key(last_scan, last_key, has_scan, has_key);
-				has_scan = 0;
-			}
-
-			last_key = ev.code;
-			has_key = 1 + ev.value;
-			/*printf("--- got key %hu; has scan %i key %i\n", last_key, has_scan, has_key);*/
-
-			/* Stop on ESC */
-			if (ev.code == KEY_ESC && ev.value == 0)
-				break;
-		}
-		else if (ev.type == EV_SYN) {
-			/*printf("--- got SYN; has scan %i key %i\n", has_scan, has_key);*/
-			print_key(last_scan, last_key, has_scan, has_key);
-
-			has_scan = has_key = 0;
-		}
-
-	}
-
-	/* release input device */
-	ioctl(fd, EVIOCGRAB, 0);
+        struct input_event ev;
+        uint32_t last_scan = 0;
+        uint16_t last_key = 0;
+        int has_scan; /* boolean */
+        int has_key; /* 0: none, 1: release, 2: press */
+
+        /* grab input device */
+        ioctl(fd, EVIOCGRAB, 1);
+        puts("Press ESC to finish, or Control-C if this device is not your primary keyboard");
+
+        has_scan = has_key = 0;
+        while (read_event(fd, &ev)) {
+                /* Drivers usually send the scan code first, then the key code,
+                 * then a SYN. Some drivers (like thinkpad_acpi) send the key
+                 * code first, and some drivers might not send SYN events, so
+                 * keep a robust state machine which can deal with any of those
+                 */
+
+                if (ev.type == EV_MSC && ev.code == MSC_SCAN) {
+                        if (has_scan) {
+                                fputs("driver did not send SYN event in between key events; previous event:\n",
+                                      stderr);
+                                print_key(last_scan, last_key, has_scan, has_key);
+                                has_key = 0;
+                        }
+
+                        last_scan = ev.value;
+                        has_scan = 1;
+                        /*printf("--- got scan %u; has scan %i key %i\n", last_scan, has_scan, has_key); */
+                }
+                else if (ev.type == EV_KEY) {
+                        if (has_key) {
+                                fputs("driver did not send SYN event in between key events; previous event:\n",
+                                      stderr);
+                                print_key(last_scan, last_key, has_scan, has_key);
+                                has_scan = 0;
+                        }
+
+                        last_key = ev.code;
+                        has_key = 1 + ev.value;
+                        /*printf("--- got key %hu; has scan %i key %i\n", last_key, has_scan, has_key);*/
+
+                        /* Stop on ESC */
+                        if (ev.code == KEY_ESC && ev.value == 0)
+                                break;
+                }
+                else if (ev.type == EV_SYN) {
+                        /*printf("--- got SYN; has scan %i key %i\n", has_scan, has_key);*/
+                        print_key(last_scan, last_key, has_scan, has_key);
+
+                        has_scan = has_key = 0;
+                }
+
+        }
+
+        /* release input device */
+        ioctl(fd, EVIOCGRAB, 0);
 }
 
 static void help(int error)
 {
-	const char* h = "Usage: keymap <event device> [<map file>]\n"
-	                "       keymap <event device> scancode keyname [...]\n"
-		        "       keymap -i <event device>\n";
-	if (error) {
-		fputs(h, stderr);
-		exit(2);
-	} else {
-		fputs(h, stdout);
-		exit(0);
-	}
+        const char* h = "Usage: keymap <event device> [<map file>]\n"
+                        "       keymap <event device> scancode keyname [...]\n"
+                        "       keymap -i <event device>\n";
+        if (error) {
+                fputs(h, stderr);
+                exit(2);
+        } else {
+                fputs(h, stdout);
+                exit(0);
+        }
 }
 
 int main(int argc, char **argv)
 {
-	static const struct option options[] = {
-		{ "help", no_argument, NULL, 'h' },
-		{ "interactive", no_argument, NULL, 'i' },
-		{}
-	};
-	int fd = -1;
-	int opt_interactive = 0;
-	int i;
-
-	while (1) {
-		int option;
-
-		option = getopt_long(argc, argv, "hi", options, NULL);
-		if (option == -1)
-			break;
-
-		switch (option) {
-		case 'h':
-		        help(0);
-
-		case 'i':
-			opt_interactive = 1;
-			break;
-		default:
-			return 1;
-		}
-	}
-
-	if (argc < optind+1)
-		help (1);
-
-	if ((fd = evdev_open(argv[optind])) < 0)
-		return 3;
-
-	/* one argument (device): dump or interactive */
-	if (argc == optind+1) {
-		if (opt_interactive)
-			interactive(fd);
-		else
-			dump_table(fd);
-		return 0;
-	}
-
-	/* two arguments (device, mapfile): set map file */
-	if (argc == optind+2) {
-		const char *filearg = argv[optind+1];
-		if (strchr(filearg, '/')) {
-			/* Keymap file argument is a path */
-			FILE *f = fopen(filearg, "r");
-			if (f)
-				merge_table(fd, f);
-			else
-				perror(filearg);
-		} else {
-			/* Keymap file argument is a filename */
-			/* Open override file if present, otherwise default file */
-			char keymap_path[PATH_MAX];
-			snprintf(keymap_path, sizeof(keymap_path), "%s%s", SYSCONFDIR "/udev/keymaps/", filearg);
-			FILE *f = fopen(keymap_path, "r");
-			if (f) {
-				merge_table(fd, f);
-			} else {
-				snprintf(keymap_path, sizeof(keymap_path), "%s%s", PKGLIBEXECDIR "/keymaps/", filearg);
-				f = fopen(keymap_path, "r");
-				if (f)
-					merge_table(fd, f);
-				else
-					perror(keymap_path);
-			}
-		}
-		return 0;
-	}
-
-	/* more arguments (device, scancode/keyname pairs): set keys directly */
-	if ((argc - optind - 1) % 2 == 0) {
-		for (i = optind+1; i < argc; i += 2)
-			set_key(fd, argv[i], argv[i+1]);
-		return 0;
-	}
-
-	/* invalid number of arguments */
-	help(1);
-	return 1; /* not reached */
+        static const struct option options[] = {
+                { "help", no_argument, NULL, 'h' },
+                { "interactive", no_argument, NULL, 'i' },
+                {}
+        };
+        int fd = -1;
+        int opt_interactive = 0;
+        int i;
+
+        while (1) {
+                int option;
+
+                option = getopt_long(argc, argv, "hi", options, NULL);
+                if (option == -1)
+                        break;
+
+                switch (option) {
+                case 'h':
+                        help(0);
+
+                case 'i':
+                        opt_interactive = 1;
+                        break;
+                default:
+                        return 1;
+                }
+        }
+
+        if (argc < optind+1)
+                help (1);
+
+        if ((fd = evdev_open(argv[optind])) < 0)
+                return 3;
+
+        /* one argument (device): dump or interactive */
+        if (argc == optind+1) {
+                if (opt_interactive)
+                        interactive(fd);
+                else
+                        dump_table(fd);
+                return 0;
+        }
+
+        /* two arguments (device, mapfile): set map file */
+        if (argc == optind+2) {
+                const char *filearg = argv[optind+1];
+                if (strchr(filearg, '/')) {
+                        /* Keymap file argument is a path */
+                        FILE *f = fopen(filearg, "r");
+                        if (f)
+                                merge_table(fd, f);
+                        else
+                                perror(filearg);
+                } else {
+                        /* Keymap file argument is a filename */
+                        /* Open override file if present, otherwise default file */
+                        char keymap_path[PATH_MAX];
+                        snprintf(keymap_path, sizeof(keymap_path), "%s%s", SYSCONFDIR "/udev/keymaps/", filearg);
+                        FILE *f = fopen(keymap_path, "r");
+                        if (f) {
+                                merge_table(fd, f);
+                        } else {
+                                snprintf(keymap_path, sizeof(keymap_path), "%s%s", PKGLIBEXECDIR "/keymaps/", filearg);
+                                f = fopen(keymap_path, "r");
+                                if (f)
+                                        merge_table(fd, f);
+                                else
+                                        perror(keymap_path);
+                        }
+                }
+                return 0;
+        }
+
+        /* more arguments (device, scancode/keyname pairs): set keys directly */
+        if ((argc - optind - 1) % 2 == 0) {
+                for (i = optind+1; i < argc; i += 2)
+                        set_key(fd, argv[i], argv[i+1]);
+                return 0;
+        }
+
+        /* invalid number of arguments */
+        help(1);
+        return 1; /* not reached */
 }
diff --git a/src/extras/keymap/keymaps/acer-aspire_5720 b/src/extras/keymap/keymaps/acer-aspire_5720
index c4a8459367..1496d63a52 100644
--- a/src/extras/keymap/keymaps/acer-aspire_5720
+++ b/src/extras/keymap/keymaps/acer-aspire_5720
@@ -1,4 +1,4 @@
 0x84 bluetooth  # sent when bluetooth module missing, and key pressed
-0x92 media	# acer arcade
+0x92 media      # acer arcade
 0xD4 bluetooth  # bluetooth on
 0xD9 bluetooth  # bluetooth off
diff --git a/src/extras/keymap/keymaps/lenovo-ideapad b/src/extras/keymap/keymaps/lenovo-ideapad
index d5f25671a5..9ab02ba332 100644
--- a/src/extras/keymap/keymaps/lenovo-ideapad
+++ b/src/extras/keymap/keymaps/lenovo-ideapad
@@ -1,7 +1,7 @@
 # Key codes observed on S10-3, assumed valid on other IdeaPad models
-0x81 rfkill			# does nothing in BIOS
-0x83 display_off		# BIOS toggles screen state
-0xB9 brightnessup		# does nothing in BIOS
-0xBA brightnessdown		# does nothing in BIOS
-0xF1 camera			# BIOS toggles camera power
-0xf2 unknown			# trackpad enable/disable (does nothing in BIOS)
+0x81 rfkill             # does nothing in BIOS
+0x83 display_off        # BIOS toggles screen state
+0xB9 brightnessup       # does nothing in BIOS
+0xBA brightnessdown     # does nothing in BIOS
+0xF1 camera             # BIOS toggles camera power
+0xf2 unknown            # trackpad enable/disable (does nothing in BIOS)
diff --git a/src/extras/mtd_probe/mtd_probe.c b/src/extras/mtd_probe/mtd_probe.c
index e45867ffa9..1aa08d3851 100644
--- a/src/extras/mtd_probe/mtd_probe.c
+++ b/src/extras/mtd_probe/mtd_probe.c
@@ -28,24 +28,24 @@
 
 int main(int argc, char** argv)
 {
-	if (argc != 2) {
-		printf("usage: mtd_probe /dev/mtd[n]\n");
-		return 1;
-	}
+        if (argc != 2) {
+                printf("usage: mtd_probe /dev/mtd[n]\n");
+                return 1;
+        }
 
-	int mtd_fd = open(argv[1], O_RDONLY);
-	if (mtd_fd == -1) {
-		perror("open");
-		exit(-1);
-	}
+        int mtd_fd = open(argv[1], O_RDONLY);
+        if (mtd_fd == -1) {
+                perror("open");
+                exit(-1);
+        }
 
-	mtd_info_t mtd_info;
-	int error = ioctl(mtd_fd, MEMGETINFO, &mtd_info);
-	if (error == -1) {
-		perror("ioctl");
-		exit(-1);
-	}
+        mtd_info_t mtd_info;
+        int error = ioctl(mtd_fd, MEMGETINFO, &mtd_info);
+        if (error == -1) {
+                perror("ioctl");
+                exit(-1);
+        }
 
-	probe_smart_media(mtd_fd, &mtd_info);
-	return -1;
+        probe_smart_media(mtd_fd, &mtd_info);
+        return -1;
 }
diff --git a/src/extras/mtd_probe/mtd_probe.h b/src/extras/mtd_probe/mtd_probe.h
index 20ecd4578e..2a37ede578 100644
--- a/src/extras/mtd_probe/mtd_probe.h
+++ b/src/extras/mtd_probe/mtd_probe.h
@@ -21,29 +21,29 @@
 
 /* Full oob structure as written on the flash */
 struct sm_oob {
-	uint32_t reserved;
-	uint8_t data_status;
-	uint8_t block_status;
-	uint8_t lba_copy1[2];
-	uint8_t ecc2[3];
-	uint8_t lba_copy2[2];
-	uint8_t ecc1[3];
+        uint32_t reserved;
+        uint8_t data_status;
+        uint8_t block_status;
+        uint8_t lba_copy1[2];
+        uint8_t ecc2[3];
+        uint8_t lba_copy2[2];
+        uint8_t ecc1[3];
 } __attribute__((packed));
 
 
 /* one sector is always 512 bytes, but it can consist of two nand pages */
-#define SM_SECTOR_SIZE		512
+#define SM_SECTOR_SIZE                512
 
 /* oob area is also 16 bytes, but might be from two pages */
-#define SM_OOB_SIZE		16
+#define SM_OOB_SIZE                16
 
 /* This is maximum zone size, and all devices that have more that one zone
    have this size */
-#define SM_MAX_ZONE_SIZE 	1024
+#define SM_MAX_ZONE_SIZE         1024
 
 /* support for small page nand */
-#define SM_SMALL_PAGE 		256
-#define SM_SMALL_OOB_SIZE	8
+#define SM_SMALL_PAGE                 256
+#define SM_SMALL_OOB_SIZE        8
 
 
 void probe_smart_media(int mtd_fd, mtd_info_t *info);
diff --git a/src/extras/mtd_probe/probe_smartmedia.c b/src/extras/mtd_probe/probe_smartmedia.c
index 49704e380a..b3cdefc633 100644
--- a/src/extras/mtd_probe/probe_smartmedia.c
+++ b/src/extras/mtd_probe/probe_smartmedia.c
@@ -30,68 +30,68 @@
 #include "mtd_probe.h"
 
 static const uint8_t cis_signature[] = {
-	0x01, 0x03, 0xD9, 0x01, 0xFF, 0x18, 0x02, 0xDF, 0x01, 0x20
+        0x01, 0x03, 0xD9, 0x01, 0xFF, 0x18, 0x02, 0xDF, 0x01, 0x20
 };
 
 
 void probe_smart_media(int mtd_fd, mtd_info_t* info)
 {
-	char* cis_buffer = malloc(SM_SECTOR_SIZE);
+        char* cis_buffer = malloc(SM_SECTOR_SIZE);
 
-	if (!cis_buffer)
-		return;
+        if (!cis_buffer)
+                return;
 
-	if (info->type != MTD_NANDFLASH)
-		goto exit;
+        if (info->type != MTD_NANDFLASH)
+                goto exit;
 
-	int sector_size = info->writesize;
-	int block_size = info->erasesize;
-	int size_in_megs = info->size / (1024 * 1024);
-	int spare_count;
+        int sector_size = info->writesize;
+        int block_size = info->erasesize;
+        int size_in_megs = info->size / (1024 * 1024);
+        int spare_count;
 
 
-	if (sector_size != SM_SECTOR_SIZE && sector_size != SM_SMALL_PAGE)
-		goto exit;
+        if (sector_size != SM_SECTOR_SIZE && sector_size != SM_SMALL_PAGE)
+                goto exit;
 
-	switch(size_in_megs) {
-	case 1:
-	case 2:
-		spare_count = 6;
-		break;
-	case 4:
-		spare_count = 12;
-		break;
-	default:
-		spare_count = 24;
-		break;
-	}
+        switch(size_in_megs) {
+        case 1:
+        case 2:
+                spare_count = 6;
+                break;
+        case 4:
+                spare_count = 12;
+                break;
+        default:
+                spare_count = 24;
+                break;
+        }
 
 
-	int offset;
-	int cis_found = 0;
+        int offset;
+        int cis_found = 0;
 
-	for (offset = 0 ; offset < block_size * spare_count ;
-						offset += sector_size) {
+        for (offset = 0 ; offset < block_size * spare_count ;
+                                                offset += sector_size) {
 
-		lseek(mtd_fd, SEEK_SET, offset);
-		if (read(mtd_fd, cis_buffer, SM_SECTOR_SIZE) == SM_SECTOR_SIZE){
-			cis_found = 1;
-			break;
-		}
-	}
+                lseek(mtd_fd, SEEK_SET, offset);
+                if (read(mtd_fd, cis_buffer, SM_SECTOR_SIZE) == SM_SECTOR_SIZE){
+                        cis_found = 1;
+                        break;
+                }
+        }
 
-	if (!cis_found)
-		goto exit;
+        if (!cis_found)
+                goto exit;
 
-	if (memcmp(cis_buffer, cis_signature, sizeof(cis_signature)) != 0 &&
-		(memcmp(cis_buffer + SM_SMALL_PAGE, cis_signature,
-			sizeof(cis_signature)) != 0))
-		goto exit;
+        if (memcmp(cis_buffer, cis_signature, sizeof(cis_signature)) != 0 &&
+                (memcmp(cis_buffer + SM_SMALL_PAGE, cis_signature,
+                        sizeof(cis_signature)) != 0))
+                goto exit;
 
-	printf("MTD_FTL=smartmedia\n");
-	free(cis_buffer);
-	exit(0);
+        printf("MTD_FTL=smartmedia\n");
+        free(cis_buffer);
+        exit(0);
 exit:
-	free(cis_buffer);
-	return;
+        free(cis_buffer);
+        return;
 }
diff --git a/src/extras/rule_generator/rule_generator.functions b/src/extras/rule_generator/rule_generator.functions
index 0f1b73850e..2eec1b6abf 100644
--- a/src/extras/rule_generator/rule_generator.functions
+++ b/src/extras/rule_generator/rule_generator.functions
@@ -20,94 +20,94 @@ PATH='/usr/bin:/bin:/usr/sbin:/sbin'
 # Read a single line from file $1 in the $DEVPATH directory.
 # The function must not return an error even if the file does not exist.
 sysread() {
-	local file="$1"
-	[ -e "/sys$DEVPATH/$file" ] || return 0
-	local value
-	read value < "/sys$DEVPATH/$file" || return 0
-	echo "$value"
+        local file="$1"
+        [ -e "/sys$DEVPATH/$file" ] || return 0
+        local value
+        read value < "/sys$DEVPATH/$file" || return 0
+        echo "$value"
 }
 
 sysreadlink() {
-	local file="$1"
-	[ -e "/sys$DEVPATH/$file" ] || return 0
-	readlink -f /sys$DEVPATH/$file 2> /dev/null || true
+        local file="$1"
+        [ -e "/sys$DEVPATH/$file" ] || return 0
+        readlink -f /sys$DEVPATH/$file 2> /dev/null || true
 }
 
 # Return true if a directory is writeable.
 writeable() {
-	if ln -s test-link $1/.is-writeable 2> /dev/null; then
-		rm -f $1/.is-writeable
-		return 0
-	else
-		return 1
-	fi
+        if ln -s test-link $1/.is-writeable 2> /dev/null; then
+                rm -f $1/.is-writeable
+                return 0
+        else
+                return 1
+        fi
 }
 
 # Create a lock file for the current rules file.
 lock_rules_file() {
-	RUNDIR=$(udevadm info --run)
-	[ -e "$RUNDIR" ] || return 0
-
-	RULES_LOCK="$RUNDIR/.lock-${RULES_FILE##*/}"
-
-	retry=30
-	while ! mkdir $RULES_LOCK 2> /dev/null; do
-		if [ $retry -eq 0 ]; then
-			 echo "Cannot lock $RULES_FILE!" >&2
-			 exit 2
-		fi
-		sleep 1
-		retry=$(($retry - 1))
-	done
+        RUNDIR=$(udevadm info --run)
+        [ -e "$RUNDIR" ] || return 0
+
+        RULES_LOCK="$RUNDIR/.lock-${RULES_FILE##*/}"
+
+        retry=30
+        while ! mkdir $RULES_LOCK 2> /dev/null; do
+                if [ $retry -eq 0 ]; then
+                         echo "Cannot lock $RULES_FILE!" >&2
+                         exit 2
+                fi
+                sleep 1
+                retry=$(($retry - 1))
+        done
 }
 
 unlock_rules_file() {
-	[ "$RULES_LOCK" ] || return 0
-	rmdir $RULES_LOCK || true
+        [ "$RULES_LOCK" ] || return 0
+        rmdir $RULES_LOCK || true
 }
 
 # Choose the real rules file if it is writeable or a temporary file if not.
 # Both files should be checked later when looking for existing rules.
 choose_rules_file() {
-	RUNDIR=$(udevadm info --run)
-	local tmp_rules_file="$RUNDIR/tmp-rules--${RULES_FILE##*/}"
-	[ -e "$RULES_FILE" -o -e "$tmp_rules_file" ] || PRINT_HEADER=1
-
-	if writeable ${RULES_FILE%/*}; then
-		RO_RULES_FILE='/dev/null'
-	else
-		RO_RULES_FILE=$RULES_FILE
-		RULES_FILE=$tmp_rules_file
-	fi
+        RUNDIR=$(udevadm info --run)
+        local tmp_rules_file="$RUNDIR/tmp-rules--${RULES_FILE##*/}"
+        [ -e "$RULES_FILE" -o -e "$tmp_rules_file" ] || PRINT_HEADER=1
+
+        if writeable ${RULES_FILE%/*}; then
+                RO_RULES_FILE='/dev/null'
+        else
+                RO_RULES_FILE=$RULES_FILE
+                RULES_FILE=$tmp_rules_file
+        fi
 }
 
 # Return the name of the first free device.
 raw_find_next_available() {
-	local links="$1"
-
-	local basename=${links%%[ 0-9]*}
-	local max=-1
-	for name in $links; do
-		local num=${name#$basename}
-		[ "$num" ] || num=0
-		[ $num -gt $max ] && max=$num
-	done
-
-	local max=$(($max + 1))
-	# "name0" actually is just "name"
-	[ $max -eq 0 ] && return
-	echo "$max"
+        local links="$1"
+
+        local basename=${links%%[ 0-9]*}
+        local max=-1
+        for name in $links; do
+                local num=${name#$basename}
+                [ "$num" ] || num=0
+                [ $num -gt $max ] && max=$num
+        done
+
+        local max=$(($max + 1))
+        # "name0" actually is just "name"
+        [ $max -eq 0 ] && return
+        echo "$max"
 }
 
 # Find all rules matching a key (with action) and a pattern.
 find_all_rules() {
-	local key="$1"
-	local linkre="$2"
-	local match="$3"
-
-	local search='.*[[:space:],]'"$key"'"('"$linkre"')".*'
-	echo $(sed -n -r -e 's/^#.*//' -e "${match}s/${search}/\1/p" \
-		$RO_RULES_FILE \
-		$([ -e $RULES_FILE ] && echo $RULES_FILE) \
-		2>/dev/null)
+        local key="$1"
+        local linkre="$2"
+        local match="$3"
+
+        local search='.*[[:space:],]'"$key"'"('"$linkre"')".*'
+        echo $(sed -n -r -e 's/^#.*//' -e "${match}s/${search}/\1/p" \
+                $RO_RULES_FILE \
+                $([ -e $RULES_FILE ] && echo $RULES_FILE) \
+                2>/dev/null)
 }
diff --git a/src/extras/rule_generator/write_cd_rules b/src/extras/rule_generator/write_cd_rules
index 3f93c7447a..645b9cd521 100644
--- a/src/extras/rule_generator/write_cd_rules
+++ b/src/extras/rule_generator/write_cd_rules
@@ -22,9 +22,9 @@
 
 # debug, if UDEV_LOG=<debug>
 if [ -n "$UDEV_LOG" ]; then
-	if [ "$UDEV_LOG" -ge 7 ]; then
-		set -x
-	fi
+        if [ "$UDEV_LOG" -ge 7 ]; then
+                set -x
+        fi
 fi
 
 RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
@@ -32,70 +32,70 @@ RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
 . /lib/udev/rule_generator.functions
 
 find_next_available() {
-	raw_find_next_available "$(find_all_rules 'SYMLINK\+=' "$1")"
+        raw_find_next_available "$(find_all_rules 'SYMLINK\+=' "$1")"
 }
 
 write_rule() {
-	local match="$1"
-	local link="$2"
-	local comment="$3"
-
-	{
-	if [ "$PRINT_HEADER" ]; then
-		PRINT_HEADER=
-		echo "# This file was automatically generated by the $0"
-		echo "# program, run by the cd-aliases-generator.rules rules file."
-		echo "#"
-		echo "# You can modify it, as long as you keep each rule on a single"
-		echo "# line, and set the \$GENERATED variable."
-		echo ""
-	fi
-
-	[ "$comment" ] && echo "# $comment"
-	echo "$match, SYMLINK+=\"$link\", ENV{GENERATED}=\"1\""
-	} >> $RULES_FILE
-	SYMLINKS="$SYMLINKS $link"
+        local match="$1"
+        local link="$2"
+        local comment="$3"
+
+        {
+        if [ "$PRINT_HEADER" ]; then
+                PRINT_HEADER=
+                echo "# This file was automatically generated by the $0"
+                echo "# program, run by the cd-aliases-generator.rules rules file."
+                echo "#"
+                echo "# You can modify it, as long as you keep each rule on a single"
+                echo "# line, and set the \$GENERATED variable."
+                echo ""
+        fi
+
+        [ "$comment" ] && echo "# $comment"
+        echo "$match, SYMLINK+=\"$link\", ENV{GENERATED}=\"1\""
+        } >> $RULES_FILE
+        SYMLINKS="$SYMLINKS $link"
 }
 
 if [ -z "$DEVPATH" ]; then
-	echo "Missing \$DEVPATH." >&2
-	exit 1
+        echo "Missing \$DEVPATH." >&2
+        exit 1
 fi
 if [ -z "$ID_CDROM" ]; then
-	echo "$DEVPATH is not a CD reader." >&2
-	exit 1
+        echo "$DEVPATH is not a CD reader." >&2
+        exit 1
 fi
 
 if [ "$1" ]; then
-	METHOD="$1"
+        METHOD="$1"
 else
-	METHOD='by-path'
+        METHOD='by-path'
 fi
 
 case "$METHOD" in
-	by-path)
-	if [ -z "$ID_PATH" ]; then
-		echo "$DEVPATH not supported by path_id. by-id may work." >&2
-		exit 1
-	fi
-	RULE="ENV{ID_PATH}==\"$ID_PATH\""
-	;;
-
-	by-id)
-	if [ "$ID_SERIAL" ]; then
-		RULE="ENV{ID_SERIAL}==\"$ID_SERIAL\""
-	elif [ "$ID_MODEL" -a "$ID_REVISION" ]; then
-		RULE="ENV{ID_MODEL}==\"$ID_MODEL\", ENV{ID_REVISION}==\"$ID_REVISION\""
-	else
-		echo "$DEVPATH not supported by ata_id. by-path may work." >&2
-		exit 1
-	fi
-	;;
-
-	*)
-	echo "Invalid argument (must be either by-path or by-id)." >&2
-	exit 1
-	;;
+        by-path)
+        if [ -z "$ID_PATH" ]; then
+                echo "$DEVPATH not supported by path_id. by-id may work." >&2
+                exit 1
+        fi
+        RULE="ENV{ID_PATH}==\"$ID_PATH\""
+        ;;
+
+        by-id)
+        if [ "$ID_SERIAL" ]; then
+                RULE="ENV{ID_SERIAL}==\"$ID_SERIAL\""
+        elif [ "$ID_MODEL" -a "$ID_REVISION" ]; then
+                RULE="ENV{ID_MODEL}==\"$ID_MODEL\", ENV{ID_REVISION}==\"$ID_REVISION\""
+        else
+                echo "$DEVPATH not supported by ata_id. by-path may work." >&2
+                exit 1
+        fi
+        ;;
+
+        *)
+        echo "Invalid argument (must be either by-path or by-id)." >&2
+        exit 1
+        ;;
 esac
 
 # Prevent concurrent processes from modifying the file at the same time.
@@ -110,13 +110,13 @@ match="SUBSYSTEM==\"block\", ENV{ID_CDROM}==\"?*\", $RULE"
 
 comment="$ID_MODEL ($ID_PATH)"
 
-	write_rule "$match" "cdrom$link_num" "$comment"
+        write_rule "$match" "cdrom$link_num" "$comment"
 [ "$ID_CDROM_CD_R" -o "$ID_CDROM_CD_RW" ] && \
-	write_rule "$match" "cdrw$link_num"
+        write_rule "$match" "cdrw$link_num"
 [ "$ID_CDROM_DVD" ] && \
-	write_rule "$match" "dvd$link_num"
+        write_rule "$match" "dvd$link_num"
 [ "$ID_CDROM_DVD_R" -o "$ID_CDROM_DVD_RW" -o "$ID_CDROM_DVD_RAM" ] && \
-	write_rule "$match" "dvdrw$link_num"
+        write_rule "$match" "dvdrw$link_num"
 echo >> $RULES_FILE
 
 unlock_rules_file
diff --git a/src/extras/rule_generator/write_net_rules b/src/extras/rule_generator/write_net_rules
index 437979241f..bcea4b09dc 100644
--- a/src/extras/rule_generator/write_net_rules
+++ b/src/extras/rule_generator/write_net_rules
@@ -33,9 +33,9 @@
 
 # debug, if UDEV_LOG=<debug>
 if [ -n "$UDEV_LOG" ]; then
-	if [ "$UDEV_LOG" -ge 7 ]; then
-		set -x
-	fi
+        if [ "$UDEV_LOG" -ge 7 ]; then
+                set -x
+        fi
 fi
 
 RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
@@ -43,42 +43,42 @@ RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
 . /lib/udev/rule_generator.functions
 
 interface_name_taken() {
-	local value="$(find_all_rules 'NAME=' $INTERFACE)"
-	if [ "$value" ]; then
-		return 0
-	else
-		return 1
-	fi
+        local value="$(find_all_rules 'NAME=' $INTERFACE)"
+        if [ "$value" ]; then
+                return 0
+        else
+                return 1
+        fi
 }
 
 find_next_available() {
-	raw_find_next_available "$(find_all_rules 'NAME=' "$1")"
+        raw_find_next_available "$(find_all_rules 'NAME=' "$1")"
 }
 
 write_rule() {
-	local match="$1"
-	local name="$2"
-	local comment="$3"
-
-	{
-	if [ "$PRINT_HEADER" ]; then
-		PRINT_HEADER=
-		echo "# This file was automatically generated by the $0"
-		echo "# program, run by the persistent-net-generator.rules rules file."
-		echo "#"
-		echo "# You can modify it, as long as you keep each rule on a single"
-		echo "# line, and change only the value of the NAME= key."
-	fi
-
-	echo ""
-	[ "$comment" ] && echo "# $comment"
-	echo "SUBSYSTEM==\"net\", ACTION==\"add\"$match, NAME=\"$name\""
-	} >> $RULES_FILE
+        local match="$1"
+        local name="$2"
+        local comment="$3"
+
+        {
+        if [ "$PRINT_HEADER" ]; then
+                PRINT_HEADER=
+                echo "# This file was automatically generated by the $0"
+                echo "# program, run by the persistent-net-generator.rules rules file."
+                echo "#"
+                echo "# You can modify it, as long as you keep each rule on a single"
+                echo "# line, and change only the value of the NAME= key."
+        fi
+
+        echo ""
+        [ "$comment" ] && echo "# $comment"
+        echo "SUBSYSTEM==\"net\", ACTION==\"add\"$match, NAME=\"$name\""
+        } >> $RULES_FILE
 }
 
 if [ -z "$INTERFACE" ]; then
-	echo "missing \$INTERFACE" >&2
-	exit 1
+        echo "missing \$INTERFACE" >&2
+        exit 1
 fi
 
 # Prevent concurrent processes from modifying the file at the same time.
@@ -89,49 +89,49 @@ choose_rules_file
 
 # the DRIVERS key is needed to not match bridges and VLAN sub-interfaces
 if [ "$MATCHADDR" ]; then
-	match="$match, DRIVERS==\"?*\", ATTR{address}==\"$MATCHADDR\""
+        match="$match, DRIVERS==\"?*\", ATTR{address}==\"$MATCHADDR\""
 fi
 
 if [ "$MATCHDRV" ]; then
-	match="$match, DRIVERS==\"$MATCHDRV\""
+        match="$match, DRIVERS==\"$MATCHDRV\""
 fi
 
 if [ "$MATCHDEVID" ]; then
-	match="$match, ATTR{dev_id}==\"$MATCHDEVID\""
+        match="$match, ATTR{dev_id}==\"$MATCHDEVID\""
 fi
 
 if [ "$MATCHID" ]; then
-	match="$match, KERNELS==\"$MATCHID\""
+        match="$match, KERNELS==\"$MATCHID\""
 fi
 
 if [ "$MATCHIFTYPE" ]; then
-	match="$match, ATTR{type}==\"$MATCHIFTYPE\""
+        match="$match, ATTR{type}==\"$MATCHIFTYPE\""
 fi
 
 if [ -z "$match" ]; then
-	echo "missing valid match" >&2
-	unlock_rules_file
-	exit 1
+        echo "missing valid match" >&2
+        unlock_rules_file
+        exit 1
 fi
 
 basename=${INTERFACE%%[0-9]*}
 match="$match, KERNEL==\"$basename*\""
 
 if [ "$INTERFACE_NAME" ]; then
-	# external tools may request a custom name
-	COMMENT="$COMMENT (custom name provided by external tool)"
-	if [ "$INTERFACE_NAME" != "$INTERFACE" ]; then
-		INTERFACE=$INTERFACE_NAME;
-		echo "INTERFACE_NEW=$INTERFACE"
-	fi
+        # external tools may request a custom name
+        COMMENT="$COMMENT (custom name provided by external tool)"
+        if [ "$INTERFACE_NAME" != "$INTERFACE" ]; then
+                INTERFACE=$INTERFACE_NAME;
+                echo "INTERFACE_NEW=$INTERFACE"
+        fi
 else
-	# if a rule using the current name already exists, find a new name
-	if interface_name_taken; then
-		INTERFACE="$basename$(find_next_available "$basename[0-9]*")"
-		# prevent INTERFACE from being "eth" instead of "eth0"
-		[ "$INTERFACE" = "${INTERFACE%%[ \[\]0-9]*}" ] && INTERFACE=${INTERFACE}0
-		echo "INTERFACE_NEW=$INTERFACE"
-	fi
+        # if a rule using the current name already exists, find a new name
+        if interface_name_taken; then
+                INTERFACE="$basename$(find_next_available "$basename[0-9]*")"
+                # prevent INTERFACE from being "eth" instead of "eth0"
+                [ "$INTERFACE" = "${INTERFACE%%[ \[\]0-9]*}" ] && INTERFACE=${INTERFACE}0
+                echo "INTERFACE_NEW=$INTERFACE"
+        fi
 fi
 
 write_rule "$match" "$INTERFACE" "$COMMENT"
diff --git a/src/extras/scsi_id/scsi.h b/src/extras/scsi_id/scsi.h
index 8e9ce406b7..c423cac574 100644
--- a/src/extras/scsi_id/scsi.h
+++ b/src/extras/scsi_id/scsi.h
@@ -5,39 +5,39 @@
  *
  * Copyright (C) IBM Corp. 2003
  *
- *	This program is free software; you can redistribute it and/or modify it
- *	under the terms of the GNU General Public License as published by the
- *	Free Software Foundation version 2 of the License.
+ *        This program is free software; you can redistribute it and/or modify it
+ *        under the terms of the GNU General Public License as published by the
+ *        Free Software Foundation version 2 of the License.
  */
 
 #include <scsi/scsi.h>
 
 struct scsi_ioctl_command {
-	unsigned int inlen;	/* excluding scsi command length */
-	unsigned int outlen;
-	unsigned char data[1];
-	/* on input, scsi command starts here then opt. data */
+        unsigned int inlen;        /* excluding scsi command length */
+        unsigned int outlen;
+        unsigned char data[1];
+        /* on input, scsi command starts here then opt. data */
 };
 
 /*
  * Default 5 second timeout
  */
-#define DEF_TIMEOUT	5000
+#define DEF_TIMEOUT        5000
 
-#define SENSE_BUFF_LEN	32
+#define SENSE_BUFF_LEN        32
 
 /*
  * The request buffer size passed to the SCSI INQUIRY commands, use 254,
  * as this is a nice value for some devices, especially some of the usb
  * mass storage devices.
  */
-#define	SCSI_INQ_BUFF_LEN	254
+#define        SCSI_INQ_BUFF_LEN        254
 
 /*
  * SCSI INQUIRY vendor and model (really product) lengths.
  */
-#define VENDOR_LENGTH	8
-#define	MODEL_LENGTH	16
+#define VENDOR_LENGTH        8
+#define        MODEL_LENGTH        16
 
 #define INQUIRY_CMD     0x12
 #define INQUIRY_CMDLEN  6
@@ -50,34 +50,34 @@ struct scsi_ioctl_command {
 /*
  * id type values of id descriptors. These are assumed to fit in 4 bits.
  */
-#define SCSI_ID_VENDOR_SPECIFIC	0
-#define SCSI_ID_T10_VENDOR	1
-#define SCSI_ID_EUI_64		2
-#define SCSI_ID_NAA		3
-#define SCSI_ID_RELPORT		4
-#define SCSI_ID_TGTGROUP	5
-#define SCSI_ID_LUNGROUP	6
-#define SCSI_ID_MD5		7
-#define SCSI_ID_NAME		8
+#define SCSI_ID_VENDOR_SPECIFIC        0
+#define SCSI_ID_T10_VENDOR        1
+#define SCSI_ID_EUI_64                2
+#define SCSI_ID_NAA                3
+#define SCSI_ID_RELPORT                4
+#define SCSI_ID_TGTGROUP        5
+#define SCSI_ID_LUNGROUP        6
+#define SCSI_ID_MD5                7
+#define SCSI_ID_NAME                8
 
 /*
  * Supported NAA values. These fit in 4 bits, so the "don't care" value
  * cannot conflict with real values.
  */
-#define	SCSI_ID_NAA_DONT_CARE		0xff
-#define	SCSI_ID_NAA_IEEE_REG		5
-#define	SCSI_ID_NAA_IEEE_REG_EXTENDED	6
+#define        SCSI_ID_NAA_DONT_CARE                0xff
+#define        SCSI_ID_NAA_IEEE_REG                5
+#define        SCSI_ID_NAA_IEEE_REG_EXTENDED        6
 
 /*
  * Supported Code Set values.
  */
-#define	SCSI_ID_BINARY	1
-#define	SCSI_ID_ASCII	2
+#define        SCSI_ID_BINARY        1
+#define        SCSI_ID_ASCII        2
 
 struct scsi_id_search_values {
-	u_char	id_type;
-	u_char	naa_type;
-	u_char	code_set;
+        u_char        id_type;
+        u_char        naa_type;
+        u_char        code_set;
 };
 
 /*
diff --git a/src/extras/scsi_id/scsi_id.c b/src/extras/scsi_id/scsi_id.c
index da81d083ce..9bb0d7f538 100644
--- a/src/extras/scsi_id/scsi_id.c
+++ b/src/extras/scsi_id/scsi_id.c
@@ -34,18 +34,18 @@
 #include "scsi_id.h"
 
 static const struct option options[] = {
-	{ "device", required_argument, NULL, 'd' },
-	{ "config", required_argument, NULL, 'f' },
-	{ "page", required_argument, NULL, 'p' },
-	{ "blacklisted", no_argument, NULL, 'b' },
-	{ "whitelisted", no_argument, NULL, 'g' },
-	{ "replace-whitespace", no_argument, NULL, 'u' },
-	{ "sg-version", required_argument, NULL, 's' },
-	{ "verbose", no_argument, NULL, 'v' },
-	{ "version", no_argument, NULL, 'V' },
-	{ "export", no_argument, NULL, 'x' },
-	{ "help", no_argument, NULL, 'h' },
-	{}
+        { "device", required_argument, NULL, 'd' },
+        { "config", required_argument, NULL, 'f' },
+        { "page", required_argument, NULL, 'p' },
+        { "blacklisted", no_argument, NULL, 'b' },
+        { "whitelisted", no_argument, NULL, 'g' },
+        { "replace-whitespace", no_argument, NULL, 'u' },
+        { "sg-version", required_argument, NULL, 's' },
+        { "verbose", no_argument, NULL, 'v' },
+        { "version", no_argument, NULL, 'V' },
+        { "export", no_argument, NULL, 'x' },
+        { "help", no_argument, NULL, 'h' },
+        {}
 };
 
 static const char short_options[] = "d:f:ghip:uvVx";
@@ -68,47 +68,47 @@ static char revision_str[16];
 static char type_str[16];
 
 static void log_fn(struct udev *udev, int priority,
-		   const char *file, int line, const char *fn,
-		   const char *format, va_list args)
+                   const char *file, int line, const char *fn,
+                   const char *format, va_list args)
 {
-	vsyslog(priority, format, args);
+        vsyslog(priority, format, args);
 }
 
 static void set_type(const char *from, char *to, size_t len)
 {
-	int type_num;
-	char *eptr;
-	char *type = "generic";
-
-	type_num = strtoul(from, &eptr, 0);
-	if (eptr != from) {
-		switch (type_num) {
-		case 0:
-			type = "disk";
-			break;
-		case 1:
-			type = "tape";
-			break;
-		case 4:
-			type = "optical";
-			break;
-		case 5:
-			type = "cd";
-			break;
-		case 7:
-			type = "optical";
-			break;
-		case 0xe:
-			type = "disk";
-			break;
-		case 0xf:
-			type = "optical";
-			break;
-		default:
-			break;
-		}
-	}
-	util_strscpy(to, len, type);
+        int type_num;
+        char *eptr;
+        char *type = "generic";
+
+        type_num = strtoul(from, &eptr, 0);
+        if (eptr != from) {
+                switch (type_num) {
+                case 0:
+                        type = "disk";
+                        break;
+                case 1:
+                        type = "tape";
+                        break;
+                case 4:
+                        type = "optical";
+                        break;
+                case 5:
+                        type = "cd";
+                        break;
+                case 7:
+                        type = "optical";
+                        break;
+                case 0xe:
+                        type = "disk";
+                        break;
+                case 0xf:
+                        type = "optical";
+                        break;
+                default:
+                        break;
+                }
+        }
+        util_strscpy(to, len, type);
 }
 
 /*
@@ -122,40 +122,40 @@ static void set_type(const char *from, char *to, size_t len)
  */
 static char *get_value(char **buffer)
 {
-	static char *quote_string = "\"\n";
-	static char *comma_string = ",\n";
-	char *val;
-	char *end;
-
-	if (**buffer == '"') {
-		/*
-		 * skip leading quote, terminate when quote seen
-		 */
-		(*buffer)++;
-		end = quote_string;
-	} else {
-		end = comma_string;
-	}
-	val = strsep(buffer, end);
-	if (val && end == quote_string)
-		/*
-		 * skip trailing quote
-		 */
-		(*buffer)++;
-
-	while (isspace(**buffer))
-		(*buffer)++;
-
-	return val;
+        static char *quote_string = "\"\n";
+        static char *comma_string = ",\n";
+        char *val;
+        char *end;
+
+        if (**buffer == '"') {
+                /*
+                 * skip leading quote, terminate when quote seen
+                 */
+                (*buffer)++;
+                end = quote_string;
+        } else {
+                end = comma_string;
+        }
+        val = strsep(buffer, end);
+        if (val && end == quote_string)
+                /*
+                 * skip trailing quote
+                 */
+                (*buffer)++;
+
+        while (isspace(**buffer))
+                (*buffer)++;
+
+        return val;
 }
 
 static int argc_count(char *opts)
 {
-	int i = 0;
-	while (*opts != '\0')
-		if (*opts++ == ' ')
-			i++;
-	return i;
+        int i = 0;
+        while (*opts != '\0')
+                if (*opts++ == ' ')
+                        i++;
+        return i;
 }
 
 /*
@@ -168,356 +168,356 @@ static int argc_count(char *opts)
  * vendor and model can end in '\n'.
  */
 static int get_file_options(struct udev *udev,
-			    const char *vendor, const char *model,
-			    int *argc, char ***newargv)
+                            const char *vendor, const char *model,
+                            int *argc, char ***newargv)
 {
-	char *buffer;
-	FILE *fd;
-	char *buf;
-	char *str1;
-	char *vendor_in, *model_in, *options_in; /* read in from file */
-	int lineno;
-	int c;
-	int retval = 0;
-
-	dbg(udev, "vendor='%s'; model='%s'\n", vendor, model);
-	fd = fopen(config_file, "r");
-	if (fd == NULL) {
-		dbg(udev, "can't open %s\n", config_file);
-		if (errno == ENOENT) {
-			return 1;
-		} else {
-			err(udev, "can't open %s: %s\n", config_file, strerror(errno));
-			return -1;
-		}
-	}
-
-	/*
-	 * Allocate a buffer rather than put it on the stack so we can
-	 * keep it around to parse any options (any allocated newargv
-	 * points into this buffer for its strings).
-	 */
-	buffer = malloc(MAX_BUFFER_LEN);
-	if (!buffer) {
-		fclose(fd);
-		err(udev, "can't allocate memory\n");
-		return -1;
-	}
-
-	*newargv = NULL;
-	lineno = 0;
-	while (1) {
-		vendor_in = model_in = options_in = NULL;
-
-		buf = fgets(buffer, MAX_BUFFER_LEN, fd);
-		if (buf == NULL)
-			break;
-		lineno++;
-		if (buf[strlen(buffer) - 1] != '\n') {
-			err(udev, "Config file line %d too long\n", lineno);
-			break;
-		}
-
-		while (isspace(*buf))
-			buf++;
-
-		/* blank or all whitespace line */
-		if (*buf == '\0')
-			continue;
-
-		/* comment line */
-		if (*buf == '#')
-			continue;
-
-		dbg(udev, "lineno %d: '%s'\n", lineno, buf);
-		str1 = strsep(&buf, "=");
-		if (str1 && strcasecmp(str1, "VENDOR") == 0) {
-			str1 = get_value(&buf);
-			if (!str1) {
-				retval = -1;
-				break;
-			}
-			vendor_in = str1;
-
-			str1 = strsep(&buf, "=");
-			if (str1 && strcasecmp(str1, "MODEL") == 0) {
-				str1 = get_value(&buf);
-				if (!str1) {
-					retval = -1;
-					break;
-				}
-				model_in = str1;
-				str1 = strsep(&buf, "=");
-			}
-		}
-
-		if (str1 && strcasecmp(str1, "OPTIONS") == 0) {
-			str1 = get_value(&buf);
-			if (!str1) {
-				retval = -1;
-				break;
-			}
-			options_in = str1;
-		}
-		dbg(udev, "config file line %d:\n"
-			" vendor '%s'; model '%s'; options '%s'\n",
-			lineno, vendor_in, model_in, options_in);
-		/*
-		 * Only allow: [vendor=foo[,model=bar]]options=stuff
-		 */
-		if (!options_in || (!vendor_in && model_in)) {
-			err(udev, "Error parsing config file line %d '%s'\n", lineno, buffer);
-			retval = -1;
-			break;
-		}
-		if (vendor == NULL) {
-			if (vendor_in == NULL) {
-				dbg(udev, "matched global option\n");
-				break;
-			}
-		} else if ((vendor_in && strncmp(vendor, vendor_in,
-						 strlen(vendor_in)) == 0) &&
-			   (!model_in || (strncmp(model, model_in,
-						  strlen(model_in)) == 0))) {
-				/*
-				 * Matched vendor and optionally model.
-				 *
-				 * Note: a short vendor_in or model_in can
-				 * give a partial match (that is FOO
-				 * matches FOOBAR).
-				 */
-				dbg(udev, "matched vendor/model\n");
-				break;
-		} else {
-			dbg(udev, "no match\n");
-		}
-	}
-
-	if (retval == 0) {
-		if (vendor_in != NULL || model_in != NULL ||
-		    options_in != NULL) {
-			/*
-			 * Something matched. Allocate newargv, and store
-			 * values found in options_in.
-			 */
-			strcpy(buffer, options_in);
-			c = argc_count(buffer) + 2;
-			*newargv = calloc(c, sizeof(**newargv));
-			if (!*newargv) {
-				err(udev, "can't allocate memory\n");
-				retval = -1;
-			} else {
-				*argc = c;
-				c = 0;
-				/*
-				 * argv[0] at 0 is skipped by getopt, but
-				 * store the buffer address there for
-				 * later freeing
-				 */
-				(*newargv)[c] = buffer;
-				for (c = 1; c < *argc; c++)
-					(*newargv)[c] = strsep(&buffer, " \t");
-			}
-		} else {
-			/* No matches  */
-			retval = 1;
-		}
-	}
-	if (retval != 0)
-		free(buffer);
-	fclose(fd);
-	return retval;
+        char *buffer;
+        FILE *fd;
+        char *buf;
+        char *str1;
+        char *vendor_in, *model_in, *options_in; /* read in from file */
+        int lineno;
+        int c;
+        int retval = 0;
+
+        dbg(udev, "vendor='%s'; model='%s'\n", vendor, model);
+        fd = fopen(config_file, "r");
+        if (fd == NULL) {
+                dbg(udev, "can't open %s\n", config_file);
+                if (errno == ENOENT) {
+                        return 1;
+                } else {
+                        err(udev, "can't open %s: %s\n", config_file, strerror(errno));
+                        return -1;
+                }
+        }
+
+        /*
+         * Allocate a buffer rather than put it on the stack so we can
+         * keep it around to parse any options (any allocated newargv
+         * points into this buffer for its strings).
+         */
+        buffer = malloc(MAX_BUFFER_LEN);
+        if (!buffer) {
+                fclose(fd);
+                err(udev, "can't allocate memory\n");
+                return -1;
+        }
+
+        *newargv = NULL;
+        lineno = 0;
+        while (1) {
+                vendor_in = model_in = options_in = NULL;
+
+                buf = fgets(buffer, MAX_BUFFER_LEN, fd);
+                if (buf == NULL)
+                        break;
+                lineno++;
+                if (buf[strlen(buffer) - 1] != '\n') {
+                        err(udev, "Config file line %d too long\n", lineno);
+                        break;
+                }
+
+                while (isspace(*buf))
+                        buf++;
+
+                /* blank or all whitespace line */
+                if (*buf == '\0')
+                        continue;
+
+                /* comment line */
+                if (*buf == '#')
+                        continue;
+
+                dbg(udev, "lineno %d: '%s'\n", lineno, buf);
+                str1 = strsep(&buf, "=");
+                if (str1 && strcasecmp(str1, "VENDOR") == 0) {
+                        str1 = get_value(&buf);
+                        if (!str1) {
+                                retval = -1;
+                                break;
+                        }
+                        vendor_in = str1;
+
+                        str1 = strsep(&buf, "=");
+                        if (str1 && strcasecmp(str1, "MODEL") == 0) {
+                                str1 = get_value(&buf);
+                                if (!str1) {
+                                        retval = -1;
+                                        break;
+                                }
+                                model_in = str1;
+                                str1 = strsep(&buf, "=");
+                        }
+                }
+
+                if (str1 && strcasecmp(str1, "OPTIONS") == 0) {
+                        str1 = get_value(&buf);
+                        if (!str1) {
+                                retval = -1;
+                                break;
+                        }
+                        options_in = str1;
+                }
+                dbg(udev, "config file line %d:\n"
+                        " vendor '%s'; model '%s'; options '%s'\n",
+                        lineno, vendor_in, model_in, options_in);
+                /*
+                 * Only allow: [vendor=foo[,model=bar]]options=stuff
+                 */
+                if (!options_in || (!vendor_in && model_in)) {
+                        err(udev, "Error parsing config file line %d '%s'\n", lineno, buffer);
+                        retval = -1;
+                        break;
+                }
+                if (vendor == NULL) {
+                        if (vendor_in == NULL) {
+                                dbg(udev, "matched global option\n");
+                                break;
+                        }
+                } else if ((vendor_in && strncmp(vendor, vendor_in,
+                                                 strlen(vendor_in)) == 0) &&
+                           (!model_in || (strncmp(model, model_in,
+                                                  strlen(model_in)) == 0))) {
+                                /*
+                                 * Matched vendor and optionally model.
+                                 *
+                                 * Note: a short vendor_in or model_in can
+                                 * give a partial match (that is FOO
+                                 * matches FOOBAR).
+                                 */
+                                dbg(udev, "matched vendor/model\n");
+                                break;
+                } else {
+                        dbg(udev, "no match\n");
+                }
+        }
+
+        if (retval == 0) {
+                if (vendor_in != NULL || model_in != NULL ||
+                    options_in != NULL) {
+                        /*
+                         * Something matched. Allocate newargv, and store
+                         * values found in options_in.
+                         */
+                        strcpy(buffer, options_in);
+                        c = argc_count(buffer) + 2;
+                        *newargv = calloc(c, sizeof(**newargv));
+                        if (!*newargv) {
+                                err(udev, "can't allocate memory\n");
+                                retval = -1;
+                        } else {
+                                *argc = c;
+                                c = 0;
+                                /*
+                                 * argv[0] at 0 is skipped by getopt, but
+                                 * store the buffer address there for
+                                 * later freeing
+                                 */
+                                (*newargv)[c] = buffer;
+                                for (c = 1; c < *argc; c++)
+                                        (*newargv)[c] = strsep(&buffer, " \t");
+                        }
+                } else {
+                        /* No matches  */
+                        retval = 1;
+                }
+        }
+        if (retval != 0)
+                free(buffer);
+        fclose(fd);
+        return retval;
 }
 
 static int set_options(struct udev *udev,
-		       int argc, char **argv, const char *short_opts,
-		       char *maj_min_dev)
+                       int argc, char **argv, const char *short_opts,
+                       char *maj_min_dev)
 {
-	int option;
-
-	/*
-	 * optind is a global extern used by getopt. Since we can call
-	 * set_options twice (once for command line, and once for config
-	 * file) we have to reset this back to 1.
-	 */
-	optind = 1;
-	while (1) {
-		option = getopt_long(argc, argv, short_opts, options, NULL);
-		if (option == -1)
-			break;
-
-		if (optarg)
-			dbg(udev, "option '%c' arg '%s'\n", option, optarg);
-		else
-			dbg(udev, "option '%c'\n", option);
-
-		switch (option) {
-		case 'b':
-			all_good = 0;
-			break;
-
-		case 'd':
-			dev_specified = 1;
-			util_strscpy(maj_min_dev, MAX_PATH_LEN, optarg);
-			break;
-
-		case 'e':
-			use_stderr = 1;
-			break;
-
-		case 'f':
-			util_strscpy(config_file, MAX_PATH_LEN, optarg);
-			break;
-
-		case 'g':
-			all_good = 1;
-			break;
-
-		case 'h':
-			printf("Usage: scsi_id OPTIONS <device>\n"
-			       "  --device=                     device node for SG_IO commands\n"
-			       "  --config=                     location of config file\n"
-			       "  --page=0x80|0x83|pre-spc3-83  SCSI page (0x80, 0x83, pre-spc3-83)\n"
-			       "  --sg-version=3|4              use SGv3 or SGv4\n"
-			       "  --blacklisted                 threat device as blacklisted\n"
-			       "  --whitelisted                 threat device as whitelisted\n"
-			       "  --replace-whitespace          replace all whitespaces by underscores\n"
-			       "  --verbose                     verbose logging\n"
-			       "  --version                     print version\n"
-			       "  --export                      print values as environment keys\n"
-			       "  --help                        print this help text\n\n");
-			exit(0);
-
-		case 'p':
-			if (strcmp(optarg, "0x80") == 0) {
-				default_page_code = PAGE_80;
-			} else if (strcmp(optarg, "0x83") == 0) {
-				default_page_code = PAGE_83;
-			} else if (strcmp(optarg, "pre-spc3-83") == 0) {
-				default_page_code = PAGE_83_PRE_SPC3;
-			} else {
-				err(udev, "Unknown page code '%s'\n", optarg);
-				return -1;
-			}
-			break;
-
-		case 's':
-			sg_version = atoi(optarg);
-			if (sg_version < 3 || sg_version > 4) {
-				err(udev, "Unknown SG version '%s'\n", optarg);
-				return -1;
-			}
-			break;
-
-		case 'u':
-			reformat_serial = 1;
-			break;
-
-		case 'x':
-			export = 1;
-			break;
-
-		case 'v':
-			debug++;
-			break;
-
-		case 'V':
-			printf("%s\n", VERSION);
-			exit(0);
-			break;
-
-		default:
-			exit(1);
-		}
-	}
-	if (optind < argc && !dev_specified) {
-		dev_specified = 1;
-		util_strscpy(maj_min_dev, MAX_PATH_LEN, argv[optind]);
-	}
-	return 0;
+        int option;
+
+        /*
+         * optind is a global extern used by getopt. Since we can call
+         * set_options twice (once for command line, and once for config
+         * file) we have to reset this back to 1.
+         */
+        optind = 1;
+        while (1) {
+                option = getopt_long(argc, argv, short_opts, options, NULL);
+                if (option == -1)
+                        break;
+
+                if (optarg)
+                        dbg(udev, "option '%c' arg '%s'\n", option, optarg);
+                else
+                        dbg(udev, "option '%c'\n", option);
+
+                switch (option) {
+                case 'b':
+                        all_good = 0;
+                        break;
+
+                case 'd':
+                        dev_specified = 1;
+                        util_strscpy(maj_min_dev, MAX_PATH_LEN, optarg);
+                        break;
+
+                case 'e':
+                        use_stderr = 1;
+                        break;
+
+                case 'f':
+                        util_strscpy(config_file, MAX_PATH_LEN, optarg);
+                        break;
+
+                case 'g':
+                        all_good = 1;
+                        break;
+
+                case 'h':
+                        printf("Usage: scsi_id OPTIONS <device>\n"
+                               "  --device=                     device node for SG_IO commands\n"
+                               "  --config=                     location of config file\n"
+                               "  --page=0x80|0x83|pre-spc3-83  SCSI page (0x80, 0x83, pre-spc3-83)\n"
+                               "  --sg-version=3|4              use SGv3 or SGv4\n"
+                               "  --blacklisted                 threat device as blacklisted\n"
+                               "  --whitelisted                 threat device as whitelisted\n"
+                               "  --replace-whitespace          replace all whitespaces by underscores\n"
+                               "  --verbose                     verbose logging\n"
+                               "  --version                     print version\n"
+                               "  --export                      print values as environment keys\n"
+                               "  --help                        print this help text\n\n");
+                        exit(0);
+
+                case 'p':
+                        if (strcmp(optarg, "0x80") == 0) {
+                                default_page_code = PAGE_80;
+                        } else if (strcmp(optarg, "0x83") == 0) {
+                                default_page_code = PAGE_83;
+                        } else if (strcmp(optarg, "pre-spc3-83") == 0) {
+                                default_page_code = PAGE_83_PRE_SPC3;
+                        } else {
+                                err(udev, "Unknown page code '%s'\n", optarg);
+                                return -1;
+                        }
+                        break;
+
+                case 's':
+                        sg_version = atoi(optarg);
+                        if (sg_version < 3 || sg_version > 4) {
+                                err(udev, "Unknown SG version '%s'\n", optarg);
+                                return -1;
+                        }
+                        break;
+
+                case 'u':
+                        reformat_serial = 1;
+                        break;
+
+                case 'x':
+                        export = 1;
+                        break;
+
+                case 'v':
+                        debug++;
+                        break;
+
+                case 'V':
+                        printf("%s\n", VERSION);
+                        exit(0);
+                        break;
+
+                default:
+                        exit(1);
+                }
+        }
+        if (optind < argc && !dev_specified) {
+                dev_specified = 1;
+                util_strscpy(maj_min_dev, MAX_PATH_LEN, argv[optind]);
+        }
+        return 0;
 }
 
 static int per_dev_options(struct udev *udev,
-			   struct scsi_id_device *dev_scsi, int *good_bad, int *page_code)
+                           struct scsi_id_device *dev_scsi, int *good_bad, int *page_code)
 {
-	int retval;
-	int newargc;
-	char **newargv = NULL;
-	int option;
-
-	*good_bad = all_good;
-	*page_code = default_page_code;
-
-	retval = get_file_options(udev, vendor_str, model_str, &newargc, &newargv);
-
-	optind = 1; /* reset this global extern */
-	while (retval == 0) {
-		option = getopt_long(newargc, newargv, dev_short_options, options, NULL);
-		if (option == -1)
-			break;
-
-		if (optarg)
-			dbg(udev, "option '%c' arg '%s'\n", option, optarg);
-		else
-			dbg(udev, "option '%c'\n", option);
-
-		switch (option) {
-		case 'b':
-			*good_bad = 0;
-			break;
-
-		case 'g':
-			*good_bad = 1;
-			break;
-
-		case 'p':
-			if (strcmp(optarg, "0x80") == 0) {
-				*page_code = PAGE_80;
-			} else if (strcmp(optarg, "0x83") == 0) {
-				*page_code = PAGE_83;
-			} else if (strcmp(optarg, "pre-spc3-83") == 0) {
-				*page_code = PAGE_83_PRE_SPC3;
-			} else {
-				err(udev, "Unknown page code '%s'\n", optarg);
-				retval = -1;
-			}
-			break;
-
-		default:
-			err(udev, "Unknown or bad option '%c' (0x%x)\n", option, option);
-			retval = -1;
-			break;
-		}
-	}
-
-	if (newargv) {
-		free(newargv[0]);
-		free(newargv);
-	}
-	return retval;
+        int retval;
+        int newargc;
+        char **newargv = NULL;
+        int option;
+
+        *good_bad = all_good;
+        *page_code = default_page_code;
+
+        retval = get_file_options(udev, vendor_str, model_str, &newargc, &newargv);
+
+        optind = 1; /* reset this global extern */
+        while (retval == 0) {
+                option = getopt_long(newargc, newargv, dev_short_options, options, NULL);
+                if (option == -1)
+                        break;
+
+                if (optarg)
+                        dbg(udev, "option '%c' arg '%s'\n", option, optarg);
+                else
+                        dbg(udev, "option '%c'\n", option);
+
+                switch (option) {
+                case 'b':
+                        *good_bad = 0;
+                        break;
+
+                case 'g':
+                        *good_bad = 1;
+                        break;
+
+                case 'p':
+                        if (strcmp(optarg, "0x80") == 0) {
+                                *page_code = PAGE_80;
+                        } else if (strcmp(optarg, "0x83") == 0) {
+                                *page_code = PAGE_83;
+                        } else if (strcmp(optarg, "pre-spc3-83") == 0) {
+                                *page_code = PAGE_83_PRE_SPC3;
+                        } else {
+                                err(udev, "Unknown page code '%s'\n", optarg);
+                                retval = -1;
+                        }
+                        break;
+
+                default:
+                        err(udev, "Unknown or bad option '%c' (0x%x)\n", option, option);
+                        retval = -1;
+                        break;
+                }
+        }
+
+        if (newargv) {
+                free(newargv[0]);
+                free(newargv);
+        }
+        return retval;
 }
 
 static int set_inq_values(struct udev *udev, struct scsi_id_device *dev_scsi, const char *path)
 {
-	int retval;
+        int retval;
 
-	dev_scsi->use_sg = sg_version;
+        dev_scsi->use_sg = sg_version;
 
-	retval = scsi_std_inquiry(udev, dev_scsi, path);
-	if (retval)
-		return retval;
+        retval = scsi_std_inquiry(udev, dev_scsi, path);
+        if (retval)
+                return retval;
 
-	udev_util_encode_string(dev_scsi->vendor, vendor_enc_str, sizeof(vendor_enc_str));
-	udev_util_encode_string(dev_scsi->model, model_enc_str, sizeof(model_enc_str));
+        udev_util_encode_string(dev_scsi->vendor, vendor_enc_str, sizeof(vendor_enc_str));
+        udev_util_encode_string(dev_scsi->model, model_enc_str, sizeof(model_enc_str));
 
-	util_replace_whitespace(dev_scsi->vendor, vendor_str, sizeof(vendor_str));
-	util_replace_chars(vendor_str, NULL);
-	util_replace_whitespace(dev_scsi->model, model_str, sizeof(model_str));
-	util_replace_chars(model_str, NULL);
-	set_type(dev_scsi->type, type_str, sizeof(type_str));
-	util_replace_whitespace(dev_scsi->revision, revision_str, sizeof(revision_str));
-	util_replace_chars(revision_str, NULL);
-	return 0;
+        util_replace_whitespace(dev_scsi->vendor, vendor_str, sizeof(vendor_str));
+        util_replace_chars(vendor_str, NULL);
+        util_replace_whitespace(dev_scsi->model, model_str, sizeof(model_str));
+        util_replace_chars(model_str, NULL);
+        set_type(dev_scsi->type, type_str, sizeof(type_str));
+        util_replace_whitespace(dev_scsi->revision, revision_str, sizeof(revision_str));
+        util_replace_chars(revision_str, NULL);
+        return 0;
 }
 
 /*
@@ -526,132 +526,132 @@ static int set_inq_values(struct udev *udev, struct scsi_id_device *dev_scsi, co
  */
 static int scsi_id(struct udev *udev, char *maj_min_dev)
 {
-	struct scsi_id_device dev_scsi;
-	int good_dev;
-	int page_code;
-	int retval = 0;
-
-	memset(&dev_scsi, 0x00, sizeof(struct scsi_id_device));
-
-	if (set_inq_values(udev, &dev_scsi, maj_min_dev) < 0) {
-		retval = 1;
-		goto out;
-	}
-
-	/* get per device (vendor + model) options from the config file */
-	per_dev_options(udev, &dev_scsi, &good_dev, &page_code);
-	dbg(udev, "per dev options: good %d; page code 0x%x\n", good_dev, page_code);
-	if (!good_dev) {
-		retval = 1;
-		goto out;
-	}
-
-	/* read serial number from mode pages (no values for optical drives) */
-	scsi_get_serial(udev, &dev_scsi, maj_min_dev, page_code, MAX_SERIAL_LEN);
-
-	if (export) {
-		char serial_str[MAX_SERIAL_LEN];
-
-		printf("ID_SCSI=1\n");
-		printf("ID_VENDOR=%s\n", vendor_str);
-		printf("ID_VENDOR_ENC=%s\n", vendor_enc_str);
-		printf("ID_MODEL=%s\n", model_str);
-		printf("ID_MODEL_ENC=%s\n", model_enc_str);
-		printf("ID_REVISION=%s\n", revision_str);
-		printf("ID_TYPE=%s\n", type_str);
-		if (dev_scsi.serial[0] != '\0') {
-			util_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str));
-			util_replace_chars(serial_str, NULL);
-			printf("ID_SERIAL=%s\n", serial_str);
-			util_replace_whitespace(dev_scsi.serial_short, serial_str, sizeof(serial_str));
-			util_replace_chars(serial_str, NULL);
-			printf("ID_SERIAL_SHORT=%s\n", serial_str);
-		}
-		if (dev_scsi.wwn[0] != '\0') {
-			printf("ID_WWN=0x%s\n", dev_scsi.wwn);
-			if (dev_scsi.wwn_vendor_extension[0] != '\0') {
-				printf("ID_WWN_VENDOR_EXTENSION=0x%s\n", dev_scsi.wwn_vendor_extension);
-				printf("ID_WWN_WITH_EXTENSION=0x%s%s\n", dev_scsi.wwn, dev_scsi.wwn_vendor_extension);
-			} else {
-				printf("ID_WWN_WITH_EXTENSION=0x%s\n", dev_scsi.wwn);
-			}
-		}
-		if (dev_scsi.tgpt_group[0] != '\0') {
-			printf("ID_TARGET_PORT=%s\n", dev_scsi.tgpt_group);
-		}
-		if (dev_scsi.unit_serial_number[0] != '\0') {
-			printf("ID_SCSI_SERIAL=%s\n", dev_scsi.unit_serial_number);
-		}
-		goto out;
-	}
-
-	if (dev_scsi.serial[0] == '\0') {
-		retval = 1;
-		goto out;
-	}
-
-	if (reformat_serial) {
-		char serial_str[MAX_SERIAL_LEN];
-
-		util_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str));
-		util_replace_chars(serial_str, NULL);
-		printf("%s\n", serial_str);
-		goto out;
-	}
-
-	printf("%s\n", dev_scsi.serial);
+        struct scsi_id_device dev_scsi;
+        int good_dev;
+        int page_code;
+        int retval = 0;
+
+        memset(&dev_scsi, 0x00, sizeof(struct scsi_id_device));
+
+        if (set_inq_values(udev, &dev_scsi, maj_min_dev) < 0) {
+                retval = 1;
+                goto out;
+        }
+
+        /* get per device (vendor + model) options from the config file */
+        per_dev_options(udev, &dev_scsi, &good_dev, &page_code);
+        dbg(udev, "per dev options: good %d; page code 0x%x\n", good_dev, page_code);
+        if (!good_dev) {
+                retval = 1;
+                goto out;
+        }
+
+        /* read serial number from mode pages (no values for optical drives) */
+        scsi_get_serial(udev, &dev_scsi, maj_min_dev, page_code, MAX_SERIAL_LEN);
+
+        if (export) {
+                char serial_str[MAX_SERIAL_LEN];
+
+                printf("ID_SCSI=1\n");
+                printf("ID_VENDOR=%s\n", vendor_str);
+                printf("ID_VENDOR_ENC=%s\n", vendor_enc_str);
+                printf("ID_MODEL=%s\n", model_str);
+                printf("ID_MODEL_ENC=%s\n", model_enc_str);
+                printf("ID_REVISION=%s\n", revision_str);
+                printf("ID_TYPE=%s\n", type_str);
+                if (dev_scsi.serial[0] != '\0') {
+                        util_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str));
+                        util_replace_chars(serial_str, NULL);
+                        printf("ID_SERIAL=%s\n", serial_str);
+                        util_replace_whitespace(dev_scsi.serial_short, serial_str, sizeof(serial_str));
+                        util_replace_chars(serial_str, NULL);
+                        printf("ID_SERIAL_SHORT=%s\n", serial_str);
+                }
+                if (dev_scsi.wwn[0] != '\0') {
+                        printf("ID_WWN=0x%s\n", dev_scsi.wwn);
+                        if (dev_scsi.wwn_vendor_extension[0] != '\0') {
+                                printf("ID_WWN_VENDOR_EXTENSION=0x%s\n", dev_scsi.wwn_vendor_extension);
+                                printf("ID_WWN_WITH_EXTENSION=0x%s%s\n", dev_scsi.wwn, dev_scsi.wwn_vendor_extension);
+                        } else {
+                                printf("ID_WWN_WITH_EXTENSION=0x%s\n", dev_scsi.wwn);
+                        }
+                }
+                if (dev_scsi.tgpt_group[0] != '\0') {
+                        printf("ID_TARGET_PORT=%s\n", dev_scsi.tgpt_group);
+                }
+                if (dev_scsi.unit_serial_number[0] != '\0') {
+                        printf("ID_SCSI_SERIAL=%s\n", dev_scsi.unit_serial_number);
+                }
+                goto out;
+        }
+
+        if (dev_scsi.serial[0] == '\0') {
+                retval = 1;
+                goto out;
+        }
+
+        if (reformat_serial) {
+                char serial_str[MAX_SERIAL_LEN];
+
+                util_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str));
+                util_replace_chars(serial_str, NULL);
+                printf("%s\n", serial_str);
+                goto out;
+        }
+
+        printf("%s\n", dev_scsi.serial);
 out:
-	return retval;
+        return retval;
 }
 
 int main(int argc, char **argv)
 {
-	struct udev *udev;
-	int retval = 0;
-	char maj_min_dev[MAX_PATH_LEN];
-	int newargc;
-	char **newargv;
-
-	udev = udev_new();
-	if (udev == NULL)
-		goto exit;
-
-	udev_log_init("scsi_id");
-	udev_set_log_fn(udev, log_fn);
-
-	/*
-	 * Get config file options.
-	 */
-	newargv = NULL;
-	retval = get_file_options(udev, NULL, NULL, &newargc, &newargv);
-	if (retval < 0) {
-		retval = 1;
-		goto exit;
-	}
-	if (newargv && (retval == 0)) {
-		if (set_options(udev, newargc, newargv, short_options, maj_min_dev) < 0) {
-			retval = 2;
-			goto exit;
-		}
-		free(newargv);
-	}
-
-	/*
-	 * Get command line options (overriding any config file settings).
-	 */
-	if (set_options(udev, argc, argv, short_options, maj_min_dev) < 0)
-		exit(1);
-
-	if (!dev_specified) {
-		err(udev, "no device specified\n");
-		retval = 1;
-		goto exit;
-	}
-
-	retval = scsi_id(udev, maj_min_dev);
+        struct udev *udev;
+        int retval = 0;
+        char maj_min_dev[MAX_PATH_LEN];
+        int newargc;
+        char **newargv;
+
+        udev = udev_new();
+        if (udev == NULL)
+                goto exit;
+
+        udev_log_init("scsi_id");
+        udev_set_log_fn(udev, log_fn);
+
+        /*
+         * Get config file options.
+         */
+        newargv = NULL;
+        retval = get_file_options(udev, NULL, NULL, &newargc, &newargv);
+        if (retval < 0) {
+                retval = 1;
+                goto exit;
+        }
+        if (newargv && (retval == 0)) {
+                if (set_options(udev, newargc, newargv, short_options, maj_min_dev) < 0) {
+                        retval = 2;
+                        goto exit;
+                }
+                free(newargv);
+        }
+
+        /*
+         * Get command line options (overriding any config file settings).
+         */
+        if (set_options(udev, argc, argv, short_options, maj_min_dev) < 0)
+                exit(1);
+
+        if (!dev_specified) {
+                err(udev, "no device specified\n");
+                retval = 1;
+                goto exit;
+        }
+
+        retval = scsi_id(udev, maj_min_dev);
 
 exit:
-	udev_unref(udev);
-	udev_log_close();
-	return retval;
+        udev_unref(udev);
+        udev_log_close();
+        return retval;
 }
diff --git a/src/extras/scsi_id/scsi_id.h b/src/extras/scsi_id/scsi_id.h
index a28f5e073c..828a98305f 100644
--- a/src/extras/scsi_id/scsi_id.h
+++ b/src/extras/scsi_id/scsi_id.h
@@ -15,35 +15,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define	MAX_PATH_LEN	512
+#define        MAX_PATH_LEN        512
 
 /*
  * MAX_ATTR_LEN: maximum length of the result of reading a sysfs
  * attribute.
  */
-#define	MAX_ATTR_LEN	256
+#define        MAX_ATTR_LEN        256
 
 /*
  * MAX_SERIAL_LEN: the maximum length of the serial number, including
  * added prefixes such as vendor and product (model) strings.
  */
-#define	MAX_SERIAL_LEN	256
+#define        MAX_SERIAL_LEN        256
 
 /*
  * MAX_BUFFER_LEN: maximum buffer size and line length used while reading
  * the config file.
  */
-#define MAX_BUFFER_LEN	256
+#define MAX_BUFFER_LEN        256
 
 struct scsi_id_device {
-	char vendor[9];
-	char model[17];
-	char revision[5];
-	char type[33];
-	char kernel[64];
-	char serial[MAX_SERIAL_LEN];
-	char serial_short[MAX_SERIAL_LEN];
-	int use_sg;
+        char vendor[9];
+        char model[17];
+        char revision[5];
+        char type[33];
+        char kernel[64];
+        char serial[MAX_SERIAL_LEN];
+        char serial_short[MAX_SERIAL_LEN];
+        int use_sg;
 
         /* Always from page 0x80 e.g. 'B3G1P8500RWT' - may not be unique */
         char unit_serial_number[MAX_SERIAL_LEN];
@@ -54,20 +54,20 @@ struct scsi_id_device {
         /* NULs if not set - otherwise hex encoding using lower-case e.g. '0xe00000d80000' */
         char wwn_vendor_extension[17];
 
-	/* NULs if not set - otherwise decimal number */
-	char tgpt_group[8];
+        /* NULs if not set - otherwise decimal number */
+        char tgpt_group[8];
 };
 
 extern int scsi_std_inquiry(struct udev *udev, struct scsi_id_device *dev_scsi, const char *devname);
 extern int scsi_get_serial (struct udev *udev, struct scsi_id_device *dev_scsi, const char *devname,
-			    int page_code, int len);
+                            int page_code, int len);
 
 /*
  * Page code values.
  */
 enum page_code {
-		PAGE_83_PRE_SPC3 = -0x83,
-		PAGE_UNSPECIFIED = 0x00,
-		PAGE_80		 = 0x80,
-		PAGE_83		 = 0x83,
+                PAGE_83_PRE_SPC3 = -0x83,
+                PAGE_UNSPECIFIED = 0x00,
+                PAGE_80                 = 0x80,
+                PAGE_83                 = 0x83,
 };
diff --git a/src/extras/scsi_id/scsi_serial.c b/src/extras/scsi_id/scsi_serial.c
index 61ec618e99..f1d63f40cc 100644
--- a/src/extras/scsi_id/scsi_serial.c
+++ b/src/extras/scsi_id/scsi_serial.c
@@ -48,28 +48,28 @@
  * is normally one or some small number of descriptors.
  */
 static const struct scsi_id_search_values id_search_list[] = {
-	{ SCSI_ID_TGTGROUP,	SCSI_ID_NAA_DONT_CARE,	SCSI_ID_BINARY },
-	{ SCSI_ID_NAA,	SCSI_ID_NAA_IEEE_REG_EXTENDED,	SCSI_ID_BINARY },
-	{ SCSI_ID_NAA,	SCSI_ID_NAA_IEEE_REG_EXTENDED,	SCSI_ID_ASCII },
-	{ SCSI_ID_NAA,	SCSI_ID_NAA_IEEE_REG,	SCSI_ID_BINARY },
-	{ SCSI_ID_NAA,	SCSI_ID_NAA_IEEE_REG,	SCSI_ID_ASCII },
-	/*
-	 * Devices already exist using NAA values that are now marked
-	 * reserved. These should not conflict with other values, or it is
-	 * a bug in the device. As long as we find the IEEE extended one
-	 * first, we really don't care what other ones are used. Using
-	 * don't care here means that a device that returns multiple
-	 * non-IEEE descriptors in a random order will get different
-	 * names.
-	 */
-	{ SCSI_ID_NAA,	SCSI_ID_NAA_DONT_CARE,	SCSI_ID_BINARY },
-	{ SCSI_ID_NAA,	SCSI_ID_NAA_DONT_CARE,	SCSI_ID_ASCII },
-	{ SCSI_ID_EUI_64,	SCSI_ID_NAA_DONT_CARE,	SCSI_ID_BINARY },
-	{ SCSI_ID_EUI_64,	SCSI_ID_NAA_DONT_CARE,	SCSI_ID_ASCII },
-	{ SCSI_ID_T10_VENDOR,	SCSI_ID_NAA_DONT_CARE,	SCSI_ID_BINARY },
-	{ SCSI_ID_T10_VENDOR,	SCSI_ID_NAA_DONT_CARE,	SCSI_ID_ASCII },
-	{ SCSI_ID_VENDOR_SPECIFIC,	SCSI_ID_NAA_DONT_CARE,	SCSI_ID_BINARY },
-	{ SCSI_ID_VENDOR_SPECIFIC,	SCSI_ID_NAA_DONT_CARE,	SCSI_ID_ASCII },
+        { SCSI_ID_TGTGROUP,        SCSI_ID_NAA_DONT_CARE,        SCSI_ID_BINARY },
+        { SCSI_ID_NAA,        SCSI_ID_NAA_IEEE_REG_EXTENDED,        SCSI_ID_BINARY },
+        { SCSI_ID_NAA,        SCSI_ID_NAA_IEEE_REG_EXTENDED,        SCSI_ID_ASCII },
+        { SCSI_ID_NAA,        SCSI_ID_NAA_IEEE_REG,        SCSI_ID_BINARY },
+        { SCSI_ID_NAA,        SCSI_ID_NAA_IEEE_REG,        SCSI_ID_ASCII },
+        /*
+         * Devices already exist using NAA values that are now marked
+         * reserved. These should not conflict with other values, or it is
+         * a bug in the device. As long as we find the IEEE extended one
+         * first, we really don't care what other ones are used. Using
+         * don't care here means that a device that returns multiple
+         * non-IEEE descriptors in a random order will get different
+         * names.
+         */
+        { SCSI_ID_NAA,        SCSI_ID_NAA_DONT_CARE,        SCSI_ID_BINARY },
+        { SCSI_ID_NAA,        SCSI_ID_NAA_DONT_CARE,        SCSI_ID_ASCII },
+        { SCSI_ID_EUI_64,        SCSI_ID_NAA_DONT_CARE,        SCSI_ID_BINARY },
+        { SCSI_ID_EUI_64,        SCSI_ID_NAA_DONT_CARE,        SCSI_ID_ASCII },
+        { SCSI_ID_T10_VENDOR,        SCSI_ID_NAA_DONT_CARE,        SCSI_ID_BINARY },
+        { SCSI_ID_T10_VENDOR,        SCSI_ID_NAA_DONT_CARE,        SCSI_ID_ASCII },
+        { SCSI_ID_VENDOR_SPECIFIC,        SCSI_ID_NAA_DONT_CARE,        SCSI_ID_BINARY },
+        { SCSI_ID_VENDOR_SPECIFIC,        SCSI_ID_NAA_DONT_CARE,        SCSI_ID_ASCII },
 };
 
 static const char hex_str[]="0123456789abcdef";
@@ -79,376 +79,376 @@ static const char hex_str[]="0123456789abcdef";
  * are used here.
  */
 
-#define DID_NO_CONNECT			0x01	/* Unable to connect before timeout */
-#define DID_BUS_BUSY			0x02	/* Bus remain busy until timeout */
-#define DID_TIME_OUT			0x03	/* Timed out for some other reason */
-#define DRIVER_TIMEOUT			0x06
-#define DRIVER_SENSE			0x08	/* Sense_buffer has been set */
+#define DID_NO_CONNECT                        0x01        /* Unable to connect before timeout */
+#define DID_BUS_BUSY                        0x02        /* Bus remain busy until timeout */
+#define DID_TIME_OUT                        0x03        /* Timed out for some other reason */
+#define DRIVER_TIMEOUT                        0x06
+#define DRIVER_SENSE                        0x08        /* Sense_buffer has been set */
 
 /* The following "category" function returns one of the following */
-#define SG_ERR_CAT_CLEAN		0	/* No errors or other information */
-#define SG_ERR_CAT_MEDIA_CHANGED	1	/* interpreted from sense buffer */
-#define SG_ERR_CAT_RESET		2	/* interpreted from sense buffer */
-#define SG_ERR_CAT_TIMEOUT		3
-#define SG_ERR_CAT_RECOVERED		4	/* Successful command after recovered err */
-#define SG_ERR_CAT_NOTSUPPORTED		5	/* Illegal / unsupported command */
-#define SG_ERR_CAT_SENSE		98	/* Something else in the sense buffer */
-#define SG_ERR_CAT_OTHER		99	/* Some other error/warning */
+#define SG_ERR_CAT_CLEAN                0        /* No errors or other information */
+#define SG_ERR_CAT_MEDIA_CHANGED        1        /* interpreted from sense buffer */
+#define SG_ERR_CAT_RESET                2        /* interpreted from sense buffer */
+#define SG_ERR_CAT_TIMEOUT                3
+#define SG_ERR_CAT_RECOVERED                4        /* Successful command after recovered err */
+#define SG_ERR_CAT_NOTSUPPORTED                5        /* Illegal / unsupported command */
+#define SG_ERR_CAT_SENSE                98        /* Something else in the sense buffer */
+#define SG_ERR_CAT_OTHER                99        /* Some other error/warning */
 
 static int do_scsi_page80_inquiry(struct udev *udev,
-				  struct scsi_id_device *dev_scsi, int fd,
-				  char *serial, char *serial_short, int max_len);
+                                  struct scsi_id_device *dev_scsi, int fd,
+                                  char *serial, char *serial_short, int max_len);
 
 static int sg_err_category_new(struct udev *udev,
-			       int scsi_status, int msg_status, int
-			       host_status, int driver_status, const
-			       unsigned char *sense_buffer, int sb_len)
+                               int scsi_status, int msg_status, int
+                               host_status, int driver_status, const
+                               unsigned char *sense_buffer, int sb_len)
 {
-	scsi_status &= 0x7e;
-
-	/*
-	 * XXX change to return only two values - failed or OK.
-	 */
-
-	if (!scsi_status && !host_status && !driver_status)
-		return SG_ERR_CAT_CLEAN;
-
-	if ((scsi_status == SCSI_CHECK_CONDITION) ||
-	    (scsi_status == SCSI_COMMAND_TERMINATED) ||
-	    ((driver_status & 0xf) == DRIVER_SENSE)) {
-		if (sense_buffer && (sb_len > 2)) {
-			int sense_key;
-			unsigned char asc;
-
-			if (sense_buffer[0] & 0x2) {
-				sense_key = sense_buffer[1] & 0xf;
-				asc = sense_buffer[2];
-			} else {
-				sense_key = sense_buffer[2] & 0xf;
-				asc = (sb_len > 12) ? sense_buffer[12] : 0;
-			}
-
-			if (sense_key == RECOVERED_ERROR)
-				return SG_ERR_CAT_RECOVERED;
-			else if (sense_key == UNIT_ATTENTION) {
-				if (0x28 == asc)
-					return SG_ERR_CAT_MEDIA_CHANGED;
-				if (0x29 == asc)
-					return SG_ERR_CAT_RESET;
-			} else if (sense_key == ILLEGAL_REQUEST) {
-				return SG_ERR_CAT_NOTSUPPORTED;
-			}
-		}
-		return SG_ERR_CAT_SENSE;
-	}
-	if (host_status) {
-		if ((host_status == DID_NO_CONNECT) ||
-		    (host_status == DID_BUS_BUSY) ||
-		    (host_status == DID_TIME_OUT))
-			return SG_ERR_CAT_TIMEOUT;
-	}
-	if (driver_status) {
-		if (driver_status == DRIVER_TIMEOUT)
-			return SG_ERR_CAT_TIMEOUT;
-	}
-	return SG_ERR_CAT_OTHER;
+        scsi_status &= 0x7e;
+
+        /*
+         * XXX change to return only two values - failed or OK.
+         */
+
+        if (!scsi_status && !host_status && !driver_status)
+                return SG_ERR_CAT_CLEAN;
+
+        if ((scsi_status == SCSI_CHECK_CONDITION) ||
+            (scsi_status == SCSI_COMMAND_TERMINATED) ||
+            ((driver_status & 0xf) == DRIVER_SENSE)) {
+                if (sense_buffer && (sb_len > 2)) {
+                        int sense_key;
+                        unsigned char asc;
+
+                        if (sense_buffer[0] & 0x2) {
+                                sense_key = sense_buffer[1] & 0xf;
+                                asc = sense_buffer[2];
+                        } else {
+                                sense_key = sense_buffer[2] & 0xf;
+                                asc = (sb_len > 12) ? sense_buffer[12] : 0;
+                        }
+
+                        if (sense_key == RECOVERED_ERROR)
+                                return SG_ERR_CAT_RECOVERED;
+                        else if (sense_key == UNIT_ATTENTION) {
+                                if (0x28 == asc)
+                                        return SG_ERR_CAT_MEDIA_CHANGED;
+                                if (0x29 == asc)
+                                        return SG_ERR_CAT_RESET;
+                        } else if (sense_key == ILLEGAL_REQUEST) {
+                                return SG_ERR_CAT_NOTSUPPORTED;
+                        }
+                }
+                return SG_ERR_CAT_SENSE;
+        }
+        if (host_status) {
+                if ((host_status == DID_NO_CONNECT) ||
+                    (host_status == DID_BUS_BUSY) ||
+                    (host_status == DID_TIME_OUT))
+                        return SG_ERR_CAT_TIMEOUT;
+        }
+        if (driver_status) {
+                if (driver_status == DRIVER_TIMEOUT)
+                        return SG_ERR_CAT_TIMEOUT;
+        }
+        return SG_ERR_CAT_OTHER;
 }
 
 static int sg_err_category3(struct udev *udev, struct sg_io_hdr *hp)
 {
-	return sg_err_category_new(udev,
-				   hp->status, hp->msg_status,
-				   hp->host_status, hp->driver_status,
-				   hp->sbp, hp->sb_len_wr);
+        return sg_err_category_new(udev,
+                                   hp->status, hp->msg_status,
+                                   hp->host_status, hp->driver_status,
+                                   hp->sbp, hp->sb_len_wr);
 }
 
 static int sg_err_category4(struct udev *udev, struct sg_io_v4 *hp)
 {
-	return sg_err_category_new(udev, hp->device_status, 0,
-				   hp->transport_status, hp->driver_status,
-				   (unsigned char *)(uintptr_t)hp->response,
-				   hp->response_len);
+        return sg_err_category_new(udev, hp->device_status, 0,
+                                   hp->transport_status, hp->driver_status,
+                                   (unsigned char *)(uintptr_t)hp->response,
+                                   hp->response_len);
 }
 
 static int scsi_dump_sense(struct udev *udev,
-			   struct scsi_id_device *dev_scsi,
-			   unsigned char *sense_buffer, int sb_len)
+                           struct scsi_id_device *dev_scsi,
+                           unsigned char *sense_buffer, int sb_len)
 {
-	int s;
-	int code;
-	int sense_class;
-	int sense_key;
-	int asc, ascq;
+        int s;
+        int code;
+        int sense_class;
+        int sense_key;
+        int asc, ascq;
 #ifdef DUMP_SENSE
-	char out_buffer[256];
-	int i, j;
+        char out_buffer[256];
+        int i, j;
 #endif
 
-	/*
-	 * Figure out and print the sense key, asc and ascq.
-	 *
-	 * If you want to suppress these for a particular drive model, add
-	 * a black list entry in the scsi_id config file.
-	 *
-	 * XXX We probably need to: lookup the sense/asc/ascq in a retry
-	 * table, and if found return 1 (after dumping the sense, asc, and
-	 * ascq). So, if/when we get something like a power on/reset,
-	 * we'll retry the command.
-	 */
-
-	dbg(udev, "got check condition\n");
-
-	if (sb_len < 1) {
-		info(udev, "%s: sense buffer empty\n", dev_scsi->kernel);
-		return -1;
-	}
-
-	sense_class = (sense_buffer[0] >> 4) & 0x07;
-	code = sense_buffer[0] & 0xf;
-
-	if (sense_class == 7) {
-		/*
-		 * extended sense data.
-		 */
-		s = sense_buffer[7] + 8;
-		if (sb_len < s) {
-			info(udev, "%s: sense buffer too small %d bytes, %d bytes too short\n",
-			    dev_scsi->kernel, sb_len, s - sb_len);
-			return -1;
-		}
-		if ((code == 0x0) || (code == 0x1)) {
-			sense_key = sense_buffer[2] & 0xf;
-			if (s < 14) {
-				/*
-				 * Possible?
-				 */
-				info(udev, "%s: sense result too" " small %d bytes\n",
-				    dev_scsi->kernel, s);
-				return -1;
-			}
-			asc = sense_buffer[12];
-			ascq = sense_buffer[13];
-		} else if ((code == 0x2) || (code == 0x3)) {
-			sense_key = sense_buffer[1] & 0xf;
-			asc = sense_buffer[2];
-			ascq = sense_buffer[3];
-		} else {
-			info(udev, "%s: invalid sense code 0x%x\n",
-			    dev_scsi->kernel, code);
-			return -1;
-		}
-		info(udev, "%s: sense key 0x%x ASC 0x%x ASCQ 0x%x\n",
-		    dev_scsi->kernel, sense_key, asc, ascq);
-	} else {
-		if (sb_len < 4) {
-			info(udev, "%s: sense buffer too small %d bytes, %d bytes too short\n",
-			    dev_scsi->kernel, sb_len, 4 - sb_len);
-			return -1;
-		}
-
-		if (sense_buffer[0] < 15)
-			info(udev, "%s: old sense key: 0x%x\n", dev_scsi->kernel, sense_buffer[0] & 0x0f);
-		else
-			info(udev, "%s: sense = %2x %2x\n",
-			    dev_scsi->kernel, sense_buffer[0], sense_buffer[2]);
-		info(udev, "%s: non-extended sense class %d code 0x%0x\n",
-		    dev_scsi->kernel, sense_class, code);
-
-	}
+        /*
+         * Figure out and print the sense key, asc and ascq.
+         *
+         * If you want to suppress these for a particular drive model, add
+         * a black list entry in the scsi_id config file.
+         *
+         * XXX We probably need to: lookup the sense/asc/ascq in a retry
+         * table, and if found return 1 (after dumping the sense, asc, and
+         * ascq). So, if/when we get something like a power on/reset,
+         * we'll retry the command.
+         */
+
+        dbg(udev, "got check condition\n");
+
+        if (sb_len < 1) {
+                info(udev, "%s: sense buffer empty\n", dev_scsi->kernel);
+                return -1;
+        }
+
+        sense_class = (sense_buffer[0] >> 4) & 0x07;
+        code = sense_buffer[0] & 0xf;
+
+        if (sense_class == 7) {
+                /*
+                 * extended sense data.
+                 */
+                s = sense_buffer[7] + 8;
+                if (sb_len < s) {
+                        info(udev, "%s: sense buffer too small %d bytes, %d bytes too short\n",
+                            dev_scsi->kernel, sb_len, s - sb_len);
+                        return -1;
+                }
+                if ((code == 0x0) || (code == 0x1)) {
+                        sense_key = sense_buffer[2] & 0xf;
+                        if (s < 14) {
+                                /*
+                                 * Possible?
+                                 */
+                                info(udev, "%s: sense result too" " small %d bytes\n",
+                                    dev_scsi->kernel, s);
+                                return -1;
+                        }
+                        asc = sense_buffer[12];
+                        ascq = sense_buffer[13];
+                } else if ((code == 0x2) || (code == 0x3)) {
+                        sense_key = sense_buffer[1] & 0xf;
+                        asc = sense_buffer[2];
+                        ascq = sense_buffer[3];
+                } else {
+                        info(udev, "%s: invalid sense code 0x%x\n",
+                            dev_scsi->kernel, code);
+                        return -1;
+                }
+                info(udev, "%s: sense key 0x%x ASC 0x%x ASCQ 0x%x\n",
+                    dev_scsi->kernel, sense_key, asc, ascq);
+        } else {
+                if (sb_len < 4) {
+                        info(udev, "%s: sense buffer too small %d bytes, %d bytes too short\n",
+                            dev_scsi->kernel, sb_len, 4 - sb_len);
+                        return -1;
+                }
+
+                if (sense_buffer[0] < 15)
+                        info(udev, "%s: old sense key: 0x%x\n", dev_scsi->kernel, sense_buffer[0] & 0x0f);
+                else
+                        info(udev, "%s: sense = %2x %2x\n",
+                            dev_scsi->kernel, sense_buffer[0], sense_buffer[2]);
+                info(udev, "%s: non-extended sense class %d code 0x%0x\n",
+                    dev_scsi->kernel, sense_class, code);
+
+        }
 
 #ifdef DUMP_SENSE
-	for (i = 0, j = 0; (i < s) && (j < 254); i++) {
-		dbg(udev, "i %d, j %d\n", i, j);
-		out_buffer[j++] = hex_str[(sense_buffer[i] & 0xf0) >> 4];
-		out_buffer[j++] = hex_str[sense_buffer[i] & 0x0f];
-		out_buffer[j++] = ' ';
-	}
-	out_buffer[j] = '\0';
-	info(udev, "%s: sense dump:\n", dev_scsi->kernel);
-	info(udev, "%s: %s\n", dev_scsi->kernel, out_buffer);
+        for (i = 0, j = 0; (i < s) && (j < 254); i++) {
+                dbg(udev, "i %d, j %d\n", i, j);
+                out_buffer[j++] = hex_str[(sense_buffer[i] & 0xf0) >> 4];
+                out_buffer[j++] = hex_str[sense_buffer[i] & 0x0f];
+                out_buffer[j++] = ' ';
+        }
+        out_buffer[j] = '\0';
+        info(udev, "%s: sense dump:\n", dev_scsi->kernel);
+        info(udev, "%s: %s\n", dev_scsi->kernel, out_buffer);
 
 #endif
-	return -1;
+        return -1;
 }
 
 static int scsi_dump(struct udev *udev,
-		     struct scsi_id_device *dev_scsi, struct sg_io_hdr *io)
+                     struct scsi_id_device *dev_scsi, struct sg_io_hdr *io)
 {
-	if (!io->status && !io->host_status && !io->msg_status &&
-	    !io->driver_status) {
-		/*
-		 * Impossible, should not be called.
-		 */
-		info(udev, "%s: called with no error\n", __FUNCTION__);
-		return -1;
-	}
-
-	info(udev, "%s: sg_io failed status 0x%x 0x%x 0x%x 0x%x\n",
-	    dev_scsi->kernel, io->driver_status, io->host_status, io->msg_status, io->status);
-	if (io->status == SCSI_CHECK_CONDITION)
-		return scsi_dump_sense(udev, dev_scsi, io->sbp, io->sb_len_wr);
-	else
-		return -1;
+        if (!io->status && !io->host_status && !io->msg_status &&
+            !io->driver_status) {
+                /*
+                 * Impossible, should not be called.
+                 */
+                info(udev, "%s: called with no error\n", __FUNCTION__);
+                return -1;
+        }
+
+        info(udev, "%s: sg_io failed status 0x%x 0x%x 0x%x 0x%x\n",
+            dev_scsi->kernel, io->driver_status, io->host_status, io->msg_status, io->status);
+        if (io->status == SCSI_CHECK_CONDITION)
+                return scsi_dump_sense(udev, dev_scsi, io->sbp, io->sb_len_wr);
+        else
+                return -1;
 }
 
 static int scsi_dump_v4(struct udev *udev,
-			struct scsi_id_device *dev_scsi, struct sg_io_v4 *io)
+                        struct scsi_id_device *dev_scsi, struct sg_io_v4 *io)
 {
-	if (!io->device_status && !io->transport_status &&
-	    !io->driver_status) {
-		/*
-		 * Impossible, should not be called.
-		 */
-		info(udev, "%s: called with no error\n", __FUNCTION__);
-		return -1;
-	}
-
-	info(udev, "%s: sg_io failed status 0x%x 0x%x 0x%x\n",
-	    dev_scsi->kernel, io->driver_status, io->transport_status,
-	     io->device_status);
-	if (io->device_status == SCSI_CHECK_CONDITION)
-		return scsi_dump_sense(udev, dev_scsi, (unsigned char *)(uintptr_t)io->response,
-				       io->response_len);
-	else
-		return -1;
+        if (!io->device_status && !io->transport_status &&
+            !io->driver_status) {
+                /*
+                 * Impossible, should not be called.
+                 */
+                info(udev, "%s: called with no error\n", __FUNCTION__);
+                return -1;
+        }
+
+        info(udev, "%s: sg_io failed status 0x%x 0x%x 0x%x\n",
+            dev_scsi->kernel, io->driver_status, io->transport_status,
+             io->device_status);
+        if (io->device_status == SCSI_CHECK_CONDITION)
+                return scsi_dump_sense(udev, dev_scsi, (unsigned char *)(uintptr_t)io->response,
+                                       io->response_len);
+        else
+                return -1;
 }
 
 static int scsi_inquiry(struct udev *udev,
-			struct scsi_id_device *dev_scsi, int fd,
-			unsigned char evpd, unsigned char page,
-			unsigned char *buf, unsigned int buflen)
+                        struct scsi_id_device *dev_scsi, int fd,
+                        unsigned char evpd, unsigned char page,
+                        unsigned char *buf, unsigned int buflen)
 {
-	unsigned char inq_cmd[INQUIRY_CMDLEN] =
-		{ INQUIRY_CMD, evpd, page, 0, buflen, 0 };
-	unsigned char sense[SENSE_BUFF_LEN];
-	void *io_buf;
-	struct sg_io_v4 io_v4;
-	struct sg_io_hdr io_hdr;
-	int retry = 3; /* rather random */
-	int retval;
-
-	if (buflen > SCSI_INQ_BUFF_LEN) {
-		info(udev, "buflen %d too long\n", buflen);
-		return -1;
-	}
+        unsigned char inq_cmd[INQUIRY_CMDLEN] =
+                { INQUIRY_CMD, evpd, page, 0, buflen, 0 };
+        unsigned char sense[SENSE_BUFF_LEN];
+        void *io_buf;
+        struct sg_io_v4 io_v4;
+        struct sg_io_hdr io_hdr;
+        int retry = 3; /* rather random */
+        int retval;
+
+        if (buflen > SCSI_INQ_BUFF_LEN) {
+                info(udev, "buflen %d too long\n", buflen);
+                return -1;
+        }
 
 resend:
-	dbg(udev, "%s evpd %d, page 0x%x\n", dev_scsi->kernel, evpd, page);
-
-	if (dev_scsi->use_sg == 4) {
-		memset(&io_v4, 0, sizeof(struct sg_io_v4));
-		io_v4.guard = 'Q';
-		io_v4.protocol = BSG_PROTOCOL_SCSI;
-		io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
-		io_v4.request_len = sizeof(inq_cmd);
-		io_v4.request = (uintptr_t)inq_cmd;
-		io_v4.max_response_len = sizeof(sense);
-		io_v4.response = (uintptr_t)sense;
-		io_v4.din_xfer_len = buflen;
-		io_v4.din_xferp = (uintptr_t)buf;
-		io_buf = (void *)&io_v4;
-	} else {
-		memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
-		io_hdr.interface_id = 'S';
-		io_hdr.cmd_len = sizeof(inq_cmd);
-		io_hdr.mx_sb_len = sizeof(sense);
-		io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
-		io_hdr.dxfer_len = buflen;
-		io_hdr.dxferp = buf;
-		io_hdr.cmdp = inq_cmd;
-		io_hdr.sbp = sense;
-		io_hdr.timeout = DEF_TIMEOUT;
-		io_buf = (void *)&io_hdr;
-	}
-
-	retval = ioctl(fd, SG_IO, io_buf);
-	if (retval < 0) {
-		if ((errno == EINVAL || errno == ENOSYS) && dev_scsi->use_sg == 4) {
-			dev_scsi->use_sg = 3;
-			goto resend;
-		}
-		info(udev, "%s: ioctl failed: %s\n", dev_scsi->kernel, strerror(errno));
-		goto error;
-	}
-
-	if (dev_scsi->use_sg == 4)
-		retval = sg_err_category4(udev, io_buf);
-	else
-		retval = sg_err_category3(udev, io_buf);
-
-	switch (retval) {
-		case SG_ERR_CAT_NOTSUPPORTED:
-			buf[1] = 0;
-			/* Fallthrough */
-		case SG_ERR_CAT_CLEAN:
-		case SG_ERR_CAT_RECOVERED:
-			retval = 0;
-			break;
-
-		default:
-			if (dev_scsi->use_sg == 4)
-				retval = scsi_dump_v4(udev, dev_scsi, io_buf);
-			else
-				retval = scsi_dump(udev, dev_scsi, io_buf);
-	}
-
-	if (!retval) {
-		retval = buflen;
-	} else if (retval > 0) {
-		if (--retry > 0) {
-			dbg(udev, "%s: Retrying ...\n", dev_scsi->kernel);
-			goto resend;
-		}
-		retval = -1;
-	}
+        dbg(udev, "%s evpd %d, page 0x%x\n", dev_scsi->kernel, evpd, page);
+
+        if (dev_scsi->use_sg == 4) {
+                memset(&io_v4, 0, sizeof(struct sg_io_v4));
+                io_v4.guard = 'Q';
+                io_v4.protocol = BSG_PROTOCOL_SCSI;
+                io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD;
+                io_v4.request_len = sizeof(inq_cmd);
+                io_v4.request = (uintptr_t)inq_cmd;
+                io_v4.max_response_len = sizeof(sense);
+                io_v4.response = (uintptr_t)sense;
+                io_v4.din_xfer_len = buflen;
+                io_v4.din_xferp = (uintptr_t)buf;
+                io_buf = (void *)&io_v4;
+        } else {
+                memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
+                io_hdr.interface_id = 'S';
+                io_hdr.cmd_len = sizeof(inq_cmd);
+                io_hdr.mx_sb_len = sizeof(sense);
+                io_hdr.dxfer_direction = SG_DXFER_FROM_DEV;
+                io_hdr.dxfer_len = buflen;
+                io_hdr.dxferp = buf;
+                io_hdr.cmdp = inq_cmd;
+                io_hdr.sbp = sense;
+                io_hdr.timeout = DEF_TIMEOUT;
+                io_buf = (void *)&io_hdr;
+        }
+
+        retval = ioctl(fd, SG_IO, io_buf);
+        if (retval < 0) {
+                if ((errno == EINVAL || errno == ENOSYS) && dev_scsi->use_sg == 4) {
+                        dev_scsi->use_sg = 3;
+                        goto resend;
+                }
+                info(udev, "%s: ioctl failed: %s\n", dev_scsi->kernel, strerror(errno));
+                goto error;
+        }
+
+        if (dev_scsi->use_sg == 4)
+                retval = sg_err_category4(udev, io_buf);
+        else
+                retval = sg_err_category3(udev, io_buf);
+
+        switch (retval) {
+                case SG_ERR_CAT_NOTSUPPORTED:
+                        buf[1] = 0;
+                        /* Fallthrough */
+                case SG_ERR_CAT_CLEAN:
+                case SG_ERR_CAT_RECOVERED:
+                        retval = 0;
+                        break;
+
+                default:
+                        if (dev_scsi->use_sg == 4)
+                                retval = scsi_dump_v4(udev, dev_scsi, io_buf);
+                        else
+                                retval = scsi_dump(udev, dev_scsi, io_buf);
+        }
+
+        if (!retval) {
+                retval = buflen;
+        } else if (retval > 0) {
+                if (--retry > 0) {
+                        dbg(udev, "%s: Retrying ...\n", dev_scsi->kernel);
+                        goto resend;
+                }
+                retval = -1;
+        }
 
 error:
-	if (retval < 0)
-		info(udev, "%s: Unable to get INQUIRY vpd %d page 0x%x.\n",
-		    dev_scsi->kernel, evpd, page);
+        if (retval < 0)
+                info(udev, "%s: Unable to get INQUIRY vpd %d page 0x%x.\n",
+                    dev_scsi->kernel, evpd, page);
 
-	return retval;
+        return retval;
 }
 
 /* Get list of supported EVPD pages */
 static int do_scsi_page0_inquiry(struct udev *udev,
-				 struct scsi_id_device *dev_scsi, int fd,
-				 unsigned char *buffer, unsigned int len)
+                                 struct scsi_id_device *dev_scsi, int fd,
+                                 unsigned char *buffer, unsigned int len)
 {
-	int retval;
-
-	memset(buffer, 0, len);
-	retval = scsi_inquiry(udev, dev_scsi, fd, 1, 0x0, buffer, len);
-	if (retval < 0)
-		return 1;
-
-	if (buffer[1] != 0) {
-		info(udev, "%s: page 0 not available.\n", dev_scsi->kernel);
-		return 1;
-	}
-	if (buffer[3] > len) {
-		info(udev, "%s: page 0 buffer too long %d\n", dev_scsi->kernel,	 buffer[3]);
-		return 1;
-	}
-
-	/*
-	 * Following check is based on code once included in the 2.5.x
-	 * kernel.
-	 *
-	 * Some ill behaved devices return the standard inquiry here
-	 * rather than the evpd data, snoop the data to verify.
-	 */
-	if (buffer[3] > MODEL_LENGTH) {
-		/*
-		 * If the vendor id appears in the page assume the page is
-		 * invalid.
-		 */
-		if (!strncmp((char *)&buffer[VENDOR_LENGTH], dev_scsi->vendor, VENDOR_LENGTH)) {
-			info(udev, "%s: invalid page0 data\n", dev_scsi->kernel);
-			return 1;
-		}
-	}
-	return 0;
+        int retval;
+
+        memset(buffer, 0, len);
+        retval = scsi_inquiry(udev, dev_scsi, fd, 1, 0x0, buffer, len);
+        if (retval < 0)
+                return 1;
+
+        if (buffer[1] != 0) {
+                info(udev, "%s: page 0 not available.\n", dev_scsi->kernel);
+                return 1;
+        }
+        if (buffer[3] > len) {
+                info(udev, "%s: page 0 buffer too long %d\n", dev_scsi->kernel,         buffer[3]);
+                return 1;
+        }
+
+        /*
+         * Following check is based on code once included in the 2.5.x
+         * kernel.
+         *
+         * Some ill behaved devices return the standard inquiry here
+         * rather than the evpd data, snoop the data to verify.
+         */
+        if (buffer[3] > MODEL_LENGTH) {
+                /*
+                 * If the vendor id appears in the page assume the page is
+                 * invalid.
+                 */
+                if (!strncmp((char *)&buffer[VENDOR_LENGTH], dev_scsi->vendor, VENDOR_LENGTH)) {
+                        info(udev, "%s: invalid page0 data\n", dev_scsi->kernel);
+                        return 1;
+                }
+        }
+        return 0;
 }
 
 /*
@@ -456,24 +456,24 @@ static int do_scsi_page0_inquiry(struct udev *udev,
  * model.
  */
 static int prepend_vendor_model(struct udev *udev,
-				struct scsi_id_device *dev_scsi, char *serial)
+                                struct scsi_id_device *dev_scsi, char *serial)
 {
-	int ind;
-
-	strncpy(serial, dev_scsi->vendor, VENDOR_LENGTH);
-	strncat(serial, dev_scsi->model, MODEL_LENGTH);
-	ind = strlen(serial);
-
-	/*
-	 * This is not a complete check, since we are using strncat/cpy
-	 * above, ind will never be too large.
-	 */
-	if (ind != (VENDOR_LENGTH + MODEL_LENGTH)) {
-		info(udev, "%s: expected length %d, got length %d\n",
-		     dev_scsi->kernel, (VENDOR_LENGTH + MODEL_LENGTH), ind);
-		return -1;
-	}
-	return ind;
+        int ind;
+
+        strncpy(serial, dev_scsi->vendor, VENDOR_LENGTH);
+        strncat(serial, dev_scsi->model, MODEL_LENGTH);
+        ind = strlen(serial);
+
+        /*
+         * This is not a complete check, since we are using strncat/cpy
+         * above, ind will never be too large.
+         */
+        if (ind != (VENDOR_LENGTH + MODEL_LENGTH)) {
+                info(udev, "%s: expected length %d, got length %d\n",
+                     dev_scsi->kernel, (VENDOR_LENGTH + MODEL_LENGTH), ind);
+                return -1;
+        }
+        return ind;
 }
 
 /**
@@ -481,236 +481,236 @@ static int prepend_vendor_model(struct udev *udev,
  * serial number.
  **/
 static int check_fill_0x83_id(struct udev *udev,
-			      struct scsi_id_device *dev_scsi,
-			      unsigned char *page_83,
-			      const struct scsi_id_search_values
-			      *id_search, char *serial, char *serial_short,
-			      int max_len, char *wwn,
-			      char *wwn_vendor_extension, char *tgpt_group)
+                              struct scsi_id_device *dev_scsi,
+                              unsigned char *page_83,
+                              const struct scsi_id_search_values
+                              *id_search, char *serial, char *serial_short,
+                              int max_len, char *wwn,
+                              char *wwn_vendor_extension, char *tgpt_group)
 {
-	int i, j, s, len;
-
-	/*
-	 * ASSOCIATION must be with the device (value 0)
-	 * or with the target port for SCSI_ID_TGTPORT
-	 */
-	if ((page_83[1] & 0x30) == 0x10) {
-		if (id_search->id_type != SCSI_ID_TGTGROUP)
-			return 1;
-	} else if ((page_83[1] & 0x30) != 0) {
-		return 1;
-	}
-
-	if ((page_83[1] & 0x0f) != id_search->id_type)
-		return 1;
-
-	/*
-	 * Possibly check NAA sub-type.
-	 */
-	if ((id_search->naa_type != SCSI_ID_NAA_DONT_CARE) &&
-	    (id_search->naa_type != (page_83[4] & 0xf0) >> 4))
-		return 1;
-
-	/*
-	 * Check for matching code set - ASCII or BINARY.
-	 */
-	if ((page_83[0] & 0x0f) != id_search->code_set)
-		return 1;
-
-	/*
-	 * page_83[3]: identifier length
-	 */
-	len = page_83[3];
-	if ((page_83[0] & 0x0f) != SCSI_ID_ASCII)
-		/*
-		 * If not ASCII, use two bytes for each binary value.
-		 */
-		len *= 2;
-
-	/*
-	 * Add one byte for the NUL termination, and one for the id_type.
-	 */
-	len += 2;
-	if (id_search->id_type == SCSI_ID_VENDOR_SPECIFIC)
-		len += VENDOR_LENGTH + MODEL_LENGTH;
-
-	if (max_len < len) {
-		info(udev, "%s: length %d too short - need %d\n",
-		    dev_scsi->kernel, max_len, len);
-		return 1;
-	}
-
-	if (id_search->id_type == SCSI_ID_TGTGROUP && tgpt_group != NULL) {
-		unsigned int group;
-
-		group = ((unsigned int)page_83[6] << 8) | page_83[7];
-		sprintf(tgpt_group,"%x", group);
-		return 1;
-	}
-
-	serial[0] = hex_str[id_search->id_type];
-
-	/*
-	 * For SCSI_ID_VENDOR_SPECIFIC prepend the vendor and model before
-	 * the id since it is not unique across all vendors and models,
-	 * this differs from SCSI_ID_T10_VENDOR, where the vendor is
-	 * included in the identifier.
-	 */
-	if (id_search->id_type == SCSI_ID_VENDOR_SPECIFIC)
-		if (prepend_vendor_model(udev, dev_scsi, &serial[1]) < 0) {
-			dbg(udev, "prepend failed\n");
-			return 1;
-		}
-
-	i = 4; /* offset to the start of the identifier */
-	s = j = strlen(serial);
-	if ((page_83[0] & 0x0f) == SCSI_ID_ASCII) {
-		/*
-		 * ASCII descriptor.
-		 */
-		while (i < (4 + page_83[3]))
-			serial[j++] = page_83[i++];
-	} else {
-		/*
-		 * Binary descriptor, convert to ASCII, using two bytes of
-		 * ASCII for each byte in the page_83.
-		 */
-		while (i < (4 + page_83[3])) {
-			serial[j++] = hex_str[(page_83[i] & 0xf0) >> 4];
-			serial[j++] = hex_str[page_83[i] & 0x0f];
-			i++;
-		}
-	}
-
-	strcpy(serial_short, &serial[s]);
-
-	if (id_search->id_type == SCSI_ID_NAA && wwn != NULL) {
-		strncpy(wwn, &serial[s], 16);
-		if (wwn_vendor_extension != NULL) {
-			strncpy(wwn_vendor_extension, &serial[s + 16], 16);
-		}
-	}
-
-	return 0;
+        int i, j, s, len;
+
+        /*
+         * ASSOCIATION must be with the device (value 0)
+         * or with the target port for SCSI_ID_TGTPORT
+         */
+        if ((page_83[1] & 0x30) == 0x10) {
+                if (id_search->id_type != SCSI_ID_TGTGROUP)
+                        return 1;
+        } else if ((page_83[1] & 0x30) != 0) {
+                return 1;
+        }
+
+        if ((page_83[1] & 0x0f) != id_search->id_type)
+                return 1;
+
+        /*
+         * Possibly check NAA sub-type.
+         */
+        if ((id_search->naa_type != SCSI_ID_NAA_DONT_CARE) &&
+            (id_search->naa_type != (page_83[4] & 0xf0) >> 4))
+                return 1;
+
+        /*
+         * Check for matching code set - ASCII or BINARY.
+         */
+        if ((page_83[0] & 0x0f) != id_search->code_set)
+                return 1;
+
+        /*
+         * page_83[3]: identifier length
+         */
+        len = page_83[3];
+        if ((page_83[0] & 0x0f) != SCSI_ID_ASCII)
+                /*
+                 * If not ASCII, use two bytes for each binary value.
+                 */
+                len *= 2;
+
+        /*
+         * Add one byte for the NUL termination, and one for the id_type.
+         */
+        len += 2;
+        if (id_search->id_type == SCSI_ID_VENDOR_SPECIFIC)
+                len += VENDOR_LENGTH + MODEL_LENGTH;
+
+        if (max_len < len) {
+                info(udev, "%s: length %d too short - need %d\n",
+                    dev_scsi->kernel, max_len, len);
+                return 1;
+        }
+
+        if (id_search->id_type == SCSI_ID_TGTGROUP && tgpt_group != NULL) {
+                unsigned int group;
+
+                group = ((unsigned int)page_83[6] << 8) | page_83[7];
+                sprintf(tgpt_group,"%x", group);
+                return 1;
+        }
+
+        serial[0] = hex_str[id_search->id_type];
+
+        /*
+         * For SCSI_ID_VENDOR_SPECIFIC prepend the vendor and model before
+         * the id since it is not unique across all vendors and models,
+         * this differs from SCSI_ID_T10_VENDOR, where the vendor is
+         * included in the identifier.
+         */
+        if (id_search->id_type == SCSI_ID_VENDOR_SPECIFIC)
+                if (prepend_vendor_model(udev, dev_scsi, &serial[1]) < 0) {
+                        dbg(udev, "prepend failed\n");
+                        return 1;
+                }
+
+        i = 4; /* offset to the start of the identifier */
+        s = j = strlen(serial);
+        if ((page_83[0] & 0x0f) == SCSI_ID_ASCII) {
+                /*
+                 * ASCII descriptor.
+                 */
+                while (i < (4 + page_83[3]))
+                        serial[j++] = page_83[i++];
+        } else {
+                /*
+                 * Binary descriptor, convert to ASCII, using two bytes of
+                 * ASCII for each byte in the page_83.
+                 */
+                while (i < (4 + page_83[3])) {
+                        serial[j++] = hex_str[(page_83[i] & 0xf0) >> 4];
+                        serial[j++] = hex_str[page_83[i] & 0x0f];
+                        i++;
+                }
+        }
+
+        strcpy(serial_short, &serial[s]);
+
+        if (id_search->id_type == SCSI_ID_NAA && wwn != NULL) {
+                strncpy(wwn, &serial[s], 16);
+                if (wwn_vendor_extension != NULL) {
+                        strncpy(wwn_vendor_extension, &serial[s + 16], 16);
+                }
+        }
+
+        return 0;
 }
 
 /* Extract the raw binary from VPD 0x83 pre-SPC devices */
 static int check_fill_0x83_prespc3(struct udev *udev,
-				   struct scsi_id_device *dev_scsi,
-			           unsigned char *page_83,
-			           const struct scsi_id_search_values
-			           *id_search, char *serial, char *serial_short, int max_len)
+                                   struct scsi_id_device *dev_scsi,
+                                   unsigned char *page_83,
+                                   const struct scsi_id_search_values
+                                   *id_search, char *serial, char *serial_short, int max_len)
 {
-	int i, j;
-
-	dbg(udev, "using pre-spc3-83 for %s\n", dev_scsi->kernel);
-	serial[0] = hex_str[id_search->id_type];
-	/* serial has been memset to zero before */
-	j = strlen(serial);	/* j = 1; */
-
-	for (i = 0; (i < page_83[3]) && (j < max_len-3); ++i) {
-		serial[j++] = hex_str[(page_83[4+i] & 0xf0) >> 4];
-		serial[j++] = hex_str[ page_83[4+i] & 0x0f];
-	}
-	serial[max_len-1] = 0;
-	strncpy(serial_short, serial, max_len-1);
-	return 0;
+        int i, j;
+
+        dbg(udev, "using pre-spc3-83 for %s\n", dev_scsi->kernel);
+        serial[0] = hex_str[id_search->id_type];
+        /* serial has been memset to zero before */
+        j = strlen(serial);        /* j = 1; */
+
+        for (i = 0; (i < page_83[3]) && (j < max_len-3); ++i) {
+                serial[j++] = hex_str[(page_83[4+i] & 0xf0) >> 4];
+                serial[j++] = hex_str[ page_83[4+i] & 0x0f];
+        }
+        serial[max_len-1] = 0;
+        strncpy(serial_short, serial, max_len-1);
+        return 0;
 }
 
 
 /* Get device identification VPD page */
 static int do_scsi_page83_inquiry(struct udev *udev,
-				  struct scsi_id_device *dev_scsi, int fd,
-				  char *serial, char *serial_short, int len,
-				  char *unit_serial_number, char *wwn,
-				  char *wwn_vendor_extension, char *tgpt_group)
+                                  struct scsi_id_device *dev_scsi, int fd,
+                                  char *serial, char *serial_short, int len,
+                                  char *unit_serial_number, char *wwn,
+                                  char *wwn_vendor_extension, char *tgpt_group)
 {
-	int retval;
-	unsigned int id_ind, j;
-	unsigned char page_83[SCSI_INQ_BUFF_LEN];
+        int retval;
+        unsigned int id_ind, j;
+        unsigned char page_83[SCSI_INQ_BUFF_LEN];
 
-	/* also pick up the page 80 serial number */
+        /* also pick up the page 80 serial number */
         do_scsi_page80_inquiry(udev, dev_scsi, fd, NULL, unit_serial_number, MAX_SERIAL_LEN);
 
-	memset(page_83, 0, SCSI_INQ_BUFF_LEN);
-	retval = scsi_inquiry(udev, dev_scsi, fd, 1, PAGE_83, page_83,
-			      SCSI_INQ_BUFF_LEN);
-	if (retval < 0)
-		return 1;
-
-	if (page_83[1] != PAGE_83) {
-		info(udev, "%s: Invalid page 0x83\n", dev_scsi->kernel);
-		return 1;
-	}
-
-	/*
-	 * XXX Some devices (IBM 3542) return all spaces for an identifier if
-	 * the LUN is not actually configured. This leads to identifiers of
-	 * the form: "1            ".
-	 */
-
-	/*
-	 * Model 4, 5, and (some) model 6 EMC Symmetrix devices return
-	 * a page 83 reply according to SCSI-2 format instead of SPC-2/3.
-	 *
-	 * The SCSI-2 page 83 format returns an IEEE WWN in binary
-	 * encoded hexi-decimal in the 16 bytes following the initial
-	 * 4-byte page 83 reply header.
-	 *
-	 * Both the SPC-2 and SPC-3 formats return an IEEE WWN as part
-	 * of an Identification descriptor.  The 3rd byte of the first
-	 * Identification descriptor is a reserved (BSZ) byte field.
-	 *
-	 * Reference the 7th byte of the page 83 reply to determine
-	 * whether the reply is compliant with SCSI-2 or SPC-2/3
-	 * specifications.  A zero value in the 7th byte indicates
-	 * an SPC-2/3 conformant reply, (i.e., the reserved field of the
-	 * first Identification descriptor).  This byte will be non-zero
-	 * for a SCSI-2 conformant page 83 reply from these EMC
-	 * Symmetrix models since the 7th byte of the reply corresponds
-	 * to the 4th and 5th nibbles of the 6-byte OUI for EMC, that is,
-	 * 0x006048.
-	 */
-
-	if (page_83[6] != 0)
-		return check_fill_0x83_prespc3(udev,
-					       dev_scsi, page_83, id_search_list,
-					       serial, serial_short, len);
-
-	/*
-	 * Search for a match in the prioritized id_search_list - since WWN ids
+        memset(page_83, 0, SCSI_INQ_BUFF_LEN);
+        retval = scsi_inquiry(udev, dev_scsi, fd, 1, PAGE_83, page_83,
+                              SCSI_INQ_BUFF_LEN);
+        if (retval < 0)
+                return 1;
+
+        if (page_83[1] != PAGE_83) {
+                info(udev, "%s: Invalid page 0x83\n", dev_scsi->kernel);
+                return 1;
+        }
+
+        /*
+         * XXX Some devices (IBM 3542) return all spaces for an identifier if
+         * the LUN is not actually configured. This leads to identifiers of
+         * the form: "1            ".
+         */
+
+        /*
+         * Model 4, 5, and (some) model 6 EMC Symmetrix devices return
+         * a page 83 reply according to SCSI-2 format instead of SPC-2/3.
+         *
+         * The SCSI-2 page 83 format returns an IEEE WWN in binary
+         * encoded hexi-decimal in the 16 bytes following the initial
+         * 4-byte page 83 reply header.
+         *
+         * Both the SPC-2 and SPC-3 formats return an IEEE WWN as part
+         * of an Identification descriptor.  The 3rd byte of the first
+         * Identification descriptor is a reserved (BSZ) byte field.
+         *
+         * Reference the 7th byte of the page 83 reply to determine
+         * whether the reply is compliant with SCSI-2 or SPC-2/3
+         * specifications.  A zero value in the 7th byte indicates
+         * an SPC-2/3 conformant reply, (i.e., the reserved field of the
+         * first Identification descriptor).  This byte will be non-zero
+         * for a SCSI-2 conformant page 83 reply from these EMC
+         * Symmetrix models since the 7th byte of the reply corresponds
+         * to the 4th and 5th nibbles of the 6-byte OUI for EMC, that is,
+         * 0x006048.
+         */
+
+        if (page_83[6] != 0)
+                return check_fill_0x83_prespc3(udev,
+                                               dev_scsi, page_83, id_search_list,
+                                               serial, serial_short, len);
+
+        /*
+         * Search for a match in the prioritized id_search_list - since WWN ids
          * come first we can pick up the WWN in check_fill_0x83_id().
-	 */
-	for (id_ind = 0;
-	     id_ind < sizeof(id_search_list)/sizeof(id_search_list[0]);
-	     id_ind++) {
-		/*
-		 * Examine each descriptor returned. There is normally only
-		 * one or a small number of descriptors.
-		 */
-		for (j = 4; j <= (unsigned int)page_83[3] + 3; j += page_83[j + 3] + 4) {
-			retval = check_fill_0x83_id(udev,
-						    dev_scsi, &page_83[j],
-						    &id_search_list[id_ind],
-						    serial, serial_short, len,
-						    wwn, wwn_vendor_extension,
-						    tgpt_group);
-			dbg(udev, "%s id desc %d/%d/%d\n", dev_scsi->kernel,
-				id_search_list[id_ind].id_type,
-				id_search_list[id_ind].naa_type,
-				id_search_list[id_ind].code_set);
-			if (!retval) {
-				dbg(udev, "  used\n");
-				return retval;
-			} else if (retval < 0) {
-				dbg(udev, "  failed\n");
-				return retval;
-			} else {
-				dbg(udev, "  not used\n");
-			}
-		}
-	}
-	return 1;
+         */
+        for (id_ind = 0;
+             id_ind < sizeof(id_search_list)/sizeof(id_search_list[0]);
+             id_ind++) {
+                /*
+                 * Examine each descriptor returned. There is normally only
+                 * one or a small number of descriptors.
+                 */
+                for (j = 4; j <= (unsigned int)page_83[3] + 3; j += page_83[j + 3] + 4) {
+                        retval = check_fill_0x83_id(udev,
+                                                    dev_scsi, &page_83[j],
+                                                    &id_search_list[id_ind],
+                                                    serial, serial_short, len,
+                                                    wwn, wwn_vendor_extension,
+                                                    tgpt_group);
+                        dbg(udev, "%s id desc %d/%d/%d\n", dev_scsi->kernel,
+                                id_search_list[id_ind].id_type,
+                                id_search_list[id_ind].naa_type,
+                                id_search_list[id_ind].code_set);
+                        if (!retval) {
+                                dbg(udev, "  used\n");
+                                return retval;
+                        } else if (retval < 0) {
+                                dbg(udev, "  failed\n");
+                                return retval;
+                        } else {
+                                dbg(udev, "  not used\n");
+                        }
+                }
+        }
+        return 1;
 }
 
 /*
@@ -721,98 +721,98 @@ static int do_scsi_page83_inquiry(struct udev *udev,
  * conformant to the SCSI-2 format.
  */
 static int do_scsi_page83_prespc3_inquiry(struct udev *udev,
-					  struct scsi_id_device *dev_scsi, int fd,
-					  char *serial, char *serial_short, int len)
+                                          struct scsi_id_device *dev_scsi, int fd,
+                                          char *serial, char *serial_short, int len)
 {
-	int retval;
-	int i, j;
-	unsigned char page_83[SCSI_INQ_BUFF_LEN];
-
-	memset(page_83, 0, SCSI_INQ_BUFF_LEN);
-	retval = scsi_inquiry(udev, dev_scsi, fd, 1, PAGE_83, page_83, SCSI_INQ_BUFF_LEN);
-	if (retval < 0)
-		return 1;
-
-	if (page_83[1] != PAGE_83) {
-		info(udev, "%s: Invalid page 0x83\n", dev_scsi->kernel);
-		return 1;
-	}
-	/*
-	 * Model 4, 5, and (some) model 6 EMC Symmetrix devices return
-	 * a page 83 reply according to SCSI-2 format instead of SPC-2/3.
-	 *
-	 * The SCSI-2 page 83 format returns an IEEE WWN in binary
-	 * encoded hexi-decimal in the 16 bytes following the initial
-	 * 4-byte page 83 reply header.
-	 *
-	 * Both the SPC-2 and SPC-3 formats return an IEEE WWN as part
-	 * of an Identification descriptor.  The 3rd byte of the first
-	 * Identification descriptor is a reserved (BSZ) byte field.
-	 *
-	 * Reference the 7th byte of the page 83 reply to determine
-	 * whether the reply is compliant with SCSI-2 or SPC-2/3
-	 * specifications.  A zero value in the 7th byte indicates
-	 * an SPC-2/3 conformant reply, (i.e., the reserved field of the
-	 * first Identification descriptor).  This byte will be non-zero
-	 * for a SCSI-2 conformant page 83 reply from these EMC
-	 * Symmetrix models since the 7th byte of the reply corresponds
-	 * to the 4th and 5th nibbles of the 6-byte OUI for EMC, that is,
-	 * 0x006048.
-	 */
-	if (page_83[6] == 0)
-		return 2;
-
-	serial[0] = hex_str[id_search_list[0].id_type];
-	/*
-	 * The first four bytes contain data, not a descriptor.
-	 */
-	i = 4;
-	j = strlen(serial);
-	/*
-	 * Binary descriptor, convert to ASCII,
-	 * using two bytes of ASCII for each byte
-	 * in the page_83.
-	 */
-	while (i < (page_83[3]+4)) {
-		serial[j++] = hex_str[(page_83[i] & 0xf0) >> 4];
-		serial[j++] = hex_str[page_83[i] & 0x0f];
-		i++;
-	}
-	dbg(udev, "using pre-spc3-83 for %s\n", dev_scsi->kernel);
-	return 0;
+        int retval;
+        int i, j;
+        unsigned char page_83[SCSI_INQ_BUFF_LEN];
+
+        memset(page_83, 0, SCSI_INQ_BUFF_LEN);
+        retval = scsi_inquiry(udev, dev_scsi, fd, 1, PAGE_83, page_83, SCSI_INQ_BUFF_LEN);
+        if (retval < 0)
+                return 1;
+
+        if (page_83[1] != PAGE_83) {
+                info(udev, "%s: Invalid page 0x83\n", dev_scsi->kernel);
+                return 1;
+        }
+        /*
+         * Model 4, 5, and (some) model 6 EMC Symmetrix devices return
+         * a page 83 reply according to SCSI-2 format instead of SPC-2/3.
+         *
+         * The SCSI-2 page 83 format returns an IEEE WWN in binary
+         * encoded hexi-decimal in the 16 bytes following the initial
+         * 4-byte page 83 reply header.
+         *
+         * Both the SPC-2 and SPC-3 formats return an IEEE WWN as part
+         * of an Identification descriptor.  The 3rd byte of the first
+         * Identification descriptor is a reserved (BSZ) byte field.
+         *
+         * Reference the 7th byte of the page 83 reply to determine
+         * whether the reply is compliant with SCSI-2 or SPC-2/3
+         * specifications.  A zero value in the 7th byte indicates
+         * an SPC-2/3 conformant reply, (i.e., the reserved field of the
+         * first Identification descriptor).  This byte will be non-zero
+         * for a SCSI-2 conformant page 83 reply from these EMC
+         * Symmetrix models since the 7th byte of the reply corresponds
+         * to the 4th and 5th nibbles of the 6-byte OUI for EMC, that is,
+         * 0x006048.
+         */
+        if (page_83[6] == 0)
+                return 2;
+
+        serial[0] = hex_str[id_search_list[0].id_type];
+        /*
+         * The first four bytes contain data, not a descriptor.
+         */
+        i = 4;
+        j = strlen(serial);
+        /*
+         * Binary descriptor, convert to ASCII,
+         * using two bytes of ASCII for each byte
+         * in the page_83.
+         */
+        while (i < (page_83[3]+4)) {
+                serial[j++] = hex_str[(page_83[i] & 0xf0) >> 4];
+                serial[j++] = hex_str[page_83[i] & 0x0f];
+                i++;
+        }
+        dbg(udev, "using pre-spc3-83 for %s\n", dev_scsi->kernel);
+        return 0;
 }
 
 /* Get unit serial number VPD page */
 static int do_scsi_page80_inquiry(struct udev *udev,
-				  struct scsi_id_device *dev_scsi, int fd,
-				  char *serial, char *serial_short, int max_len)
+                                  struct scsi_id_device *dev_scsi, int fd,
+                                  char *serial, char *serial_short, int max_len)
 {
-	int retval;
-	int ser_ind;
-	int i;
-	int len;
-	unsigned char buf[SCSI_INQ_BUFF_LEN];
-
-	memset(buf, 0, SCSI_INQ_BUFF_LEN);
-	retval = scsi_inquiry(udev, dev_scsi, fd, 1, PAGE_80, buf, SCSI_INQ_BUFF_LEN);
-	if (retval < 0)
-		return retval;
-
-	if (buf[1] != PAGE_80) {
-		info(udev, "%s: Invalid page 0x80\n", dev_scsi->kernel);
-		return 1;
-	}
-
-	len = 1 + VENDOR_LENGTH + MODEL_LENGTH + buf[3];
-	if (max_len < len) {
-		info(udev, "%s: length %d too short - need %d\n",
-		     dev_scsi->kernel, max_len, len);
-		return 1;
-	}
-	/*
-	 * Prepend 'S' to avoid unlikely collision with page 0x83 vendor
-	 * specific type where we prepend '0' + vendor + model.
-	 */
+        int retval;
+        int ser_ind;
+        int i;
+        int len;
+        unsigned char buf[SCSI_INQ_BUFF_LEN];
+
+        memset(buf, 0, SCSI_INQ_BUFF_LEN);
+        retval = scsi_inquiry(udev, dev_scsi, fd, 1, PAGE_80, buf, SCSI_INQ_BUFF_LEN);
+        if (retval < 0)
+                return retval;
+
+        if (buf[1] != PAGE_80) {
+                info(udev, "%s: Invalid page 0x80\n", dev_scsi->kernel);
+                return 1;
+        }
+
+        len = 1 + VENDOR_LENGTH + MODEL_LENGTH + buf[3];
+        if (max_len < len) {
+                info(udev, "%s: length %d too short - need %d\n",
+                     dev_scsi->kernel, max_len, len);
+                return 1;
+        }
+        /*
+         * Prepend 'S' to avoid unlikely collision with page 0x83 vendor
+         * specific type where we prepend '0' + vendor + model.
+         */
         len = buf[3];
         if (serial != NULL) {
                 serial[0] = 'S';
@@ -826,165 +826,165 @@ static int do_scsi_page80_inquiry(struct udev *udev,
                 memcpy(serial_short, &buf[4], len);
                 serial_short[len] = '\0';
         }
-	return 0;
+        return 0;
 }
 
 int scsi_std_inquiry(struct udev *udev,
-		     struct scsi_id_device *dev_scsi, const char *devname)
+                     struct scsi_id_device *dev_scsi, const char *devname)
 {
-	int fd;
-	unsigned char buf[SCSI_INQ_BUFF_LEN];
-	struct stat statbuf;
-	int err = 0;
-
-	dbg(udev, "opening %s\n", devname);
-	fd = open(devname, O_RDONLY | O_NONBLOCK);
-	if (fd < 0) {
-		info(udev, "scsi_id: cannot open %s: %s\n",
-		     devname, strerror(errno));
-		return 1;
-	}
-
-	if (fstat(fd, &statbuf) < 0) {
-		info(udev, "scsi_id: cannot stat %s: %s\n",
-		     devname, strerror(errno));
-		err = 2;
-		goto out;
-	}
-	sprintf(dev_scsi->kernel,"%d:%d", major(statbuf.st_rdev),
-		minor(statbuf.st_rdev));
-
-	memset(buf, 0, SCSI_INQ_BUFF_LEN);
-	err = scsi_inquiry(udev, dev_scsi, fd, 0, 0, buf, SCSI_INQ_BUFF_LEN);
-	if (err < 0)
-		goto out;
-
-	err = 0;
-	memcpy(dev_scsi->vendor, buf + 8, 8);
-	dev_scsi->vendor[8] = '\0';
-	memcpy(dev_scsi->model, buf + 16, 16);
-	dev_scsi->model[16] = '\0';
-	memcpy(dev_scsi->revision, buf + 32, 4);
-	dev_scsi->revision[4] = '\0';
-	sprintf(dev_scsi->type,"%x", buf[0] & 0x1f);
+        int fd;
+        unsigned char buf[SCSI_INQ_BUFF_LEN];
+        struct stat statbuf;
+        int err = 0;
+
+        dbg(udev, "opening %s\n", devname);
+        fd = open(devname, O_RDONLY | O_NONBLOCK);
+        if (fd < 0) {
+                info(udev, "scsi_id: cannot open %s: %s\n",
+                     devname, strerror(errno));
+                return 1;
+        }
+
+        if (fstat(fd, &statbuf) < 0) {
+                info(udev, "scsi_id: cannot stat %s: %s\n",
+                     devname, strerror(errno));
+                err = 2;
+                goto out;
+        }
+        sprintf(dev_scsi->kernel,"%d:%d", major(statbuf.st_rdev),
+                minor(statbuf.st_rdev));
+
+        memset(buf, 0, SCSI_INQ_BUFF_LEN);
+        err = scsi_inquiry(udev, dev_scsi, fd, 0, 0, buf, SCSI_INQ_BUFF_LEN);
+        if (err < 0)
+                goto out;
+
+        err = 0;
+        memcpy(dev_scsi->vendor, buf + 8, 8);
+        dev_scsi->vendor[8] = '\0';
+        memcpy(dev_scsi->model, buf + 16, 16);
+        dev_scsi->model[16] = '\0';
+        memcpy(dev_scsi->revision, buf + 32, 4);
+        dev_scsi->revision[4] = '\0';
+        sprintf(dev_scsi->type,"%x", buf[0] & 0x1f);
 
 out:
-	close(fd);
-	return err;
+        close(fd);
+        return err;
 }
 
 int scsi_get_serial(struct udev *udev,
-		    struct scsi_id_device *dev_scsi, const char *devname,
-		    int page_code, int len)
+                    struct scsi_id_device *dev_scsi, const char *devname,
+                    int page_code, int len)
 {
-	unsigned char page0[SCSI_INQ_BUFF_LEN];
-	int fd = -1;
-	int cnt;
-	int ind;
-	int retval;
-
-	memset(dev_scsi->serial, 0, len);
-	dbg(udev, "opening %s\n", devname);
-	srand((unsigned int)getpid());
-	for (cnt = 20; cnt > 0; cnt--) {
-		struct timespec duration;
-
-		fd = open(devname, O_RDONLY | O_NONBLOCK);
-		if (fd >= 0 || errno != EBUSY)
-			break;
-		duration.tv_sec = 0;
-		duration.tv_nsec = (200 * 1000 * 1000) + (rand() % 100 * 1000 * 1000);
-		nanosleep(&duration, NULL);
-	}
-	if (fd < 0)
-		return 1;
-
-	if (page_code == PAGE_80) {
-		if (do_scsi_page80_inquiry(udev, dev_scsi, fd, dev_scsi->serial, dev_scsi->serial_short, len)) {
-			retval = 1;
-			goto completed;
-		} else  {
-			retval = 0;
-			goto completed;
-		}
-	} else if (page_code == PAGE_83) {
-		if (do_scsi_page83_inquiry(udev, dev_scsi, fd, dev_scsi->serial, dev_scsi->serial_short, len, dev_scsi->unit_serial_number, dev_scsi->wwn, dev_scsi->wwn_vendor_extension, dev_scsi->tgpt_group)) {
-			retval = 1;
-			goto completed;
-		} else  {
-			retval = 0;
-			goto completed;
-		}
-	} else if (page_code == PAGE_83_PRE_SPC3) {
-		retval = do_scsi_page83_prespc3_inquiry(udev, dev_scsi, fd, dev_scsi->serial, dev_scsi->serial_short, len);
-		if (retval) {
-			/*
-			 * Fallback to servicing a SPC-2/3 compliant page 83
-			 * inquiry if the page 83 reply format does not
-			 * conform to pre-SPC3 expectations.
-			 */
-			if (retval == 2) {
-				if (do_scsi_page83_inquiry(udev, dev_scsi, fd, dev_scsi->serial, dev_scsi->serial_short, len, dev_scsi->unit_serial_number, dev_scsi->wwn, dev_scsi->wwn_vendor_extension, dev_scsi->tgpt_group)) {
-					retval = 1;
-					goto completed;
-				} else  {
-					retval = 0;
-					goto completed;
-				}
-			}
-			else {
-				retval = 1;
-				goto completed;
-			}
-		} else  {
-			retval = 0;
-			goto completed;
-		}
-	} else if (page_code != 0x00) {
-		info(udev, "%s: unsupported page code 0x%d\n", dev_scsi->kernel, page_code);
-		return 1;
-	}
-
-	/*
-	 * Get page 0, the page of the pages. By default, try from best to
-	 * worst of supported pages: 0x83 then 0x80.
-	 */
-	if (do_scsi_page0_inquiry(udev, dev_scsi, fd, page0, SCSI_INQ_BUFF_LEN)) {
-		/*
-		 * Don't try anything else. Black list if a specific page
-		 * should be used for this vendor+model, or maybe have an
-		 * optional fall-back to page 0x80 or page 0x83.
-		 */
-		retval = 1;
-		goto completed;
-	}
-
-	dbg(udev, "%s: Checking page0\n", dev_scsi->kernel);
-
-	for (ind = 4; ind <= page0[3] + 3; ind++)
-		if (page0[ind] == PAGE_83)
-			if (!do_scsi_page83_inquiry(udev, dev_scsi, fd,
-						    dev_scsi->serial, dev_scsi->serial_short, len, dev_scsi->unit_serial_number, dev_scsi->wwn, dev_scsi->wwn_vendor_extension, dev_scsi->tgpt_group)) {
-				/*
-				 * Success
-				 */
-				retval = 0;
-				goto completed;
-			}
-
-	for (ind = 4; ind <= page0[3] + 3; ind++)
-		if (page0[ind] == PAGE_80)
-			if (!do_scsi_page80_inquiry(udev, dev_scsi, fd,
-						    dev_scsi->serial, dev_scsi->serial_short, len)) {
-				/*
-				 * Success
-				 */
-				retval = 0;
-				goto completed;
-			}
-	retval = 1;
+        unsigned char page0[SCSI_INQ_BUFF_LEN];
+        int fd = -1;
+        int cnt;
+        int ind;
+        int retval;
+
+        memset(dev_scsi->serial, 0, len);
+        dbg(udev, "opening %s\n", devname);
+        srand((unsigned int)getpid());
+        for (cnt = 20; cnt > 0; cnt--) {
+                struct timespec duration;
+
+                fd = open(devname, O_RDONLY | O_NONBLOCK);
+                if (fd >= 0 || errno != EBUSY)
+                        break;
+                duration.tv_sec = 0;
+                duration.tv_nsec = (200 * 1000 * 1000) + (rand() % 100 * 1000 * 1000);
+                nanosleep(&duration, NULL);
+        }
+        if (fd < 0)
+                return 1;
+
+        if (page_code == PAGE_80) {
+                if (do_scsi_page80_inquiry(udev, dev_scsi, fd, dev_scsi->serial, dev_scsi->serial_short, len)) {
+                        retval = 1;
+                        goto completed;
+                } else  {
+                        retval = 0;
+                        goto completed;
+                }
+        } else if (page_code == PAGE_83) {
+                if (do_scsi_page83_inquiry(udev, dev_scsi, fd, dev_scsi->serial, dev_scsi->serial_short, len, dev_scsi->unit_serial_number, dev_scsi->wwn, dev_scsi->wwn_vendor_extension, dev_scsi->tgpt_group)) {
+                        retval = 1;
+                        goto completed;
+                } else  {
+                        retval = 0;
+                        goto completed;
+                }
+        } else if (page_code == PAGE_83_PRE_SPC3) {
+                retval = do_scsi_page83_prespc3_inquiry(udev, dev_scsi, fd, dev_scsi->serial, dev_scsi->serial_short, len);
+                if (retval) {
+                        /*
+                         * Fallback to servicing a SPC-2/3 compliant page 83
+                         * inquiry if the page 83 reply format does not
+                         * conform to pre-SPC3 expectations.
+                         */
+                        if (retval == 2) {
+                                if (do_scsi_page83_inquiry(udev, dev_scsi, fd, dev_scsi->serial, dev_scsi->serial_short, len, dev_scsi->unit_serial_number, dev_scsi->wwn, dev_scsi->wwn_vendor_extension, dev_scsi->tgpt_group)) {
+                                        retval = 1;
+                                        goto completed;
+                                } else  {
+                                        retval = 0;
+                                        goto completed;
+                                }
+                        }
+                        else {
+                                retval = 1;
+                                goto completed;
+                        }
+                } else  {
+                        retval = 0;
+                        goto completed;
+                }
+        } else if (page_code != 0x00) {
+                info(udev, "%s: unsupported page code 0x%d\n", dev_scsi->kernel, page_code);
+                return 1;
+        }
+
+        /*
+         * Get page 0, the page of the pages. By default, try from best to
+         * worst of supported pages: 0x83 then 0x80.
+         */
+        if (do_scsi_page0_inquiry(udev, dev_scsi, fd, page0, SCSI_INQ_BUFF_LEN)) {
+                /*
+                 * Don't try anything else. Black list if a specific page
+                 * should be used for this vendor+model, or maybe have an
+                 * optional fall-back to page 0x80 or page 0x83.
+                 */
+                retval = 1;
+                goto completed;
+        }
+
+        dbg(udev, "%s: Checking page0\n", dev_scsi->kernel);
+
+        for (ind = 4; ind <= page0[3] + 3; ind++)
+                if (page0[ind] == PAGE_83)
+                        if (!do_scsi_page83_inquiry(udev, dev_scsi, fd,
+                                                    dev_scsi->serial, dev_scsi->serial_short, len, dev_scsi->unit_serial_number, dev_scsi->wwn, dev_scsi->wwn_vendor_extension, dev_scsi->tgpt_group)) {
+                                /*
+                                 * Success
+                                 */
+                                retval = 0;
+                                goto completed;
+                        }
+
+        for (ind = 4; ind <= page0[3] + 3; ind++)
+                if (page0[ind] == PAGE_80)
+                        if (!do_scsi_page80_inquiry(udev, dev_scsi, fd,
+                                                    dev_scsi->serial, dev_scsi->serial_short, len)) {
+                                /*
+                                 * Success
+                                 */
+                                retval = 0;
+                                goto completed;
+                        }
+        retval = 1;
 
 completed:
-	close(fd);
-	return retval;
+        close(fd);
+        return retval;
 }
diff --git a/src/extras/udev-acl/udev-acl.c b/src/extras/udev-acl/udev-acl.c
index 41e2536e03..628cfbed4e 100644
--- a/src/extras/udev-acl/udev-acl.c
+++ b/src/extras/udev-acl/udev-acl.c
@@ -28,403 +28,403 @@
 static int debug;
 
 enum{
-	ACTION_NONE = 0,
-	ACTION_REMOVE,
-	ACTION_ADD,
-	ACTION_CHANGE
+        ACTION_NONE = 0,
+        ACTION_REMOVE,
+        ACTION_ADD,
+        ACTION_CHANGE
 };
 
 static int set_facl(const char* filename, uid_t uid, int add)
 {
-	int get;
-	acl_t acl;
-	acl_entry_t entry = NULL;
-	acl_entry_t e;
-	acl_permset_t permset;
-	int ret;
-
-	/* don't touch ACLs for root */
-	if (uid == 0)
-		return 0;
-
-	/* read current record */
-	acl = acl_get_file(filename, ACL_TYPE_ACCESS);
-	if (!acl)
-		return -1;
-
-	/* locate ACL_USER entry for uid */
-	get = acl_get_entry(acl, ACL_FIRST_ENTRY, &e);
-	while (get == 1) {
-		acl_tag_t t;
-
-		acl_get_tag_type(e, &t);
-		if (t == ACL_USER) {
-			uid_t *u;
-
-			u = (uid_t*)acl_get_qualifier(e);
-			if (u == NULL) {
-				ret = -1;
-				goto out;
-			}
-			if (*u == uid) {
-				entry = e;
-				acl_free(u);
-				break;
-			}
-			acl_free(u);
-		}
-
-		get = acl_get_entry(acl, ACL_NEXT_ENTRY, &e);
-	}
-
-	/* remove ACL_USER entry for uid */
-	if (!add) {
-		if (entry == NULL) {
-			ret = 0;
-			goto out;
-		}
-		acl_delete_entry(acl, entry);
-		goto update;
-	}
-
-	/* create ACL_USER entry for uid */
-	if (entry == NULL) {
-		ret = acl_create_entry(&acl, &entry);
-		if (ret != 0)
-			goto out;
-		acl_set_tag_type(entry, ACL_USER);
-		acl_set_qualifier(entry, &uid);
-	}
-
-	/* add permissions for uid */
-	acl_get_permset(entry, &permset);
-	acl_add_perm(permset, ACL_READ|ACL_WRITE);
+        int get;
+        acl_t acl;
+        acl_entry_t entry = NULL;
+        acl_entry_t e;
+        acl_permset_t permset;
+        int ret;
+
+        /* don't touch ACLs for root */
+        if (uid == 0)
+                return 0;
+
+        /* read current record */
+        acl = acl_get_file(filename, ACL_TYPE_ACCESS);
+        if (!acl)
+                return -1;
+
+        /* locate ACL_USER entry for uid */
+        get = acl_get_entry(acl, ACL_FIRST_ENTRY, &e);
+        while (get == 1) {
+                acl_tag_t t;
+
+                acl_get_tag_type(e, &t);
+                if (t == ACL_USER) {
+                        uid_t *u;
+
+                        u = (uid_t*)acl_get_qualifier(e);
+                        if (u == NULL) {
+                                ret = -1;
+                                goto out;
+                        }
+                        if (*u == uid) {
+                                entry = e;
+                                acl_free(u);
+                                break;
+                        }
+                        acl_free(u);
+                }
+
+                get = acl_get_entry(acl, ACL_NEXT_ENTRY, &e);
+        }
+
+        /* remove ACL_USER entry for uid */
+        if (!add) {
+                if (entry == NULL) {
+                        ret = 0;
+                        goto out;
+                }
+                acl_delete_entry(acl, entry);
+                goto update;
+        }
+
+        /* create ACL_USER entry for uid */
+        if (entry == NULL) {
+                ret = acl_create_entry(&acl, &entry);
+                if (ret != 0)
+                        goto out;
+                acl_set_tag_type(entry, ACL_USER);
+                acl_set_qualifier(entry, &uid);
+        }
+
+        /* add permissions for uid */
+        acl_get_permset(entry, &permset);
+        acl_add_perm(permset, ACL_READ|ACL_WRITE);
 update:
-	/* update record */
-	if (debug)
-		printf("%c%u %s\n", add ? '+' : '-', uid, filename);
-	acl_calc_mask(&acl);
-	ret = acl_set_file(filename, ACL_TYPE_ACCESS, acl);
-	if (ret != 0)
-		goto out;
+        /* update record */
+        if (debug)
+                printf("%c%u %s\n", add ? '+' : '-', uid, filename);
+        acl_calc_mask(&acl);
+        ret = acl_set_file(filename, ACL_TYPE_ACCESS, acl);
+        if (ret != 0)
+                goto out;
 out:
-	acl_free(acl);
-	return ret;
+        acl_free(acl);
+        return ret;
 }
 
 /* check if a given uid is listed */
 static int uid_in_list(GSList *list, uid_t uid)
 {
-	GSList *l;
+        GSList *l;
 
-	for (l = list; l != NULL; l = g_slist_next(l))
-		if (uid == GPOINTER_TO_UINT(l->data))
-			return 1;
-	return 0;
+        for (l = list; l != NULL; l = g_slist_next(l))
+                if (uid == GPOINTER_TO_UINT(l->data))
+                        return 1;
+        return 0;
 }
 
 /* return list of current uids of local active sessions */
 static GSList *uids_with_local_active_session(const char *own_id)
 {
-	GSList *list = NULL;
-	GKeyFile *keyfile;
-
-	keyfile = g_key_file_new();
-	if (g_key_file_load_from_file(keyfile, "/var/run/ConsoleKit/database", 0, NULL)) {
-		gchar **groups;
-
-		groups = g_key_file_get_groups(keyfile, NULL);
-		if (groups != NULL) {
-			int i;
-
-			for (i = 0; groups[i] != NULL; i++) {
-				uid_t u;
-
-				if (!g_str_has_prefix(groups[i], "Session "))
-					continue;
-				if (own_id != NULL &&g_str_has_suffix(groups[i], own_id))
-					continue;
-				if (!g_key_file_get_boolean(keyfile, groups[i], "is_local", NULL))
-					continue;
-				if (!g_key_file_get_boolean(keyfile, groups[i], "is_active", NULL))
-					continue;
-				u = g_key_file_get_integer(keyfile, groups[i], "uid", NULL);
-				if (u > 0 && !uid_in_list(list, u))
-					list = g_slist_prepend(list, GUINT_TO_POINTER(u));
-			}
-			g_strfreev(groups);
-		}
-	}
-	g_key_file_free(keyfile);
-
-	return list;
+        GSList *list = NULL;
+        GKeyFile *keyfile;
+
+        keyfile = g_key_file_new();
+        if (g_key_file_load_from_file(keyfile, "/var/run/ConsoleKit/database", 0, NULL)) {
+                gchar **groups;
+
+                groups = g_key_file_get_groups(keyfile, NULL);
+                if (groups != NULL) {
+                        int i;
+
+                        for (i = 0; groups[i] != NULL; i++) {
+                                uid_t u;
+
+                                if (!g_str_has_prefix(groups[i], "Session "))
+                                        continue;
+                                if (own_id != NULL &&g_str_has_suffix(groups[i], own_id))
+                                        continue;
+                                if (!g_key_file_get_boolean(keyfile, groups[i], "is_local", NULL))
+                                        continue;
+                                if (!g_key_file_get_boolean(keyfile, groups[i], "is_active", NULL))
+                                        continue;
+                                u = g_key_file_get_integer(keyfile, groups[i], "uid", NULL);
+                                if (u > 0 && !uid_in_list(list, u))
+                                        list = g_slist_prepend(list, GUINT_TO_POINTER(u));
+                        }
+                        g_strfreev(groups);
+                }
+        }
+        g_key_file_free(keyfile);
+
+        return list;
 }
 
 /* ConsoleKit calls us with special variables */
 static int consolekit_called(const char *ck_action, uid_t *uid, uid_t *uid2, const char **remove_session_id, int *action)
 {
-	int a = ACTION_NONE;
-	uid_t u = 0;
-	uid_t u2 = 0;
-	const char *s;
-	const char *s2;
-	const char *old_session = NULL;
-
-	if (ck_action == NULL || strcmp(ck_action, "seat_active_session_changed") != 0)
-		return -1;
-
-	/* We can have one of: remove, add, change, no-change */
-	s = getenv("CK_SEAT_OLD_SESSION_ID");
-	s2 = getenv("CK_SEAT_SESSION_ID");
-	if (s == NULL && s2 == NULL) {
-		return -1;
-	} else if (s2 == NULL) {
-		a = ACTION_REMOVE;
-	} else if (s == NULL) {
-		a = ACTION_ADD;
-	} else {
-		a = ACTION_CHANGE;
-	}
-
-	switch (a) {
-	case ACTION_ADD:
-		s = getenv("CK_SEAT_SESSION_USER_UID");
-		if (s == NULL)
-			return -1;
-		u = strtoul(s, NULL, 10);
-
-		s = getenv("CK_SEAT_SESSION_IS_LOCAL");
-		if (s == NULL)
-			return -1;
-		if (strcmp(s, "true") != 0)
-			return 0;
-
-		break;
-	case ACTION_REMOVE:
-		s = getenv("CK_SEAT_OLD_SESSION_USER_UID");
-		if (s == NULL)
-			return -1;
-		u = strtoul(s, NULL, 10);
-
-		s = getenv("CK_SEAT_OLD_SESSION_IS_LOCAL");
-		if (s == NULL)
-			return -1;
-		if (strcmp(s, "true") != 0)
-			return 0;
-
-		old_session = getenv("CK_SEAT_OLD_SESSION_ID");
-		if (old_session == NULL)
-			return -1;
-
-		break;
-	case ACTION_CHANGE:
-		s = getenv("CK_SEAT_OLD_SESSION_USER_UID");
-		if (s == NULL)
-			return -1;
-		u = strtoul(s, NULL, 10);
-		s = getenv("CK_SEAT_SESSION_USER_UID");
-		if (s == NULL)
-			return -1;
-		u2 = strtoul(s, NULL, 10);
-
-		s = getenv("CK_SEAT_OLD_SESSION_IS_LOCAL");
-		s2 = getenv("CK_SEAT_SESSION_IS_LOCAL");
-		if (s == NULL || s2 == NULL)
-			return -1;
-		/* don't process non-local session changes */
-		if (strcmp(s, "true") != 0 && strcmp(s2, "true") != 0)
-			return 0;
-
-		if (strcmp(s, "true") == 0 && strcmp(s, "true") == 0) {
-			/* process the change */
-			if (u == u2) {
-				/* special case: we noop if we are
-				 * changing between local sessions for
-				 * the same uid */
-				a = ACTION_NONE;
-			}
-			old_session = getenv("CK_SEAT_OLD_SESSION_ID");
-			if (old_session == NULL)
-				return -1;
-		} else if (strcmp(s, "true") == 0) {
-			/* only process the removal */
-			a = ACTION_REMOVE;
-			old_session = getenv("CK_SEAT_OLD_SESSION_ID");
-			if (old_session == NULL)
-				return -1;
-		} else if (strcmp(s2, "true") == 0) {
-			/* only process the addition */
-			a = ACTION_ADD;
-			u = u2;
-		}
-		break;
-	}
-
-	*remove_session_id = old_session;
-	*uid = u;
-	*uid2 = u2;
-	*action = a;
-	return 0;
+        int a = ACTION_NONE;
+        uid_t u = 0;
+        uid_t u2 = 0;
+        const char *s;
+        const char *s2;
+        const char *old_session = NULL;
+
+        if (ck_action == NULL || strcmp(ck_action, "seat_active_session_changed") != 0)
+                return -1;
+
+        /* We can have one of: remove, add, change, no-change */
+        s = getenv("CK_SEAT_OLD_SESSION_ID");
+        s2 = getenv("CK_SEAT_SESSION_ID");
+        if (s == NULL && s2 == NULL) {
+                return -1;
+        } else if (s2 == NULL) {
+                a = ACTION_REMOVE;
+        } else if (s == NULL) {
+                a = ACTION_ADD;
+        } else {
+                a = ACTION_CHANGE;
+        }
+
+        switch (a) {
+        case ACTION_ADD:
+                s = getenv("CK_SEAT_SESSION_USER_UID");
+                if (s == NULL)
+                        return -1;
+                u = strtoul(s, NULL, 10);
+
+                s = getenv("CK_SEAT_SESSION_IS_LOCAL");
+                if (s == NULL)
+                        return -1;
+                if (strcmp(s, "true") != 0)
+                        return 0;
+
+                break;
+        case ACTION_REMOVE:
+                s = getenv("CK_SEAT_OLD_SESSION_USER_UID");
+                if (s == NULL)
+                        return -1;
+                u = strtoul(s, NULL, 10);
+
+                s = getenv("CK_SEAT_OLD_SESSION_IS_LOCAL");
+                if (s == NULL)
+                        return -1;
+                if (strcmp(s, "true") != 0)
+                        return 0;
+
+                old_session = getenv("CK_SEAT_OLD_SESSION_ID");
+                if (old_session == NULL)
+                        return -1;
+
+                break;
+        case ACTION_CHANGE:
+                s = getenv("CK_SEAT_OLD_SESSION_USER_UID");
+                if (s == NULL)
+                        return -1;
+                u = strtoul(s, NULL, 10);
+                s = getenv("CK_SEAT_SESSION_USER_UID");
+                if (s == NULL)
+                        return -1;
+                u2 = strtoul(s, NULL, 10);
+
+                s = getenv("CK_SEAT_OLD_SESSION_IS_LOCAL");
+                s2 = getenv("CK_SEAT_SESSION_IS_LOCAL");
+                if (s == NULL || s2 == NULL)
+                        return -1;
+                /* don't process non-local session changes */
+                if (strcmp(s, "true") != 0 && strcmp(s2, "true") != 0)
+                        return 0;
+
+                if (strcmp(s, "true") == 0 && strcmp(s, "true") == 0) {
+                        /* process the change */
+                        if (u == u2) {
+                                /* special case: we noop if we are
+                                 * changing between local sessions for
+                                 * the same uid */
+                                a = ACTION_NONE;
+                        }
+                        old_session = getenv("CK_SEAT_OLD_SESSION_ID");
+                        if (old_session == NULL)
+                                return -1;
+                } else if (strcmp(s, "true") == 0) {
+                        /* only process the removal */
+                        a = ACTION_REMOVE;
+                        old_session = getenv("CK_SEAT_OLD_SESSION_ID");
+                        if (old_session == NULL)
+                                return -1;
+                } else if (strcmp(s2, "true") == 0) {
+                        /* only process the addition */
+                        a = ACTION_ADD;
+                        u = u2;
+                }
+                break;
+        }
+
+        *remove_session_id = old_session;
+        *uid = u;
+        *uid2 = u2;
+        *action = a;
+        return 0;
 }
 
 /* add or remove a ACL for a given uid from all matching devices */
 static void apply_acl_to_devices(uid_t uid, int add)
 {
-	struct udev *udev;
-	struct udev_enumerate *enumerate;
-	struct udev_list_entry *list_entry;
-
-	/* iterate over all devices tagged with ACL_SET */
-	udev = udev_new();
-	enumerate = udev_enumerate_new(udev);
-	udev_enumerate_add_match_tag(enumerate, "udev-acl");
-	udev_enumerate_scan_devices(enumerate);
-	udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(enumerate)) {
-		struct udev_device *device;
-		const char *node;
-
-		device = udev_device_new_from_syspath(udev_enumerate_get_udev(enumerate),
-						      udev_list_entry_get_name(list_entry));
-		if (device == NULL)
-			continue;
-		node = udev_device_get_devnode(device);
-		if (node == NULL) {
-			udev_device_unref(device);
-			continue;
-		}
-		set_facl(node, uid, add);
-		udev_device_unref(device);
-	}
-	udev_enumerate_unref(enumerate);
-	udev_unref(udev);
+        struct udev *udev;
+        struct udev_enumerate *enumerate;
+        struct udev_list_entry *list_entry;
+
+        /* iterate over all devices tagged with ACL_SET */
+        udev = udev_new();
+        enumerate = udev_enumerate_new(udev);
+        udev_enumerate_add_match_tag(enumerate, "udev-acl");
+        udev_enumerate_scan_devices(enumerate);
+        udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(enumerate)) {
+                struct udev_device *device;
+                const char *node;
+
+                device = udev_device_new_from_syspath(udev_enumerate_get_udev(enumerate),
+                                                      udev_list_entry_get_name(list_entry));
+                if (device == NULL)
+                        continue;
+                node = udev_device_get_devnode(device);
+                if (node == NULL) {
+                        udev_device_unref(device);
+                        continue;
+                }
+                set_facl(node, uid, add);
+                udev_device_unref(device);
+        }
+        udev_enumerate_unref(enumerate);
+        udev_unref(udev);
 }
 
 static void
 remove_uid (uid_t uid, const char *remove_session_id)
 {
-	/*
-	 * Remove ACL for given uid from all matching devices
-	 * when there is currently no local active session.
-	 */
-	GSList *list;
-
-	list = uids_with_local_active_session(remove_session_id);
-	if (!uid_in_list(list, uid))
-		apply_acl_to_devices(uid, 0);
-	g_slist_free(list);
+        /*
+         * Remove ACL for given uid from all matching devices
+         * when there is currently no local active session.
+         */
+        GSList *list;
+
+        list = uids_with_local_active_session(remove_session_id);
+        if (!uid_in_list(list, uid))
+                apply_acl_to_devices(uid, 0);
+        g_slist_free(list);
 }
 
 int main (int argc, char* argv[])
 {
-	static const struct option options[] = {
-		{ "action", required_argument, NULL, 'a' },
-		{ "device", required_argument, NULL, 'D' },
-		{ "user", required_argument, NULL, 'u' },
-		{ "debug", no_argument, NULL, 'd' },
-		{ "help", no_argument, NULL, 'h' },
-		{}
-	};
-	int action = -1;
-	const char *device = NULL;
-	bool uid_given = false;
-	uid_t uid = 0;
-	uid_t uid2 = 0;
-	const char* remove_session_id = NULL;
-	int rc = 0;
-
-	/* valgrind is more important to us than a slice allocator */
-	g_slice_set_config (G_SLICE_CONFIG_ALWAYS_MALLOC, 1);
-
-	while (1) {
-		int option;
-
-		option = getopt_long(argc, argv, "+a:D:u:dh", options, NULL);
-		if (option == -1)
-			break;
-
-		switch (option) {
-		case 'a':
-			if (strcmp(optarg, "remove") == 0)
-				action = ACTION_REMOVE;
-			else
-				action = ACTION_ADD;
-			break;
-		case 'D':
-			device = optarg;
-			break;
-		case 'u':
-			uid_given = true;
-			uid = strtoul(optarg, NULL, 10);
-			break;
-		case 'd':
-			debug = 1;
-			break;
-		case 'h':
-			printf("Usage: udev-acl --action=ACTION [--device=DEVICEFILE] [--user=UID]\n\n");
-			goto out;
-		}
-	}
-
-	if (action < 0 && device == NULL && !uid_given)
-		if (!consolekit_called(argv[optind], &uid, &uid2, &remove_session_id, &action))
-			uid_given = true;
-
-	if (action < 0) {
-		fprintf(stderr, "missing action\n\n");
-		rc = 2;
-		goto out;
-	}
-
-	if (device != NULL && uid_given) {
-		fprintf(stderr, "only one option, --device=DEVICEFILE or --user=UID expected\n\n");
-		rc = 3;
-		goto out;
-	}
-
-	if (uid_given) {
-		switch (action) {
-		case ACTION_ADD:
-			/* Add ACL for given uid to all matching devices. */
-			apply_acl_to_devices(uid, 1);
-			break;
-		case ACTION_REMOVE:
-			remove_uid(uid, remove_session_id);
-			break;
-		case ACTION_CHANGE:
-			remove_uid(uid, remove_session_id);
-			apply_acl_to_devices(uid2, 1);
-			break;
-		case ACTION_NONE:
-			goto out;
-			break;
-		default:
-			g_assert_not_reached();
-			break;
-		}
-	} else if (device != NULL) {
-		/*
-		 * Add ACLs for all current session uids to a given device.
-		 *
-		 * Or remove ACLs for uids which do not have any current local
-		 * active session. Remove is not really interesting, because in
-		 * most cases the device node is removed anyway.
-		 */
-		GSList *list;
-		GSList *l;
-
-		list = uids_with_local_active_session(NULL);
-		for (l = list; l != NULL; l = g_slist_next(l)) {
-			uid_t u;
-
-			u = GPOINTER_TO_UINT(l->data);
-			if (action == ACTION_ADD || !uid_in_list(list, u))
-				set_facl(device, u, action == ACTION_ADD);
-		}
-		g_slist_free(list);
-	} else {
-		fprintf(stderr, "--device=DEVICEFILE or --user=UID expected\n\n");
-		rc = 3;
-	}
+        static const struct option options[] = {
+                { "action", required_argument, NULL, 'a' },
+                { "device", required_argument, NULL, 'D' },
+                { "user", required_argument, NULL, 'u' },
+                { "debug", no_argument, NULL, 'd' },
+                { "help", no_argument, NULL, 'h' },
+                {}
+        };
+        int action = -1;
+        const char *device = NULL;
+        bool uid_given = false;
+        uid_t uid = 0;
+        uid_t uid2 = 0;
+        const char* remove_session_id = NULL;
+        int rc = 0;
+
+        /* valgrind is more important to us than a slice allocator */
+        g_slice_set_config (G_SLICE_CONFIG_ALWAYS_MALLOC, 1);
+
+        while (1) {
+                int option;
+
+                option = getopt_long(argc, argv, "+a:D:u:dh", options, NULL);
+                if (option == -1)
+                        break;
+
+                switch (option) {
+                case 'a':
+                        if (strcmp(optarg, "remove") == 0)
+                                action = ACTION_REMOVE;
+                        else
+                                action = ACTION_ADD;
+                        break;
+                case 'D':
+                        device = optarg;
+                        break;
+                case 'u':
+                        uid_given = true;
+                        uid = strtoul(optarg, NULL, 10);
+                        break;
+                case 'd':
+                        debug = 1;
+                        break;
+                case 'h':
+                        printf("Usage: udev-acl --action=ACTION [--device=DEVICEFILE] [--user=UID]\n\n");
+                        goto out;
+                }
+        }
+
+        if (action < 0 && device == NULL && !uid_given)
+                if (!consolekit_called(argv[optind], &uid, &uid2, &remove_session_id, &action))
+                        uid_given = true;
+
+        if (action < 0) {
+                fprintf(stderr, "missing action\n\n");
+                rc = 2;
+                goto out;
+        }
+
+        if (device != NULL && uid_given) {
+                fprintf(stderr, "only one option, --device=DEVICEFILE or --user=UID expected\n\n");
+                rc = 3;
+                goto out;
+        }
+
+        if (uid_given) {
+                switch (action) {
+                case ACTION_ADD:
+                        /* Add ACL for given uid to all matching devices. */
+                        apply_acl_to_devices(uid, 1);
+                        break;
+                case ACTION_REMOVE:
+                        remove_uid(uid, remove_session_id);
+                        break;
+                case ACTION_CHANGE:
+                        remove_uid(uid, remove_session_id);
+                        apply_acl_to_devices(uid2, 1);
+                        break;
+                case ACTION_NONE:
+                        goto out;
+                        break;
+                default:
+                        g_assert_not_reached();
+                        break;
+                }
+        } else if (device != NULL) {
+                /*
+                 * Add ACLs for all current session uids to a given device.
+                 *
+                 * Or remove ACLs for uids which do not have any current local
+                 * active session. Remove is not really interesting, because in
+                 * most cases the device node is removed anyway.
+                 */
+                GSList *list;
+                GSList *l;
+
+                list = uids_with_local_active_session(NULL);
+                for (l = list; l != NULL; l = g_slist_next(l)) {
+                        uid_t u;
+
+                        u = GPOINTER_TO_UINT(l->data);
+                        if (action == ACTION_ADD || !uid_in_list(list, u))
+                                set_facl(device, u, action == ACTION_ADD);
+                }
+                g_slist_free(list);
+        } else {
+                fprintf(stderr, "--device=DEVICEFILE or --user=UID expected\n\n");
+                rc = 3;
+        }
 out:
-	return rc;
+        return rc;
 }
diff --git a/src/extras/v4l_id/v4l_id.c b/src/extras/v4l_id/v4l_id.c
index 21cb3285ad..a2a80b5f43 100644
--- a/src/extras/v4l_id/v4l_id.c
+++ b/src/extras/v4l_id/v4l_id.c
@@ -32,56 +32,56 @@
 
 int main (int argc, char *argv[])
 {
-	static const struct option options[] = {
-		{ "help", no_argument, NULL, 'h' },
-		{}
-	};
-	int fd;
-	char *device;
-	struct v4l2_capability v2cap;
+        static const struct option options[] = {
+                { "help", no_argument, NULL, 'h' },
+                {}
+        };
+        int fd;
+        char *device;
+        struct v4l2_capability v2cap;
 
-	while (1) {
-		int option;
+        while (1) {
+                int option;
 
-		option = getopt_long(argc, argv, "h", options, NULL);
-		if (option == -1)
-			break;
+                option = getopt_long(argc, argv, "h", options, NULL);
+                if (option == -1)
+                        break;
 
-		switch (option) {
-		case 'h':
-			printf("Usage: v4l_id [--help] <device file>\n\n");
-			return 0;
-		default:
-			return 1;
-		}
-	}
-	device = argv[optind];
+                switch (option) {
+                case 'h':
+                        printf("Usage: v4l_id [--help] <device file>\n\n");
+                        return 0;
+                default:
+                        return 1;
+                }
+        }
+        device = argv[optind];
 
-	if (device == NULL)
-		return 2;
-	fd = open (device, O_RDONLY);
-	if (fd < 0)
-		return 3;
+        if (device == NULL)
+                return 2;
+        fd = open (device, O_RDONLY);
+        if (fd < 0)
+                return 3;
 
-	if (ioctl (fd, VIDIOC_QUERYCAP, &v2cap) == 0) {
-		printf("ID_V4L_VERSION=2\n");
-		printf("ID_V4L_PRODUCT=%s\n", v2cap.card);
-		printf("ID_V4L_CAPABILITIES=:");
-		if ((v2cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0)
-			printf("capture:");
-		if ((v2cap.capabilities & V4L2_CAP_VIDEO_OUTPUT) > 0)
-			printf("video_output:");
-		if ((v2cap.capabilities & V4L2_CAP_VIDEO_OVERLAY) > 0)
-			printf("video_overlay:");
-		if ((v2cap.capabilities & V4L2_CAP_AUDIO) > 0)
-			printf("audio:");
-		if ((v2cap.capabilities & V4L2_CAP_TUNER) > 0)
-			printf("tuner:");
-		if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0)
-			printf("radio:");
-		printf("\n");
-	}
+        if (ioctl (fd, VIDIOC_QUERYCAP, &v2cap) == 0) {
+                printf("ID_V4L_VERSION=2\n");
+                printf("ID_V4L_PRODUCT=%s\n", v2cap.card);
+                printf("ID_V4L_CAPABILITIES=:");
+                if ((v2cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0)
+                        printf("capture:");
+                if ((v2cap.capabilities & V4L2_CAP_VIDEO_OUTPUT) > 0)
+                        printf("video_output:");
+                if ((v2cap.capabilities & V4L2_CAP_VIDEO_OVERLAY) > 0)
+                        printf("video_overlay:");
+                if ((v2cap.capabilities & V4L2_CAP_AUDIO) > 0)
+                        printf("audio:");
+                if ((v2cap.capabilities & V4L2_CAP_TUNER) > 0)
+                        printf("tuner:");
+                if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0)
+                        printf("radio:");
+                printf("\n");
+        }
 
-	close (fd);
-	return 0;
+        close (fd);
+        return 0;
 }