7 files changed, 17 insertions, 19 deletions

diff --git a/miscutils/crond.c b/miscutils/crond.c
index 3659b9a6f..eb327f855 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -438,14 +438,14 @@ static void load_crontab(const char *fileName)
                         log5("user:%s entry:%s", fileName, parser->data);
 
                         /* check if line is setting MAILTO= */
-                        if (0 == strncmp(tokens[0], "MAILTO=", 7)) {
+                        if (is_prefixed_with(tokens[0], "MAILTO=")) {
 #if ENABLE_FEATURE_CROND_CALL_SENDMAIL
                                 free(mailTo);
                                 mailTo = (tokens[0][7]) ? xstrdup(&tokens[0][7]) : NULL;
 #endif /* otherwise just ignore such lines */
                                 continue;
                         }
-                        if (0 == strncmp(tokens[0], "SHELL=", 6)) {
+                        if (is_prefixed_with(tokens[0], "SHELL=")) {
                                 free(shell);
                                 shell = xstrdup(&tokens[0][6]);
                                 continue;
diff --git a/miscutils/dc.c b/miscutils/dc.c
index a7bd360d2..f94d6fa6b 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -244,9 +244,9 @@ static void stack_machine(const char *argument)
 
         o = operators;
         do {
-                const size_t name_len = strlen(o->name);
-                if (strncmp(o->name, argument, name_len) == 0) {
-                        argument += name_len;
+                char *after_name = is_prefixed_with(argument, o->name);
+                if (after_name) {
+                        argument = after_name;
                         o->function();
                         goto next;
                 }
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 96ffe0738..5a6aec6bd 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -1405,7 +1405,6 @@ const char *get_old_name(const char *devname, unsigned int namelen,
         int indexx;
         const char *pty1;
         const char *pty2;
-        size_t len;
         /* 1 to 5  "scsi/" , 6 to 9 "ide/host", 10 sbp/, 11 vcc/, 12 pty/ */
         static const char *const fmt[] = {
                 NULL ,
@@ -1425,12 +1424,11 @@ const char *get_old_name(const char *devname, unsigned int namelen,
         };
 
         for (trans = translate_table; trans->match != NULL; ++trans) {
-                len = strlen(trans->match);
-
-                if (strncmp(devname, trans->match, len) == 0) {
+                char *after_match = is_prefixed_with(devname, trans->match);
+                if (after_match) {
                         if (trans->format == NULL)
-                                return devname + len;
-                        sprintf(buffer, trans->format, devname + len);
+                                return after_match;
+                        sprintf(buffer, trans->format, after_match);
                         return buffer;
                 }
         }
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 7b695b26f..77033c258 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -516,7 +516,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
         // handle a case when we have many buffered lines
         // already in the pipe
         while ((num_buf = xmalloc_fgetline(fp)) != NULL) {
-                if (strncmp(num_buf, "exit", 4) == 0) {
+                if (is_prefixed_with(num_buf, "exit")) {
                         DEBUG_MESSAGE("exit");
                         break;
                 }
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index 90d1e1e14..03bb03974 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -1198,7 +1198,7 @@ static void NORETURN list_i2c_busses_and_exit(void)
                                 if (subde->d_name[0] == '.')
                                         continue;
 
-                                if (strncmp(subde->d_name, "i2c-", 4) == 0) {
+                                if (is_prefixed_with(subde->d_name, "i2c-")) {
                                         snprintf(path, NAME_MAX,
                                                  "%s/%s/device/%s/name",
                                                  i2cdev_path, de->d_name,
@@ -1229,7 +1229,7 @@ found:
                         if (rv != 1)
                                 continue;
 
-                        if (strncmp(name, "ISA", 3) == 0)
+                        if (is_prefixed_with(name, "ISA"))
                                 adt = ADT_ISA;
                         else
                                 adt = i2cdetect_get_funcs(bus);
diff --git a/miscutils/last.c b/miscutils/last.c
index 24f6e1c78..a144c7e47 100644
--- a/miscutils/last.c
+++ b/miscutils/last.c
@@ -87,11 +87,11 @@ int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                         if (++n > 0)
                                 ut.ut_type = n != 3 ? n : SHUTDOWN_TIME;
 #else
-                        if (strncmp(ut.ut_user, "shutdown", 8) == 0)
+                        if (is_prefixed_with(ut.ut_user, "shutdown"))
                                 ut.ut_type = SHUTDOWN_TIME;
-                        else if (strncmp(ut.ut_user, "reboot", 6) == 0)
+                        else if (is_prefixed_with(ut.ut_user, "reboot"))
                                 ut.ut_type = BOOT_TIME;
-                        else if (strncmp(ut.ut_user, "runlevel", 8) == 0)
+                        else if (is_prefixed_with(ut.ut_user, "runlevel"))
                                 ut.ut_type = RUN_LVL;
 #endif
                 } else {
diff --git a/miscutils/man.c b/miscutils/man.c
index c39870e67..58ed81955 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -66,7 +66,7 @@ static int run_pipe(const char *pager, char *man_filename, int man, int level)
                         goto ordinary_manpage;
 
                 line = xmalloc_open_zipped_read_close(man_filename, NULL);
-                if (!line || strncmp(line, ".so ", 4) != 0) {
+                if (!line || !is_prefixed_with(line, ".so ")) {
                         free(line);
                         goto ordinary_manpage;
                 }
@@ -228,7 +228,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
                 if (!token[1])
                         continue;
                 if (strcmp("DEFINE", token[0]) == 0) {
-                        if (strncmp("pager", token[1], 5) == 0) {
+                        if (is_prefixed_with("pager", token[1])) {
                                 pager = xstrdup(skip_whitespace(token[1]) + 5);
                         }
                 } else