Commit: 096ae3f3ac526c2e914897d551d26d520ff8d6ee - ttyrec (git)

ttyrecのfork. Original: http://0xcc.net/ttyrec/

Commit MetaInfo

• Revisão: 096ae3f3ac526c2e914897d551d26d520ff8d6ee (tree)
• Hora: 2019-12-09 16:23:30
• Autor: IWAMOTO Kouichi <sue@iwmt...>
• Commiter: IWAMOTO Kouichi

Mensagem de Log

update to ttyrec-1.0.7

Mudança Sumário

• modified: Makefile
• modified: README
• modified: io.c
• modified: io.h
• modified: ttyplay.c
• modified: ttyrec.c

Diff

--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
 CFLAGS = -O2
-VERSION = 1.0.6
+VERSION = 1.0.7
 
 TARGET = ttyrec ttyplay ttytime
 

--- a/README
+++ b/README
@@ -8,6 +8,13 @@ or if your system is SVR4 system (Solaris etc.),
 
   % make CFLAGS=-DSVR4
 
+or if your system supports getpt(3),
+
+  % make CFLAGS=-DHAVE_getpt
+
+HAVE_getpt is required if your linux system uses devfs.
+
+
 Usage:
 
   % ttyrec

--- a/io.c
+++ b/io.c
@@ -31,11 +31,12 @@
  * SUCH DAMAGE.
  */
 
+#include <assert.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 #include <string.h>
-#include <errno.h>
+#include <unistd.h>
 
 #include "ttyrec.h"
 
@@ -127,3 +128,34 @@ efopen (const char *path, const char *mode)
     return fp;
 }
 
+int
+edup (int oldfd)
+{
+    int fd = dup(oldfd);
+    if (fd == -1) {
+	fprintf(stderr, "%s: dup failed: %s\n", progname, strerror(errno));
+	exit(EXIT_FAILURE);
+    }
+    return fd;
+}
+
+int
+edup2 (int oldfd, int newfd)
+{
+    int fd = dup2(oldfd, newfd);
+    if (fd == -1) {
+	fprintf(stderr, "%s: dup2 failed: %s\n", progname, strerror(errno));
+	exit(EXIT_FAILURE);
+    }
+    return fd;
+}
+
+FILE *
+efdopen (int fd, const char *mode)
+{
+    FILE *fp = fdopen(fd, mode);
+    if (fp == NULL) {
+	fprintf(stderr, "%s: fdopen failed: %s\n", progname, strerror(errno));
+	exit(EXIT_FAILURE);
+    }
+}

--- a/io.h
+++ b/io.h
@@ -3,8 +3,11 @@
 
 #include "ttyrec.h"
 
-int	read_header	(FILE *fp, Header *h);
-int	write_header	(FILE *fp, Header *h);
-FILE*	efopen		(const char *path, const char *mode);
+int     read_header     (FILE *fp, Header *h);
+int     write_header    (FILE *fp, Header *h);
+FILE*   efopen          (const char *path, const char *mode);
+int     edup            (int oldfd);
+int     edup2           (int oldfd, int newfd);
+FILE*   efdopen         (int fd, const char *mode);
 
 #endif

--- a/ttyplay.c
+++ b/ttyplay.c
@@ -221,6 +221,19 @@ usage (void)
     exit(EXIT_FAILURE);
 }
 
+/*
+ * We do some tricks so that select(2) properly works on
+ * STDIN_FILENO in ttywait().
+ */
+FILE *
+input_from_stdin (void)
+{
+    FILE *fp;
+    int fd = edup(STDIN_FILENO);
+    edup2(STDOUT_FILENO, STDIN_FILENO);
+    return efdopen(fd, "r");
+}
+
 int 
 main (int argc, char **argv)
 {
@@ -228,7 +241,7 @@ main (int argc, char **argv)
     ReadFunc read_func  = ttyread;
     WaitFunc wait_func  = ttywait;
     ProcessFunc process = ttyplayback;
-    FILE *input = stdin;
+    FILE *input = NULL;
     struct termios old, new;
 
     set_progname(argv[0]);
@@ -258,7 +271,10 @@ main (int argc, char **argv)
 
     if (optind < argc) {
 	input = efopen(argv[optind], "r");
+    } else {
+        input = input_from_stdin();
     }
+    assert(input != NULL);
 
     tcgetattr(0, &old); /* Get current terminal state */
     new = old;          /* Make a copy */

--- a/ttyrec.c
+++ b/ttyrec.c
@@ -400,6 +400,12 @@ getmaster()
 		fail();
 	}
 #else
+#ifdef HAVE_getpt
+	if ((master = getpt()) < 0) {
+		perror("getpt()");
+		fail();
+	}
+#else
 	char *pty, *bank, *cp;
 	struct stat stb;
 
@@ -432,6 +438,7 @@ getmaster()
 	}
 	fprintf(stderr, _("Out of pty's\n"));
 	fail();
+#endif /* not HAVE_getpt */
 #endif /* not HAVE_openpty */
 #endif /* !SVR4 */
 }