mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-21 23:18:00 -08:00
Code

Map ucom unit number to cuaU number using the same

Browse Source 
scheme as MAKEDEV uses.

Fixes problems with ucom units > 10.

Problem noted by, fix tested and ok sthen@
This commit is contained in:
krw 2024-10-24 22:42:08 +00:00
parent 6be8eaa4ae
commit a096f1257b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/cu/cu.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: cu.c,v 1.31 2024/02/10 15:29:04 deraadt Exp $ */
/* $OpenBSD: cu.c,v 1.32 2024/10/24 22:42:08 krw Exp $ */
/*
* Copyright (c) 2012 Nicholas Marriott <nicm@openbsd.org>
@ -502,11 +502,17 @@ get_ucomnames(void)
char *
find_ucom(const char *usbid, char *names)
{
const char *errstr;
const char *U;
char *cua, *id, *ucom;
uint32_t unit;
if (names == NULL)
return NULL;
/* The mapping of ucom[NN] to cuaU[C] is defined in MAKEDEV. */
U ="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
/* names is a comma separated list of "ucom<unit#>:<usb id>". */
cua = NULL;
for (ucom = strsep(&names, ","); ucom; ucom = strsep(&names, ",")) {
@ -518,7 +524,10 @@ find_ucom(const char *usbid, char *names)
continue;
*id++ = '\0';
if (strcasecmp(id, usbid) == 0) {
if (asprintf(&cua, "cuaU%s", ucom) == -1)
unit = strtonum(ucom, 0, strlen(U) - 1, &errstr);
if (errstr != NULL)
continue;
if (asprintf(&cua, "cuaU%c", U[unit]) == -1)
err(1, NULL);
break;
}