Wrote uptime. Doesn't use /proc. :)

 -Erik

diff --git a/Changelog b/Changelog
index 7593532728781d6fc543ae0bd106017e04a81e26..c671f7a80a7061db321923b1579d4372b4732ca2 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,5 @@
 0.43
-       * Wrote basename.
+       * Wrote basename, and uptime.
        * Added freeramdisk, which will free up all memory associated
            with a ram disk.  Contributed by Emanuele Caratti <wiz@iol.it>
            and then adjusted a bit by me.

diff --git a/applets/busybox.c b/applets/busybox.c
index ccf80a75e39efd6e95b3e3ff1a1859affa2a0f0a..991801310e6299914df4c52acbacdb3160b3b3b0 100644 (file)
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -268,11 +268,14 @@ static const struct Applet applets[] = {
 #ifdef BB_TTY                                  //usr/bin
        {"tty", tty_main},
 #endif
+#ifdef BB_UMOUNT                               //bin
+       {"umount", umount_main},
+#endif
 #ifdef BB_UNAME                                        //bin
        {"uname", uname_main},
 #endif
-#ifdef BB_UMOUNT                               //bin
-       {"umount", umount_main},
+#ifdef BB_UPTIME                               //usr/bin
+       {"uptime", uptime_main},
 #endif
 #ifdef BB_UNIQ                                 //bin
        {"uniq", uniq_main},

diff --git a/busybox.c b/busybox.c
index ccf80a75e39efd6e95b3e3ff1a1859affa2a0f0a..991801310e6299914df4c52acbacdb3160b3b3b0 100644 (file)
--- a/busybox.c
+++ b/busybox.c
@@ -268,11 +268,14 @@ static const struct Applet applets[] = {
 #ifdef BB_TTY                                  //usr/bin
        {"tty", tty_main},
 #endif
+#ifdef BB_UMOUNT                               //bin
+       {"umount", umount_main},
+#endif
 #ifdef BB_UNAME                                        //bin
        {"uname", uname_main},
 #endif
-#ifdef BB_UMOUNT                               //bin
-       {"umount", umount_main},
+#ifdef BB_UPTIME                               //usr/bin
+       {"uptime", uptime_main},
 #endif
 #ifdef BB_UNIQ                                 //bin
        {"uniq", uniq_main},

diff --git a/busybox.def.h b/busybox.def.h
index 3407b2cc0c79468c250fc0a46075b472df0eeece..b82bcc5f1ebd040598e4e4006eb2c177f2f29adf 100644 (file)
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -86,6 +86,7 @@
 #define BB_TOUCH
 #define BB_TRUE_FALSE
 #define BB_TTY
+#define BB_UPTIME
 #define BB_WC
 #define BB_WHOAMI
 #define BB_UMOUNT

diff --git a/internal.h b/internal.h
index b2714131fcb9c3e6a99856444483091af943188c..7ae129729988e56b25bb0844c9f8a96c89ed4d3a 100644 (file)
--- a/internal.h
+++ b/internal.h
@@ -140,6 +140,7 @@ extern int tryopen_main(int argc, char** argv);
 extern int tty_main(int argc, char** argv);
 extern int umount_main(int argc, char** argv);
 extern int uname_main(int argc, char** argv);
+extern int uptime_main(int argc, char** argv);
 extern int uniq_main(int argc, char** argv);
 extern int update_main(int argc, char** argv);
 extern int wc_main(int argc, char** argv);