1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00

Fix the processing of devd messages so that the new -CURRENT format is

properly understood.

Submitted by:	Gustau Pérez gpere@entel.upc.edu (based on)
This commit is contained in:
Joe Marcus Clarke 2011-02-26 18:07:19 +00:00
parent 80799940e7
commit 5b3183ba11
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=269829
2 changed files with 21 additions and 3 deletions

View File

@ -8,7 +8,7 @@
PORTNAME= hal
DISTVERSION= 0.5.14
PORTREVISION= 12
PORTREVISION= 13
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/

View File

@ -1,5 +1,23 @@
--- hald/freebsd/hf-devd.c.orig 2011-01-08 12:59:30.000000000 -0500
+++ hald/freebsd/hf-devd.c 2011-01-08 13:04:46.000000000 -0500
--- hald/freebsd/hf-devd.c.orig 2009-08-24 08:42:29.000000000 -0400
+++ hald/freebsd/hf-devd.c 2011-02-26 13:03:00.000000000 -0500
@@ -122,7 +122,7 @@ hf_devd_parse_add_remove (const char *ev
g_return_val_if_fail(parent != NULL, FALSE);
if ((params_ptr = strchr(event, ' '))
- && (at_ptr = strstr(params_ptr + 1, " at "))
+ && (at_ptr = strstr(params_ptr, "at "))
&& (parent_ptr = strstr(at_ptr + 4, " on ")))
{
char *params_str;
@@ -130,7 +130,7 @@ hf_devd_parse_add_remove (const char *ev
*name = g_strndup(event, params_ptr - event);
params_str = g_strndup(params_ptr + 1, at_ptr - params_ptr - 1);
- at_str = g_strndup(at_ptr + 4, parent_ptr - at_ptr - 4);
+ at_str = g_strndup(at_ptr + 3, parent_ptr - at_ptr - 3);
*parent = g_strdup(parent_ptr + 4);
if (! strcmp(*parent, ".")) /* sys/kern/subr_bus.c */
@@ -398,7 +398,7 @@ hf_devd_event_cb (GIOChannel *source, GI
hf_devd_process_event(event);
g_free(event);