Merge branch 'busybox' into merge

4 files changed, 111 insertions, 33 deletions

diff --git a/miscutils/crond.c b/miscutils/crond.c
index 2e36c406b..25e5503c7 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -1056,7 +1056,7 @@ int crond_main(int argc UNUSED_PARAM, char **argv)
 
         log8("crond (busybox "BB_VER") started, log level %d", G.log_level);
         rescan_crontab_dir();
-        write_pidfile(CONFIG_PID_FILE_PATH "/crond.pid");
+        write_pidfile_std_path_and_ext("crond");
 #if ENABLE_FEATURE_CROND_SPECIAL_TIMES
         if (touch_reboot_file())
                 start_jobs(START_ME_REBOOT); /* start @reboot entries, if any */
diff --git a/miscutils/man.c b/miscutils/man.c
index 0bc11e623..6724b4b5d 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -13,9 +13,9 @@
 //kbuild:lib-$(CONFIG_MAN) += man.o
 
 //usage:#define man_trivial_usage
-//usage:       "[-aw] [MANPAGE]..."
+//usage:       "[-aw] MANPAGE..."
 //usage:#define man_full_usage "\n\n"
-//usage:       "Format and display manual page\n"
+//usage:       "Display manual page\n"
 //usage:     "\n        -a      Display all pages"
 //usage:     "\n        -w      Show page locations"
 //usage:     "\n"
@@ -209,9 +209,6 @@ static char **add_MANPATH(char **man_path_list, int *count_mp, char *path)
                 path_element = man_path_list;
                 if (path_element) while (*path_element) {
                         if (strcmp(*path_element, path) == 0) {
-                                /* Have path but haven't counted it, must be default */
-                                if (*count_mp == 0)
-                                        break;
                                 goto skip;
                         }
                         path_element++;
@@ -247,14 +244,14 @@ int man_main(int argc UNUSED_PARAM, char **argv)
 {
         parser_t *parser;
         char *sec_list;
-        char *cur_path, *cur_sect;
         char **man_path_list;
         int count_mp;
-        int cur_mp;
         int opt, not_found;
         char *token[2];
 #if ENABLE_PLATFORM_MINGW32
         char **ptr;
+        char *exepath, *relpath;
+        const char *mpl[] = { "/usr/man", "/usr/share/man", NULL, NULL };
 #endif
 
         INIT_G();
@@ -276,16 +273,6 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         man_path_list = add_MANPATH(NULL, &count_mp,
                         getenv("MANDATORY_MANPATH"+10) /* "MANPATH" */
         );
-        if (!man_path_list) {
-                /* default, may be overridden by /etc/man.conf */
-                man_path_list = xzalloc(2 * sizeof(man_path_list[0]));
-                man_path_list[0] = (char*)"/usr/man";
-                /* count_mp stays 0.
-                 * Thus, man.conf will overwrite man_path_list[0]
-                 * if a path is defined there.
-                 */
-        }
-
         /* Parse man.conf[ig] or man_db.conf */
         /* man version 1.6f uses man.config */
         /* man-db implementation of man uses man_db.conf */
@@ -299,7 +286,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
                 if (!token[1])
                         continue;
                 if (strcmp("DEFINE", token[0]) == 0) {
-                        G.col   = if_redefined(G.tbl  , "col",   token[1]);
+                        G.col   = if_redefined(G.col  , "col",   token[1]);
                         G.tbl   = if_redefined(G.tbl  , "tbl",   token[1]);
                         G.nroff = if_redefined(G.nroff, "nroff", token[1]);
                         G.pager = if_redefined(G.pager, "pager", token[1]);
@@ -317,17 +304,22 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         config_close(parser);
 
 #if ENABLE_PLATFORM_MINGW32
-        {
-                char *exepath = xstrdup(bb_busybox_exec_path);
-                char *relpath = concat_path_file(dirname(exepath), "man");
-                if (count_mp == 0) {
-                        /* default must match path set above */
-                        man_path_list = add_MANPATH(man_path_list, &count_mp,
-                                                                                (char *)"/usr/man");
-                }
+        /* allow man pages to be stored relative to the executable */
+        exepath = xstrdup(bb_busybox_exec_path);
+        relpath = concat_path_file(dirname(exepath), "man");
+
+        if (!man_path_list) {
+                mpl[2] = relpath;
+                man_path_list = (char**)mpl;
+        }
+        else {
                 man_path_list = add_MANPATH(man_path_list, &count_mp, relpath);
-                free(relpath);
-                free(exepath);
+        }
+#else
+        if (!man_path_list) {
+                static const char *const mpl[] = { "/usr/man", "/usr/share/man", NULL };
+                man_path_list = (char**)mpl;
+                /*count_mp = 2; - not used below anyway */
         }
 #endif
 
@@ -347,16 +339,18 @@ int man_main(int argc UNUSED_PARAM, char **argv)
 
         not_found = 0;
         do { /* for each argv[] */
+                const char *cur_path;
+                int cur_mp;
                 int found = 0;
-                cur_mp = 0;
 
                 if (strchr(*argv, '/')) {
                         found = show_manpage(*argv, /*man:*/ 1, 0);
                         goto check_found;
                 }
+                cur_mp = 0;
                 while ((cur_path = man_path_list[cur_mp++]) != NULL) {
                         /* for each MANPATH */
-                        cur_sect = sec_list;
+                        const char *cur_sect = sec_list;
                         do { /* for each section */
                                 char *next_sect = strchrnul(cur_sect, ':');
                                 int sect_len = next_sect - cur_sect;
diff --git a/miscutils/ts.c b/miscutils/ts.c
new file mode 100644
index 000000000..f2d367654
--- /dev/null
+++ b/miscutils/ts.c
@@ -0,0 +1,84 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2019 Denys Vlasenko <vda.linux@googlemail.com>
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config TS
+//config:       bool "ts (450 bytes)"
+//config:       default y
+
+//applet:IF_TS(APPLET(ts, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_TS) += ts.o
+
+//usage:#define ts_trivial_usage
+//usage:       "[-is] [STRFTIME]"
+//usage:#define ts_full_usage ""
+
+#include "libbb.h"
+#include "common_bufsiz.h"
+
+int ts_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ts_main(int argc UNUSED_PARAM, char **argv)
+{
+        struct timeval base;
+        unsigned opt;
+        char *frac;
+        char *fmt_dt2str;
+        char *line;
+
+        opt = getopt32(argv, "^" "is" "\0" "?1" /*max one arg*/);
+        if (opt) {
+                putenv((char*)"TZ=UTC0");
+                tzset();
+        }
+        /*argc -= optind;*/
+        argv += optind;
+        fmt_dt2str = argv[0] ? argv[0]
+                : (char*)(opt ? "%b %d %H:%M:%S"+6 : "%b %d %H:%M:%S");
+        frac = is_suffixed_with(fmt_dt2str, "%.S");
+        if (!frac)
+                frac = is_suffixed_with(fmt_dt2str, "%.s");
+        if (frac) {
+                frac++;
+                frac[0] = frac[1];
+                frac[1] = '\0';
+        }
+
+#define date_buf bb_common_bufsiz1
+        setup_common_bufsiz();
+        gettimeofday(&base, NULL);
+
+        while ((line = xmalloc_fgets(stdin)) != NULL) {
+                struct timeval ts;
+                struct tm tm_time;
+
+                gettimeofday(&ts, NULL);
+                if (opt) {
+                        /* -i and/or -s */
+                        struct timeval ts1 = ts1;
+                        if (opt & 1) /* -i */
+                                ts1 = ts;
+//printf("%d %d\n", ts.tv_sec, base.tv_sec);
+                        ts.tv_sec -= base.tv_sec;
+//printf("%d %d\n", ts.tv_sec, base.tv_sec);
+                        ts.tv_usec -= base.tv_usec;
+                        if ((int32_t)(ts.tv_usec) < 0) {
+                                ts.tv_sec--;
+                                ts.tv_usec += 1000*1000;
+                        }
+                        if (opt & 1) /* -i */
+                                base = ts1;
+                }
+                localtime_r(&ts.tv_sec, &tm_time);
+                strftime(date_buf, COMMON_BUFSIZE, fmt_dt2str, &tm_time);
+                if (!frac) {
+                        printf("%s %s", date_buf, line);
+                } else {
+                        printf("%s.%06u %s", date_buf, (unsigned)ts.tv_usec, line);
+                }
+                free(line);
+        }
+
+        return EXIT_SUCCESS;
+}
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 1e9ecc5e8..86600b72f 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -64,7 +64,7 @@ static void shutdown_watchdog(void)
 
 static void shutdown_on_signal(int sig UNUSED_PARAM)
 {
-        remove_pidfile(CONFIG_PID_FILE_PATH "/watchdog.pid");
+        remove_pidfile_std_path_and_ext("watchdog");
         shutdown_watchdog();
         _exit(EXIT_SUCCESS);
 }
@@ -136,7 +136,7 @@ int watchdog_main(int argc UNUSED_PARAM, char **argv)
                 stimer_duration, htimer_duration * 1000);
 #endif
 
-        write_pidfile(CONFIG_PID_FILE_PATH "/watchdog.pid");
+        write_pidfile_std_path_and_ext("watchdog");
 
         while (1) {
                 /*