chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build argv[] for builtin commands
[elogind.git]
/
udev
/
udev-builtin-usb_id.c
diff --git
a/udev/udev-builtin-usb_id.c
b/udev/udev-builtin-usb_id.c
index 1585b107a07fdea017d2464c37fa247891f9e8cb..21c3c03d8ace0b67447e422f119a7d7e433a5558 100644
(file)
--- a/
udev/udev-builtin-usb_id.c
+++ b/
udev/udev-builtin-usb_id.c
@@
-239,7
+239,7
@@
out:
* 6.) If the device supplies a serial number, this number
* is concatenated with the identification with an underscore '_'.
*/
* 6.) If the device supplies a serial number, this number
* is concatenated with the identification with an underscore '_'.
*/
-static int builtin_usb_id(struct udev_device *dev, bool test)
+static int builtin_usb_id(struct udev_device *dev,
int argc, char *argv[],
bool test)
{
char vendor_str[64];
char vendor_str_enc[256];
{
char vendor_str[64];
char vendor_str_enc[256];
@@
-350,8
+350,8
@@
static int builtin_usb_id(struct udev_device *dev, bool test)
goto fallback;
}
udev_util_encode_string(scsi_vendor, vendor_str_enc, sizeof(vendor_str_enc));
goto fallback;
}
udev_util_encode_string(scsi_vendor, vendor_str_enc, sizeof(vendor_str_enc));
- u
dev_u
til_replace_whitespace(scsi_vendor, vendor_str, sizeof(vendor_str)-1);
- u
dev_u
til_replace_chars(vendor_str, NULL);
+ util_replace_whitespace(scsi_vendor, vendor_str, sizeof(vendor_str)-1);
+ util_replace_chars(vendor_str, NULL);
scsi_model = udev_device_get_sysattr_value(dev_scsi, "model");
if (!scsi_model) {
scsi_model = udev_device_get_sysattr_value(dev_scsi, "model");
if (!scsi_model) {
@@
-360,8
+360,8
@@
static int builtin_usb_id(struct udev_device *dev, bool test)
goto fallback;
}
udev_util_encode_string(scsi_model, model_str_enc, sizeof(model_str_enc));
goto fallback;
}
udev_util_encode_string(scsi_model, model_str_enc, sizeof(model_str_enc));
- u
dev_u
til_replace_whitespace(scsi_model, model_str, sizeof(model_str)-1);
- u
dev_u
til_replace_chars(model_str, NULL);
+ util_replace_whitespace(scsi_model, model_str, sizeof(model_str)-1);
+ util_replace_chars(model_str, NULL);
scsi_type = udev_device_get_sysattr_value(dev_scsi, "type");
if (!scsi_type) {
scsi_type = udev_device_get_sysattr_value(dev_scsi, "type");
if (!scsi_type) {
@@
-377,8
+377,8
@@
static int builtin_usb_id(struct udev_device *dev, bool test)
udev_device_get_sysname(dev_scsi));
goto fallback;
}
udev_device_get_sysname(dev_scsi));
goto fallback;
}
- u
dev_u
til_replace_whitespace(scsi_rev, revision_str, sizeof(revision_str)-1);
- u
dev_u
til_replace_chars(revision_str, NULL);
+ util_replace_whitespace(scsi_rev, revision_str, sizeof(revision_str)-1);
+ util_replace_chars(revision_str, NULL);
/*
* some broken devices have the same identifiers
/*
* some broken devices have the same identifiers
@@
-403,8
+403,8
@@
fallback:
return EXIT_FAILURE;
}
udev_util_encode_string(usb_vendor, vendor_str_enc, sizeof(vendor_str_enc));
return EXIT_FAILURE;
}
udev_util_encode_string(usb_vendor, vendor_str_enc, sizeof(vendor_str_enc));
- u
dev_u
til_replace_whitespace(usb_vendor, vendor_str, sizeof(vendor_str)-1);
- u
dev_u
til_replace_chars(vendor_str, NULL);
+ util_replace_whitespace(usb_vendor, vendor_str, sizeof(vendor_str)-1);
+ util_replace_chars(vendor_str, NULL);
}
if (model_str[0] == '\0') {
}
if (model_str[0] == '\0') {
@@
-418,8
+418,8
@@
fallback:
return EXIT_FAILURE;
}
udev_util_encode_string(usb_model, model_str_enc, sizeof(model_str_enc));
return EXIT_FAILURE;
}
udev_util_encode_string(usb_model, model_str_enc, sizeof(model_str_enc));
- u
dev_u
til_replace_whitespace(usb_model, model_str, sizeof(model_str)-1);
- u
dev_u
til_replace_chars(model_str, NULL);
+ util_replace_whitespace(usb_model, model_str, sizeof(model_str)-1);
+ util_replace_chars(model_str, NULL);
}
if (revision_str[0] == '\0') {
}
if (revision_str[0] == '\0') {
@@
-427,8
+427,8
@@
fallback:
usb_rev = udev_device_get_sysattr_value(dev_usb, "bcdDevice");
if (usb_rev) {
usb_rev = udev_device_get_sysattr_value(dev_usb, "bcdDevice");
if (usb_rev) {
- u
dev_u
til_replace_whitespace(usb_rev, revision_str, sizeof(revision_str)-1);
- u
dev_u
til_replace_chars(revision_str, NULL);
+ util_replace_whitespace(usb_rev, revision_str, sizeof(revision_str)-1);
+ util_replace_chars(revision_str, NULL);
}
}
}
}
@@
-437,8
+437,8
@@
fallback:
usb_serial = udev_device_get_sysattr_value(dev_usb, "serial");
if (usb_serial) {
usb_serial = udev_device_get_sysattr_value(dev_usb, "serial");
if (usb_serial) {
- u
dev_u
til_replace_whitespace(usb_serial, serial_str, sizeof(serial_str)-1);
- u
dev_u
til_replace_chars(serial_str, NULL);
+ util_replace_whitespace(usb_serial, serial_str, sizeof(serial_str)-1);
+ util_replace_chars(serial_str, NULL);
}
}
}
}
@@
-478,4
+478,5
@@
const struct udev_builtin udev_builtin_usb_id = {
.name = "usb_id",
.cmd = builtin_usb_id,
.help = "usb device properties",
.name = "usb_id",
.cmd = builtin_usb_id,
.help = "usb device properties",
+ .run_once = true,
};
};