Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/who.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/coreutils/who.c (modified) (3 diffs)

branches/3.3/mindi-busybox/coreutils/who.c

@@ -74 +74 @@
 int who_main(int argc UNUSED_PARAM, char **argv)
 {
-    struct utmp *ut;
+    struct utmpx *ut;
     unsigned opt;
     int do_users = (ENABLE_USERS && (!ENABLE_WHO || applet_name[0] == 'u'));
@@ -82 +82 @@
     opt = getopt32(argv, do_users ? "" : "aH");
     if (opt & 2) // -H
-        printf("USER\t\tTTY\t\tIDLE\tTIME\t\t HOST\n");
+        puts("USER\t\tTTY\t\tIDLE\tTIME\t\t HOST");
 
-    setutent();
-    while ((ut = getutent()) != NULL) {
+    setutxent();
+    while ((ut = getutxent()) != NULL) {
         if (ut->ut_user[0]
          && ((opt & 1) || ut->ut_type == USER_PROCESS)
@@ -127 +127 @@
         bb_putchar('\n');
     if (ENABLE_FEATURE_CLEAN_UP)
-        endutent();
+        endutxent();
     return EXIT_SUCCESS;
 }