Skip to content

Commit

Permalink
Update to latest main
Browse files Browse the repository at this point in the history
Merge commit 'a93798f6870e13bf61305b45a414899263cabb3c'
  • Loading branch information
Youw committed Feb 15, 2024
2 parents 78fdcad + a93798f commit 8782527
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions libusb/libusb/os/sunos_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,24 +86,24 @@ static int sunos_get_link(di_devlink_t devlink, void *arg)
const char *p;
const char *q;

if (larg->path) {
if (link_arg->path) {
char *content = (char *)di_devlink_content(devlink);
char *start = strstr(content, "/devices/");
start += strlen("/devices");
usbi_dbg(NULL, "%s", start);

/* line content must have minor node */
if (start == NULL ||
strncmp(start, larg->path, larg->len) != 0 ||
start[larg->len] != ':')
strncmp(start, link_arg->path, link_arg->len) != 0 ||
start[link_arg->len] != ':')
return (DI_WALK_CONTINUE);
}

p = di_devlink_path(devlink);
q = strrchr(p, '/');
usbi_dbg(NULL, "%s", q);

*(larg->linkpp) = strndup(p, strlen(p) - strlen(q));
*(link_arg->linkpp) = strndup(p, strlen(p) - strlen(q));

return (DI_WALK_TERMINATE);
}
Expand Down
2 changes: 1 addition & 1 deletion libusb/libusb/version_nano.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define LIBUSB_NANO 11882
#define LIBUSB_NANO 11883

0 comments on commit 8782527

Please sign in to comment.