Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify CD device name matching by using fnmatch(3), suggested 

by Christoph Badura.
This commit is contained in:
martin 2018-11-08 11:15:58 +00:00
parent 889230a78b
commit 4bb5c5376d
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
usr.sbin/sysinst/disks.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disks.c,v 1.19 2018/11/07 21:59:30 martin Exp $ */ /* $NetBSD: disks.c,v 1.20 2018/11/08 11:15:58 martin Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -41,6 +41,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <fnmatch.h>
#include <util.h> #include <util.h>
#include <uuid.h> #include <uuid.h>
@ -509,29 +510,10 @@ static bool
is_cdrom_device(const char *dev) is_cdrom_device(const char *dev)
{ {
static const char *cdrom_devices[] = { CD_NAMES, 0 }; static const char *cdrom_devices[] = { CD_NAMES, 0 };
char pat[SSTRSIZE], comp[SSTRSIZE], *star, *p;
const char **dev_pat;
/* trim device number off */ for (const char **dev_pat = cdrom_devices; *dev_pat; dev_pat++)
strcpy(comp, dev); if (fnmatch(*dev_pat, dev, 0) == 0)
for (p = comp + strlen(comp) - 1; p != comp; p--) return true;
if (!isdigit((unsigned char)*p))
break;
if (p != comp)
p[1] = 0;
for (dev_pat = cdrom_devices; *dev_pat; dev_pat++) {
strcpy(pat, *dev_pat);
star = strchr(pat, '*');
if (star) {
*star = 0;
if (strcmp(comp, pat) == 0)
return true;
} else {
if (strcmp(dev, pat) == 0)
return true;
}
}
return false; return false;
} }