Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/miscutils/last.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/miscutils/last.c (modified) (3 diffs)

branches/3.3/mindi-busybox/miscutils/last.c

@@ -33 +33 @@
 #if defined UT_LINESIZE \
     && ((UT_LINESIZE != 32) || (UT_NAMESIZE != 32) || (UT_HOSTSIZE != 256))
-#error struct utmp member char[] size(s) have changed!
+#error struct utmpx member char[] size(s) have changed!
 #elif defined __UT_LINESIZE \
-    && ((__UT_LINESIZE != 32) || (__UT_NAMESIZE != 64) || (__UT_HOSTSIZE != 256))
-#error struct utmp member char[] size(s) have changed!
+    && ((__UT_LINESIZE != 32) || (__UT_NAMESIZE != 32) || (__UT_HOSTSIZE != 256))
+/* __UT_NAMESIZE was checked with 64 above, but glibc-2.11 definitely uses 32! */
+#error struct utmpx member char[] size(s) have changed!
 #endif
 
 #if EMPTY != 0 || RUN_LVL != 1 || BOOT_TIME != 2 || NEW_TIME != 3 || \
     OLD_TIME != 4
-#error Values for the ut_type field of struct utmp changed
+#error Values for the ut_type field of struct utmpx changed
 #endif
 
@@ -47 +48 @@
 int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-    struct utmp ut;
+    struct utmpx ut;
     int n, file = STDIN_FILENO;
     time_t t_tmp;
@@ -88 +89 @@
                 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