[hackers] [st] reunite pty.c with std.c || Matthias-Christian Ott

changeset: 37:c4a9925f88ba
user: Matthias-Christian Ott <ott_AT_enolink.de>
date: Mon Jul 21 10:34:02 2008 +0200
files: pty.c std.c
description:
reunite pty.c with std.c

diff -r a2d8de1edfaa -r c4a9925f88ba pty.c
--- a/pty.c Mon Jul 21 09:25:47 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#if !(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600)
-#include <pty.h>
-#endif
-
-extern int ptm, pts;
-
-void
-getpty(void) {
- char *ptsdev;
-
-#if defined(_GNU_SOURCE)
- ptm = getpt();
-#elif _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600
- ptm = posix_openpt(O_RDWR);
-#else
- ptm = open("/dev/ptmx", O_RDWR);
- if(ptm == -1)
- if(openpty(&ptm, &pts, NULL, NULL, NULL) == -1)
- err(EXIT_FAILURE, "cannot open pty");
-#endif
-#if defined(_XOPEN_SOURCE)
- if(ptm != -1) {
- if(grantpt(ptm) == -1)
- err(EXIT_FAILURE, "cannot grant access to pty");
- if(unlockpt(ptm) == -1)
- err(EXIT_FAILURE, "cannot unlock pty");
- ptsdev = ptsname(ptm);
- if(!ptsdev)
- err(EXIT_FAILURE, "slave pty name undefined");
- pts = open(ptsdev, O_RDWR);
- if(pts == -1)
- err(EXIT_FAILURE, "cannot open slave pty");
- }
- else
- err(EXIT_FAILURE, "cannot open pty");
-#endif
-}
diff -r a2d8de1edfaa -r c4a9925f88ba std.c
--- a/std.c Mon Jul 21 09:25:47 2008 +0200
+++ b/std.c Mon Jul 21 10:34:02 2008 +0200
@@ -3,6 +3,10 @@
 #include <sys/wait.h>
 #include <ctype.h>
 #include <err.h>
+#include <fcntl.h>
+#if !(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600)
+#include <pty.h>
+#endif
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -17,7 +21,7 @@
 static void buffer(char c);
 static void cmd(const char *cmdstr, ...);
 static int getch();
-void getpty(void);
+static void getpty(void);
 static void movea(int x, int y);
 static void mover(int x, int y);
 static void parseesc(void);
@@ -41,7 +45,7 @@
 static int cols = 80, lines = 25;
 static int cx = 0, cy = 0;
 static int c;
-int ptm, pts;
+static int ptm, pts;
 static _Bool bold, digit, qmark;
 static pid_t pid;
 static RingBuffer buf;
@@ -208,6 +212,38 @@
 }
 
 void
+getpty(void) {
+ char *ptsdev;
+
+#if defined(_GNU_SOURCE)
+ ptm = getpt();
+#elif _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600
+ ptm = posix_openpt(O_RDWR);
+#else
+ ptm = open("/dev/ptmx", O_RDWR);
+ if(ptm == -1)
+ if(openpty(&ptm, &pts, NULL, NULL, NULL) == -1)
+ err(EXIT_FAILURE, "cannot open pty");
+#endif
+#if defined(_XOPEN_SOURCE)
+ if(ptm != -1) {
+ if(grantpt(ptm) == -1)
+ err(EXIT_FAILURE, "cannot grant access to pty");
+ if(unlockpt(ptm) == -1)
+ err(EXIT_FAILURE, "cannot unlock pty");
+ ptsdev = ptsname(ptm);
+ if(!ptsdev)
+ err(EXIT_FAILURE, "slave pty name undefined");
+ pts = open(ptsdev, O_RDWR);
+ if(pts == -1)
+ err(EXIT_FAILURE, "cannot open slave pty");
+ }
+ else
+ err(EXIT_FAILURE, "cannot open pty");
+#endif
+}
+
+void
 shell(void) {
         static char *shell = NULL;
 
Received on Thu Aug 07 2008 - 00:21:21 UTC