Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/miscutils/last_fancy.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_fancy.c (modified) (9 diffs)

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

@@ -23 +23 @@
     INET6_ADDRSTRLEN, INET6_ADDRSTRLEN, "HOST", "LOGIN", "  TIME", ""
 
+#if !defined __UT_LINESIZE && defined UT_LINESIZE
+# define __UT_LINESIZE UT_LINESIZE
+#endif
+
 enum {
     NORMAL,
@@ -40 +44 @@
 #define show_wide (option_mask32 & LAST_OPT_W)
 
-static void show_entry(struct utmp *ut, int state, time_t dur_secs)
+static void show_entry(struct utmpx *ut, int state, time_t dur_secs)
 {
     unsigned days, hours, mins;
-    char duration[32];
+    char duration[sizeof("(%u+02:02)") + sizeof(int)*3];
     char login_time[17];
     char logout_time[8];
@@ -54 +58 @@
     tmp = ut->ut_tv.tv_sec;
     safe_strncpy(login_time, ctime(&tmp), 17);
-    snprintf(logout_time, 8, "- %s", ctime(&dur_secs) + 11);
+    tmp = dur_secs;
+    snprintf(logout_time, 8, "- %s", ctime(&tmp) + 11);
 
     dur_secs = MAX(dur_secs - (time_t)ut->ut_tv.tv_sec, (time_t)0);
@@ -104 +109 @@
 }
 
-static int get_ut_type(struct utmp *ut)
+static int get_ut_type(struct utmpx *ut)
 {
     if (ut->ut_line[0] == '~') {
@@ -142 +147 @@
 }
 
-static int is_runlevel_shutdown(struct utmp *ut)
+static int is_runlevel_shutdown(struct utmpx *ut)
 {
     if (((ut->ut_pid & 255) == '0') || ((ut->ut_pid & 255) == '6')) {
@@ -154 +159 @@
 int last_main(int argc UNUSED_PARAM, char **argv)
 {
-    struct utmp ut;
+    struct utmpx ut;
     const char *filename = _PATH_WTMP;
     llist_t *zlist;
@@ -229 +234 @@
             }
             /* add_entry */
-            llist_add_to(&zlist, memcpy(xmalloc(sizeof(ut)), &ut, sizeof(ut)));
+            llist_add_to(&zlist, xmemdup(&ut, sizeof(ut)));
             break;
         case USER_PROCESS: {
@@ -242 +247 @@
                 llist_t *el, *next;
                 for (el = zlist; el; el = next) {
-                    struct utmp *up = (struct utmp *)el->data;
+                    struct utmpx *up = (struct utmpx *)el->data;
                     next = el->link;
-                    if (strncmp(up->ut_line, ut.ut_line, UT_LINESIZE) == 0) {
+                    if (strncmp(up->ut_line, ut.ut_line, __UT_LINESIZE) == 0) {
                         if (show) {
                             show_entry(&ut, NORMAL, up->ut_tv.tv_sec);
@@ -271 +276 @@
             }
             /* add_entry */
-            llist_add_to(&zlist, memcpy(xmalloc(sizeof(ut)), &ut, sizeof(ut)));
+            llist_add_to(&zlist, xmemdup(&ut, sizeof(ut)));
             break;
         }