diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2010-05-19 08:58:23 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:43:05 +0200 |
commit | b76270bf9e6dd375e495fec92140a79a79415d27 (patch) | |
tree | 3dbed78b2279bf9f14207a16dc634b90995cbd40 /source/l/hal/patches/check_udi_properly.diff | |
parent | 5a12e7c134274dba706667107d10d231517d3e05 (diff) | |
download | current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.gz |
Slackware 13.1slackware-13.1
Wed May 19 08:58:23 UTC 2010
Slackware 13.1 x86_64 stable is released!
Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
ChangeLog for credits. The ISOs are on their way to replication,
a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We are taking pre-orders now at store.slackware.com, and offering
a discount if you sign up for a subscription. Consider picking up
a copy to help support the project. Thanks again to the Slackware
community for testing, contributing, and generally holding us to a
high level of quality. :-)
Enjoy!
Diffstat (limited to 'source/l/hal/patches/check_udi_properly.diff')
-rw-r--r-- | source/l/hal/patches/check_udi_properly.diff | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/source/l/hal/patches/check_udi_properly.diff b/source/l/hal/patches/check_udi_properly.diff deleted file mode 100644 index cd474abc..00000000 --- a/source/l/hal/patches/check_udi_properly.diff +++ /dev/null @@ -1,41 +0,0 @@ -Author: Richard Hughes <richard@hughsie.com> -Date: Thu Jan 29 08:33:00 2009 +0000 - - check udi in hal-get-property - - We are not checking if a UDI is valid in hal-get-property - which means getting a horrible DBUS error if the entry - is not a valid DBUS path. - -diff --git a/tools/hal_get_property.c b/tools/hal_get_property.c -index ecaa6ce..d31261a 100644 ---- a/tools/hal_get_property.c -+++ b/tools/hal_get_property.c -@@ -84,6 +84,7 @@ main (int argc, char *argv[]) - dbus_bool_t is_hex = FALSE; - dbus_bool_t is_verbose = FALSE; - dbus_bool_t is_version = FALSE; -+ dbus_bool_t udi_exists; - char *str; - DBusError error; - -@@ -168,6 +169,19 @@ main (int argc, char *argv[]) - return 1; - } - -+ /* check UDI exists */ -+ udi_exists = libhal_device_exists (hal_ctx, udi, &error); -+ if (!udi_exists) { -+ fprintf (stderr, "error: UDI %s does not exist\n", udi); -+ return 1; -+ } -+ if (dbus_error_is_set(&error)) { -+ fprintf (stderr, "error: libhal_device_exists: %s: %s\n", error.name, error.message); -+ LIBHAL_FREE_DBUS_ERROR (&error); -+ return 1; -+ } -+ -+ /* get type */ - type = libhal_device_get_property_type (hal_ctx, udi, key, &error); - if (type == LIBHAL_PROPERTY_TYPE_INVALID) { - fprintf (stderr, "error: libhal_device_get_property_type: %s: %s\n", error.name, error.message); |