diff options
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/devfsd.c | 6 | ||||
| -rw-r--r-- | miscutils/hdparm.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 1dfbadf83..49eee9be4 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c @@ -689,9 +689,9 @@ static void service_name(const struct devfsd_notify_struct *info) msg_logger(LOG_ERR, "lost %u events", info->overrun_count); /* Discard lookups on "/dev/log" and "/dev/initctl" */ - if (info->type == DEVFSD_NOTIFY_LOOKUP + if (info->type == DEVFSD_NOTIFY_LOOKUP && ((info->devname[0] == 'l' && info->devname[1] == 'o' - && info->devname[2] == 'g' && !info->devname[3]) + && info->devname[2] == 'g' && !info->devname[3]) || (info->devname[0] == 'i' && info->devname[1] == 'n' && info->devname[2] == 'i' && info->devname[3] == 't' && info->devname[4] == 'c' && info->devname[5] == 't' @@ -701,7 +701,7 @@ static void service_name(const struct devfsd_notify_struct *info) for (entry = first_config; entry != NULL; entry = entry->next) { /* First check if action matches the type, then check if name matches */ - if (info->type != entry->action.when + if (info->type != entry->action.when || regexec(&entry->preg, info->devname, MAX_SUBEXPR, mbuf, 0) != 0) continue; for (n = 0;(n < MAX_SUBEXPR) && (mbuf[n].rm_so != -1); ++n) diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 5c7d1f60c..98cc04fd3 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c @@ -1831,7 +1831,7 @@ static void process_dev(char *devname) } else if (errno == -ENOMSG) printf(" no identification info available\n"); else if (ENABLE_IOCTL_HEX2STR_ERROR) /* To be coherent with ioctl_or_warn */ - bb_perror_msg("HDIO_GET_IDENTITY"); + bb_perror_msg("HDIO_GET_IDENTITY"); else bb_perror_msg("ioctl %#x failed", HDIO_GET_IDENTITY); } |