setsid: add option "-c" to set the controlling terminal

[kzak@redhat.com: - use STDIN_FILENO rather than 0]

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/sys-utils/setsid.1 b/sys-utils/setsid.1
index 0d9580ecef34978a9a9ad5f1181a40012bd78e2e..eff794858164355928b1384d95735e06cd9852b2 100644 (file)
--- a/sys-utils/setsid.1
+++ b/sys-utils/setsid.1
@@ -11,6 +11,10 @@ setsid \- run a program in a new session
 .SH DESCRIPTION
 .B setsid
 runs a program in a new session.
+.SH OPTIONS
+.TP
+\fB\-c\fP, \fB\-\-ctty\fP
+Set the controlling terminal to the current one.
 .SH "SEE ALSO"
 .BR setsid (2)
 .SH AUTHOR

diff --git a/sys-utils/setsid.c b/sys-utils/setsid.c
index efd20e6948e056607b365517f5b3385723117a3d..d02879eff76bcd05c376309088ae052149339234 100644 (file)
--- a/sys-utils/setsid.c
+++ b/sys-utils/setsid.c
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <termio.h>
 
 #include "c.h"
 #include "nls.h"
@@ -25,6 +26,9 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
        fprintf(out, _(" %s [options] <program> [arguments ...]\n"),
                program_invocation_short_name);
        fprintf(out, USAGE_OPTIONS);
+       fprintf(out, _(
+               " -c, --ctty \tset the controlling terminal to the current one\n"
+               ));
        fprintf(out, USAGE_HELP);
        fprintf(out, USAGE_VERSION);
        fprintf(out, USAGE_MAN_TAIL("setsid(1)"));
@@ -34,7 +38,10 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
 int main(int argc, char **argv)
 {
        int ch;
+       int ctty = 0;
+
        static const struct option longopts[] = {
+               {"ctty", no_argument, NULL, 'c'},
                {"version", no_argument, NULL, 'V'},
                {"help", no_argument, NULL, 'h'},
                {NULL, 0, NULL, 0}
@@ -44,11 +51,14 @@ int main(int argc, char **argv)
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
 
-       while ((ch = getopt_long(argc, argv, "+Vh", longopts, NULL)) != -1)
+       while ((ch = getopt_long(argc, argv, "+Vhc", longopts, NULL)) != -1)
                switch (ch) {
                case 'V':
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
+               case 'c':
+                       ctty=1;
+                       break;
                case 'h':
                        usage(stdout);
                default:
@@ -74,6 +84,10 @@ int main(int argc, char **argv)
                /* cannot happen */
                err(EXIT_FAILURE, _("setsid failed"));
 
-       execvp(argv[1], argv + 1);
+       if (ctty) {
+               if (ioctl(STDIN_FILENO, TIOCSCTTY, 1))
+                       warn(_("failed to set the controlling terminal"));
+       }
+       execvp(argv[optind], argv + optind + 1);
        err(EXIT_FAILURE, _("execvp failed"));
 }