code-style for pledge(2)

feedback from Klemens, thanks

diff --git a/st.c b/st.c
index b9750f2..76bb3ea 100644 (file)
--- a/st.c
+++ b/st.c
@@ -28,10 +28,6 @@
  #include <libutil.h>
 #endif
 
  #include <libutil.h>
 #endif
 

-#ifndef __OpenBSD__
-#define pledge(a,b) 0
-#endif
-

 /* Arbitrary sizes */
 #define UTF_INVALID   0xFFFD
 #define UTF_SIZ       4
 /* Arbitrary sizes */
 #define UTF_INVALID   0xFFFD
 #define UTF_SIZ       4


@@ -810,13 +806,17 @@ ttynew(char *line, char *cmd, char *out, char **args)
                        die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
                close(s);
                close(m);
                        die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
                close(s);
                close(m);

+#ifdef __OpenBSD__

                if (pledge("stdio getpw proc exec", NULL) == -1)
                        die("pledge\n");
                if (pledge("stdio getpw proc exec", NULL) == -1)
                        die("pledge\n");

+#endif

                execsh(cmd, args);
                break;
        default:
                execsh(cmd, args);
                break;
        default:

+#ifdef __OpenBSD__

                if (pledge("stdio rpath tty proc", NULL) == -1)
                        die("pledge\n");
                if (pledge("stdio rpath tty proc", NULL) == -1)
                        die("pledge\n");

+#endif

                close(s);
                cmdfd = m;
                signal(SIGCHLD, sigchld);
                close(s);
                cmdfd = m;
                signal(SIGCHLD, sigchld);