ash: in tryexec(), ensure we don't try to run embedded scripts as applets
[oweals/busybox.git] / procps / uptime.c
index 74323625db0f4e9c3a2f6ab761509ed80d6d9ea1..3262f41b4aa4e40931addfe6cb4bbefc644a3922 100644 (file)
@@ -7,13 +7,29 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
-/* This version of uptime doesn't display the number of users on the system,
- * since busybox init doesn't mess with utmp.  For folks using utmp that are
- * just dying to have # of users reported, feel free to write it as some type
- * of CONFIG_FEATURE_UTMP_SUPPORT #define
+/* 2011                Pere Orga <gotrunks@gmail.com>
+ *
+ * Added FEATURE_UPTIME_UTMP_SUPPORT flag.
  */
+//config:config UPTIME
+//config:      bool "uptime (632 bytes)"
+//config:      default y
+//config:      select PLATFORM_LINUX #sysinfo()
+//config:      help
+//config:      uptime gives a one line display of the current time, how long
+//config:      the system has been running, how many users are currently logged
+//config:      on, and the system load averages for the past 1, 5, and 15 minutes.
+//config:
+//config:config FEATURE_UPTIME_UTMP_SUPPORT
+//config:      bool "Show the number of users"
+//config:      default y
+//config:      depends on UPTIME && FEATURE_UTMP
+//config:      help
+//config:      Display the number of users currently logged on.
+
+//applet:IF_UPTIME(APPLET_NOEXEC(uptime, uptime, BB_DIR_USR_BIN, BB_SUID_DROP, uptime))
 
-/* getopt not needed */
+//kbuild:lib-$(CONFIG_UPTIME) += uptime.o
 
 //usage:#define uptime_trivial_usage
 //usage:       ""
 # include <sys/sysinfo.h>
 #endif
 
-
 #ifndef FSHIFT
 # define FSHIFT 16              /* nr of bits of precision */
 #endif
-#define FIXED_1         (1<<FSHIFT)     /* 1.0 as fixed-point */
-#define LOAD_INT(x) ((x) >> FSHIFT)
-#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
-
+#define FIXED_1      (1 << FSHIFT)     /* 1.0 as fixed-point */
+#define LOAD_INT(x)  (unsigned)((x) >> FSHIFT)
+#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1 - 1)) * 100)
 
 int uptime_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int uptime_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-       int updays, uphours, upminutes;
+       unsigned updays, uphours, upminutes;
+       unsigned opts;
        struct sysinfo info;
        struct tm *current_time;
        time_t current_secs;
 
+       opts = getopt32(argv, "s");
+
        time(&current_secs);
+       sysinfo(&info);
+
+       if (opts) // -s
+               current_secs -= info.uptime;
+
        current_time = localtime(&current_secs);
 
-       sysinfo(&info);
+       if (opts) { // -s
+               printf("%04u-%02u-%02u %02u:%02u:%02u\n",
+                       current_time->tm_year + 1900, current_time->tm_mon + 1, current_time->tm_mday,
+                       current_time->tm_hour, current_time->tm_min, current_time->tm_sec
+               );
+               /* The above way of calculating boot time is wobbly,
+                * info.uptime has only 1 second precision, which makes
+                * "uptime -s" wander +- one second.
+                * /proc/uptime may be better, it has 0.01s precision.
+                */
+               return EXIT_SUCCESS;
+       }
 
-       printf(" %02d:%02d:%02d up ",
-                       current_time->tm_hour, current_time->tm_min, current_time->tm_sec);
-       updays = (int) info.uptime / (60*60*24);
-       if (updays)
-               printf("%d day%s, ", updays, (updays != 1) ? "s" : "");
-       upminutes = (int) info.uptime / 60;
-       uphours = (upminutes / 60) % 24;
+       printf(" %02u:%02u:%02u up ",
+                       current_time->tm_hour, current_time->tm_min, current_time->tm_sec
+       );
+       updays = (unsigned) info.uptime / (unsigned)(60*60*24);
+       if (updays != 0)
+               printf("%u day%s, ", updays, (updays != 1) ? "s" : "");
+       upminutes = (unsigned) info.uptime / (unsigned)60;
+       uphours = (upminutes / (unsigned)60) % (unsigned)24;
        upminutes %= 60;
-       if (uphours)
-               printf("%2d:%02d, ", uphours, upminutes);
+       if (uphours != 0)
+               printf("%2u:%02u", uphours, upminutes);
        else
-               printf("%d min, ", upminutes);
+               printf("%u min", upminutes);
+
+#if ENABLE_FEATURE_UPTIME_UTMP_SUPPORT
+       {
+               struct utmpx *ut;
+               unsigned users = 0;
+               while ((ut = getutxent()) != NULL) {
+                       if ((ut->ut_type == USER_PROCESS) && (ut->ut_user[0] != '\0'))
+                               users++;
+               }
+               printf(",  %u users", users);
+       }
+#endif
 
-       printf("load average: %ld.%02ld, %ld.%02ld, %ld.%02ld\n",
+       printf(",  load average: %u.%02u, %u.%02u, %u.%02u\n",
                        LOAD_INT(info.loads[0]), LOAD_FRAC(info.loads[0]),
                        LOAD_INT(info.loads[1]), LOAD_FRAC(info.loads[1]),
                        LOAD_INT(info.loads[2]), LOAD_FRAC(info.loads[2]));