Merge branch 'busybox' into merge

Conflicts:
	debianutils/which.c
	editors/vi.c
	libbb/executable.c

4 files changed, 231 insertions, 88 deletions

diff --git a/util-linux/Config.src b/util-linux/Config.src
index 5a8b0063b..c1cd6daa4 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -599,6 +599,15 @@ config SWAPONOFF
           space. If you are not using any swap space, you can leave this
           option disabled.
 
+config FEATURE_SWAPON_DISCARD
+        bool "Support discard option -d"
+        default y
+        depends on SWAPONOFF
+        help
+          Enable support for discarding swap area blocks at swapon and/or as
+          the kernel frees them. This option enables both the -d option on
+          'swapon' and the 'discard' option for swap entries in /etc/fstab.
+
 config FEATURE_SWAPON_PRI
         bool "Support priority option -p"
         default y
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index 735a29822..33cdbfad4 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -51,7 +51,6 @@
 
 #define SYS_RTC_PATH   "/sys/class/rtc/%s/device/power/wakeup"
 #define SYS_POWER_PATH "/sys/power/state"
-#define DEFAULT_MODE   "standby"
 
 static NOINLINE bool may_wakeup(const char *rtcname)
 {
@@ -122,17 +121,16 @@ static NOINLINE void setup_alarm(int fd, time_t *wakeup, time_t rtc_time)
 int rtcwake_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rtcwake_main(int argc UNUSED_PARAM, char **argv)
 {
-        time_t rtc_time;
-
         unsigned opt;
         const char *rtcname = NULL;
-        const char *suspend;
+        const char *suspend = "standby";
         const char *opt_seconds;
         const char *opt_time;
 
+        time_t rtc_time;
         time_t sys_time;
-        time_t alarm_time = 0;
-        unsigned seconds = 0;
+        time_t alarm_time = alarm_time;
+        unsigned seconds = seconds; /* for compiler */
         int utc = -1;
         int fd;
 
@@ -148,6 +146,8 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
                 ;
         applet_long_options = rtcwake_longopts;
 #endif
+        /* Must have -s or -t, exclusive */
+        opt_complementary = "s:t:s--t:t--s";
         opt = getopt32(argv, "alud:m:s:t:", &rtcname, &suspend, &opt_seconds, &opt_time);
 
         /* this is the default
@@ -156,17 +156,17 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
         */
         if (opt & (RTCWAKE_OPT_UTC | RTCWAKE_OPT_LOCAL))
                 utc = opt & RTCWAKE_OPT_UTC;
-        if (!(opt & RTCWAKE_OPT_SUSPEND_MODE))
-                suspend = DEFAULT_MODE;
-        if (opt & RTCWAKE_OPT_SECONDS)
+        if (opt & RTCWAKE_OPT_SECONDS) {
                 /* alarm time, seconds-to-sleep (relative) */
-                seconds = xatoi(opt_seconds);
-        if (opt & RTCWAKE_OPT_TIME)
+                seconds = xatou(opt_seconds);
+        } else {
+                /* RTCWAKE_OPT_TIME */
                 /* alarm time, time_t (absolute, seconds since 1/1 1970 UTC) */
-                alarm_time = xatol(opt_time);
-
-        if (!alarm_time && !seconds)
-                bb_error_msg_and_die("must provide wake time");
+                if (sizeof(alarm_time) <= sizeof(long))
+                        alarm_time = xatol(opt_time);
+                else
+                        alarm_time = xatoll(opt_time);
+        }
 
         if (utc == -1)
                 utc = rtc_adjtime_is_utc();
@@ -177,8 +177,9 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
         /* this RTC must exist and (if we'll sleep) be wakeup-enabled */
         fd = rtc_xopen(&rtcname, O_RDONLY);
 
-        if (strcmp(suspend, "on") && !may_wakeup(rtcname))
-                bb_error_msg_and_die("%s not enabled for wakeup events", rtcname);
+        if (strcmp(suspend, "on") != 0)
+                if (!may_wakeup(rtcname))
+                        bb_error_msg_and_die("%s not enabled for wakeup events", rtcname);
 
         /* relative or absolute alarm time, normalized to time_t */
         sys_time = time(NULL);
@@ -188,21 +189,29 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
                 rtc_time = rtc_tm2time(&tm_time, utc);
         }
 
-
-        if (alarm_time) {
-                if (alarm_time < sys_time)
+        if (opt & RTCWAKE_OPT_TIME) {
+                /* Correct for RTC<->system clock difference */
+                alarm_time += rtc_time - sys_time;
+                if (alarm_time < rtc_time)
+                        /*
+                         * Compat message text.
+                         * I'd say "RTC time is already ahead of ..." instead.
+                         */
                         bb_error_msg_and_die("time doesn't go backward to %s", ctime(&alarm_time));
-                alarm_time += sys_time - rtc_time;
         } else
                 alarm_time = rtc_time + seconds + 1;
-        setup_alarm(fd, &alarm_time, rtc_time);
 
+        setup_alarm(fd, &alarm_time, rtc_time);
         sync();
+#if 0 /*debug*/
+        printf("sys_time: %s", ctime(&sys_time));
+        printf("rtc_time: %s", ctime(&rtc_time));
+#endif
         printf("wakeup from \"%s\" at %s", suspend, ctime(&alarm_time));
         fflush_all();
         usleep(10 * 1000);
 
-        if (strcmp(suspend, "on"))
+        if (strcmp(suspend, "on") != 0)
                 xopen_xwrite_close(SYS_POWER_PATH, suspend);
         else {
                 /* "fake" suspend ... we'll do the delay ourselves */
diff --git a/util-linux/script.c b/util-linux/script.c
index 8fb991d15..abcd73bff 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -77,8 +77,15 @@ int script_main(int argc UNUSED_PARAM, char **argv)
         if (!(opt & OPT_q)) {
                 printf("Script started, file is %s\n", fname);
         }
+
         shell = get_shell_name();
 
+        /* Some people run "script ... 0>&-".
+         * Our code assumes that STDIN_FILENO != pty.
+         * Ensure STDIN_FILENO is not closed:
+         */
+        bb_sanitize_stdio();
+
         pty = xgetpty(pty_line);
 
         /* get current stdin's tty params */
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 3f223343e..75487267b 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -8,10 +8,14 @@
  */
 
 //usage:#define swapon_trivial_usage
-//usage:       "[-a]" IF_FEATURE_SWAPON_PRI(" [-p PRI]") " [DEVICE]"
+//usage:       "[-a]" IF_FEATURE_SWAPON_DISCARD(" [-d[POL]]") IF_FEATURE_SWAPON_PRI(" [-p PRI]") " [DEVICE]"
 //usage:#define swapon_full_usage "\n\n"
 //usage:       "Start swapping on DEVICE\n"
 //usage:     "\n        -a      Start swapping on all swap devices"
+//usage:        IF_FEATURE_SWAPON_DISCARD(
+//usage:     "\n        -d[POL] Discard blocks at swapon (POL=once),"
+//usage:     "\n                as freed (POL=pages), or both (POL omitted)"
+//usage:        )
 //usage:        IF_FEATURE_SWAPON_PRI(
 //usage:     "\n        -p PRI  Set swap device priority"
 //usage:        )
@@ -38,78 +42,162 @@
 # define MNTTYPE_SWAP "swap"
 #endif
 
-#if ENABLE_FEATURE_SWAPON_PRI
+#if ENABLE_FEATURE_SWAPON_DISCARD
+#ifndef SWAP_FLAG_DISCARD
+#define SWAP_FLAG_DISCARD 0x10000
+#endif
+#ifndef SWAP_FLAG_DISCARD_ONCE
+#define SWAP_FLAG_DISCARD_ONCE 0x20000
+#endif
+#ifndef SWAP_FLAG_DISCARD_PAGES
+#define SWAP_FLAG_DISCARD_PAGES 0x40000
+#endif
+#define SWAP_FLAG_DISCARD_MASK \
+        (SWAP_FLAG_DISCARD | SWAP_FLAG_DISCARD_ONCE | SWAP_FLAG_DISCARD_PAGES)
+#endif
+
+
+#if ENABLE_FEATURE_SWAPON_DISCARD || ENABLE_FEATURE_SWAPON_PRI
 struct globals {
         int flags;
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define g_flags (G.flags)
+#define save_g_flags()    int save_g_flags = g_flags
+#define restore_g_flags() g_flags = save_g_flags
 #else
 #define g_flags 0
+#define save_g_flags()    ((void)0)
+#define restore_g_flags() ((void)0)
 #endif
 #define INIT_G() do { } while (0)
 
+#define do_swapoff   (applet_name[5] == 'f')
+
+/* Command line options */
+enum {
+        OPTBIT_a,                              /* -a all      */
+        IF_FEATURE_SWAPON_DISCARD( OPTBIT_d ,) /* -d discard  */
+        IF_FEATURE_SWAPON_PRI    ( OPTBIT_p ,) /* -p priority */
+        OPT_a = 1 << OPTBIT_a,
+        OPT_d = IF_FEATURE_SWAPON_DISCARD((1 << OPTBIT_d)) + 0,
+        OPT_p = IF_FEATURE_SWAPON_PRI    ((1 << OPTBIT_p)) + 0,
+};
+
+#define OPT_ALL      (option_mask32 & OPT_a)
+#define OPT_DISCARD  (option_mask32 & OPT_d)
+#define OPT_PRIO     (option_mask32 & OPT_p)
+
 static int swap_enable_disable(char *device)
 {
-        int status;
+        int err = 0;
+        int quiet = 0;
         struct stat st;
 
         resolve_mount_spec(&device);
-        xstat(device, &st);
 
-#if ENABLE_DESKTOP
-        /* test for holes */
-        if (S_ISREG(st.st_mode))
-                if (st.st_blocks * (off_t)512 < st.st_size)
-                        bb_error_msg("warning: swap file has holes");
-#endif
-
-        if (applet_name[5] == 'n')
-                status = swapon(device, g_flags);
-        else
-                status = swapoff(device);
+        if (do_swapoff) {
+                err = swapoff(device);
+                /* Don't complain on OPT_ALL if not a swap device or if it doesn't exist */
+                quiet = (OPT_ALL && (errno == EINVAL || errno == ENOENT));
+        } else {
+                /* swapon */
+                err = stat(device, &st);
+                if (!err) {
+                        if (ENABLE_DESKTOP && S_ISREG(st.st_mode)) {
+                                if (st.st_blocks * (off_t)512 < st.st_size) {
+                                        bb_error_msg("%s: file has holes", device);
+                                        return 1;
+                                }
+                        }
+                        err = swapon(device, g_flags);
+                        /* Don't complain on swapon -a if device is already in use */
+                        quiet = (OPT_ALL && errno == EBUSY);
+                }
+        }
 
-        if (status != 0) {
+        if (err && !quiet) {
                 bb_simple_perror_msg(device);
                 return 1;
         }
-
         return 0;
 }
 
-static int do_em_all(void)
+#if ENABLE_FEATURE_SWAPON_DISCARD
+static void set_discard_flag(char *s)
 {
-        struct mntent *m;
-        FILE *f;
-        int err;
+        /* Unset the flag first to allow fstab options to override */
+        /* options set on the command line */
+        g_flags = (g_flags & ~SWAP_FLAG_DISCARD_MASK) | SWAP_FLAG_DISCARD;
+
+        if (!s) /* No optional policy value on the commandline */
+                return;
+        /* Skip prepended '=' */
+        if (*s == '=')
+                s++;
+        /* For fstab parsing: remove other appended options */
+        *strchrnul(s, ',') = '\0';
+
+        if (strcmp(s, "once") == 0)
+                g_flags |= SWAP_FLAG_DISCARD_ONCE;
+        if  (strcmp(s, "pages") == 0)
+                g_flags |= SWAP_FLAG_DISCARD_PAGES;
+}
+#else
+#define set_discard_flag(s) ((void)0)
+#endif
 
-        f = setmntent("/etc/fstab", "r");
-        if (f == NULL)
-                bb_perror_msg_and_die("/etc/fstab");
+#if ENABLE_FEATURE_SWAPON_PRI
+static void set_priority_flag(char *s)
+{
+        unsigned prio;
+
+        /* For fstab parsing: remove other appended options */
+        *strchrnul(s, ',') = '\0';
+        /* Max allowed 32767 (== SWAP_FLAG_PRIO_MASK) */
+        prio = bb_strtou(s, NULL, 10);
+        if (!errno) {
+                /* Unset the flag first to allow fstab options to override */
+                /* options set on the command line */
+                g_flags = (g_flags & ~SWAP_FLAG_PRIO_MASK) | SWAP_FLAG_PREFER |
+                                        MIN(prio, SWAP_FLAG_PRIO_MASK);
+        }
+}
+#else
+#define set_priority_flag(s) ((void)0)
+#endif
+
+static int do_em_all_in_fstab(void)
+{
+        struct mntent *m;
+        int err = 0;
+        FILE *f = xfopen_for_read("/etc/fstab");
 
-        err = 0;
         while ((m = getmntent(f)) != NULL) {
                 if (strcmp(m->mnt_type, MNTTYPE_SWAP) == 0) {
                         /* swapon -a should ignore entries with noauto,
-                         * but swapoff -a should process them */
-                        if (applet_name[5] != 'n'
-                         || hasmntopt(m, MNTOPT_NOAUTO) == NULL
-                        ) {
-#if ENABLE_FEATURE_SWAPON_PRI
-                                char *p;
-                                g_flags = 0; /* each swap space might have different flags */
-                                p = hasmntopt(m, "pri");
-                                if (p) {
-                                        /* Max allowed 32767 (==SWAP_FLAG_PRIO_MASK) */
-                                        unsigned int swap_prio = MIN(bb_strtou(p + 4 , NULL, 10), SWAP_FLAG_PRIO_MASK);
-                                        /* We want to allow "NNNN,foo", thus errno == EINVAL is allowed too */
-                                        if (errno != ERANGE) {
-                                                g_flags = SWAP_FLAG_PREFER |
-                                                        (swap_prio << SWAP_FLAG_PRIO_SHIFT);
+                         * but swapoff -a should process them
+                         */
+                        if (do_swapoff || hasmntopt(m, MNTOPT_NOAUTO) == NULL) {
+                                /* each swap space might have different flags */
+                                /* save global flags for the next round */
+                                save_g_flags();
+                                if (ENABLE_FEATURE_SWAPON_DISCARD) {
+                                        char *p = hasmntopt(m, "discard");
+                                        if (p) {
+                                                /* move to '=' or to end of string */
+                                                p += 7;
+                                                set_discard_flag(p);
                                         }
                                 }
-#endif
-                                err += swap_enable_disable(m->mnt_fsname);
+                                if (ENABLE_FEATURE_SWAPON_PRI) {
+                                        char *p = hasmntopt(m, "pri");
+                                        if (p) {
+                                                set_priority_flag(p + 4);
+                                        }
+                                }
+                                err |= swap_enable_disable(m->mnt_fsname);
+                                restore_g_flags();
                         }
                 }
         }
@@ -120,38 +208,68 @@ static int do_em_all(void)
         return err;
 }
 
+static int do_all_in_proc_swaps(void)
+{
+        char *line;
+        int err = 0;
+        FILE *f = fopen_for_read("/proc/swaps");
+        /* Don't complain if missing */
+        if (f) {
+                while ((line = xmalloc_fgetline(f)) != NULL) {
+                        if (line[0] == '/') {
+                                *strchrnul(line, ' ') = '\0';
+                                err |= swap_enable_disable(line);
+                        }
+                        free(line);
+                }
+                if (ENABLE_FEATURE_CLEAN_UP)
+                        fclose(f);
+        }
+
+        return err;
+}
+
+#define OPTSTR_SWAPON "a" \
+        IF_FEATURE_SWAPON_DISCARD("d::") \
+        IF_FEATURE_SWAPON_PRI("p:")
+
 int swap_on_off_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int swap_on_off_main(int argc UNUSED_PARAM, char **argv)
 {
-        int ret;
+        IF_FEATURE_SWAPON_PRI(char *prio;)
+        IF_FEATURE_SWAPON_DISCARD(char *discard = NULL;)
+        int ret = 0;
 
         INIT_G();
 
-#if !ENABLE_FEATURE_SWAPON_PRI
-        ret = getopt32(argv, "a");
-#else
-        if (applet_name[5] == 'n')
-                opt_complementary = "p+";
-        ret = getopt32(argv, (applet_name[5] == 'n') ? "ap:" : "a", &g_flags);
-
-        if (ret & 2) { // -p
-                g_flags = SWAP_FLAG_PREFER |
-                        ((g_flags & SWAP_FLAG_PRIO_MASK) << SWAP_FLAG_PRIO_SHIFT);
-                ret &= 1;
-        }
-#endif
-
-        if (ret /* & 1: not needed */) // -a
-                return do_em_all();
+        getopt32(argv, do_swapoff ? "a" : OPTSTR_SWAPON
+                        IF_FEATURE_SWAPON_DISCARD(, &discard)
+                        IF_FEATURE_SWAPON_PRI(, &prio)
+        );
 
         argv += optind;
-        if (!*argv)
-                bb_show_usage();
 
-        /* ret = 0; redundant */
-        do {
-                ret += swap_enable_disable(*argv);
-        } while (*++argv);
+        if (OPT_DISCARD) {
+                set_discard_flag(discard);
+        }
+        if (OPT_PRIO) {
+                set_priority_flag(prio);
+        }
 
+        if (OPT_ALL) {
+                /* swapoff -a does also /proc/swaps */
+                if (do_swapoff)
+                        ret = do_all_in_proc_swaps();
+                ret |= do_em_all_in_fstab();
+        } else if (!*argv) {
+                /* if not -a we need at least one arg */
+                bb_show_usage();
+        }
+        /* Unset -a now to allow for more messages in swap_enable_disable */
+        option_mask32 = option_mask32 & ~OPT_a;
+        /* Now process devices on the commandline if any */
+        while (*argv) {
+                ret |= swap_enable_disable(*argv++);
+        }
         return ret;
 }