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

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

@@ -30 +30 @@
 int runlevel_main(int argc UNUSED_PARAM, char **argv)
 {
-    struct utmp *ut;
+    struct utmpx *ut;
     char prev;
 
-    if (argv[1]) utmpname(argv[1]);
+    if (argv[1]) utmpxname(argv[1]);
 
-    setutent();
-    while ((ut = getutent()) != NULL) {
+    setutxent();
+    while ((ut = getutxent()) != NULL) {
         if (ut->ut_type == RUN_LVL) {
             prev = ut->ut_pid / 256;
@@ -42 +42 @@
             printf("%c %c\n", prev, ut->ut_pid % 256);
             if (ENABLE_FEATURE_CLEAN_UP)
-                endutent();
+                endutxent();
             return 0;
         }
@@ -50 +50 @@
 
     if (ENABLE_FEATURE_CLEAN_UP)
-        endutent();
+        endutxent();
     return 1;
 }