Merge branch 'busybox' into merge

Conflicts:
	coreutils/od_bloaty.c
	libbb/lineedit.c

1 files changed, 6 insertions, 6 deletions

diff --git a/libbb/procps.c b/libbb/procps.c
index 3c99ac6e7..fff9f8b0b 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -206,11 +206,11 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
                 // Rss:                 nnn kB
                 // .....
 
-                char *tp = buf, *p;
+                char *tp, *p;
 
 #define SCAN(S, X) \
-                if (strncmp(tp, S, sizeof(S)-1) == 0) {              \
-                        tp = skip_whitespace(tp + sizeof(S)-1);      \
+                if ((tp = is_prefixed_with(buf, S)) != NULL) {       \
+                        tp = skip_whitespace(tp);                    \
                         total->X += currec.X = fast_strtoul_10(&tp); \
                         continue;                                    \
                 }
@@ -248,7 +248,7 @@ int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
                         // skipping "rw-s FILEOFS M:m INODE "
                         tp = skip_whitespace(skip_fields(tp, 4));
                         // filter out /dev/something (something != zero)
-                        if (strncmp(tp, "/dev/", 5) != 0 || strcmp(tp, "/dev/zero\n") == 0) {
+                        if (!is_prefixed_with(tp, "/dev/") || strcmp(tp, "/dev/zero\n") == 0) {
                                 if (currec.smap_mode[1] == 'w') {
                                         currec.mapped_rw = currec.smap_size;
                                         total->mapped_rw += currec.smap_size;
@@ -498,8 +498,8 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
                                 while (fgets(buf, sizeof(buf), file)) {
                                         char *tp;
 #define SCAN_TWO(str, name, statement) \
-        if (strncmp(buf, str, sizeof(str)-1) == 0) { \
-                tp = skip_whitespace(buf + sizeof(str)-1); \
+        if ((tp = is_prefixed_with(buf, str)) != NULL) { \
+                tp = skip_whitespace(tp); \
                 sscanf(tp, "%u", &sp->name); \
                 statement; \
         }