コミット: 10e4127d9dfdd87619997c03b4fbe0b835adbc93 - ttyrec (git)

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

コミットメタ情報

• リビジョン: 10e4127d9dfdd87619997c03b4fbe0b835adbc93 (tree)
• 日時: 2019-12-09 16:15:15
• 作者: IWAMOTO Kouichi <sue@iwmt...>
• コミッター: IWAMOTO Kouichi

ログメッセージ

update to ttyrec-1.0.5

変更サマリ

• modified: Makefile
• modified: io.c
• modified: io.h
• modified: ttyplay.c
• modified: ttyrec.c
• add: ttytime.c

差分

--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
 CC = gcc
 CFLAGS = -O2
-VERSION = 1.0.4
+VERSION = 1.0.5
 
-TARGET = ttyrec ttyplay
+TARGET = ttyrec ttyplay ttytime
 
-DIST = ttyrec.c ttyplay.c ttyrec.h io.c io.h README Makefile ttyrec.1 ttyplay.1
+DIST =	ttyrec.c ttyplay.c ttyrec.h io.c io.h ttytime.c\
+	README Makefile ttyrec.1 ttyplay.1
 
 all: $(TARGET)
 
@@ -14,6 +15,9 @@ ttyrec: ttyrec.o io.o
 ttyplay: ttyplay.o io.o
 	$(CC) $(CFLAGS) -o ttyplay ttyplay.o io.o
 
+ttytime: ttytime.o io.o
+	$(CC) $(CFLAGS) -o ttytime ttytime.o io.o
+
 clean:
 	rm -f *.o $(TARGET) ttyrecord *~
 

--- a/io.c
+++ b/io.c
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
+#include <errno.h>
 
 #include "ttyrec.h"
 
@@ -108,3 +109,14 @@ write_header (FILE *fp, Header *h)
     return 1;
 }
 
+FILE *
+efopen (const char *path, const char *mode)
+{
+    FILE *fp = fopen(path, mode);
+    if (fp == NULL) {
+	fprintf(stderr, "ttyplay: %s: %s\n", path, strerror(errno));
+	exit(EXIT_FAILURE);
+    }
+    return fp;
+}
+

--- a/io.h
+++ b/io.h
@@ -5,5 +5,6 @@
 
 int	read_header	(FILE *fp, Header *h);
 int	write_header	(FILE *fp, Header *h);
+FILE*	efopen		(const char *path, const char *mode);
 
 #endif

--- a/ttyplay.c
+++ b/ttyplay.c
@@ -36,7 +36,6 @@
 #include <assert.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include <errno.h>
 #include <string.h>
 
 #include "ttyrec.h"
@@ -193,17 +192,6 @@ usage (void)
     exit(EXIT_FAILURE);
 }
 
-FILE *
-efopen (const char *path, const char *mode)
-{
-    FILE *fp = fopen(path, mode);
-    if (fp == NULL) {
-	fprintf(stderr, "ttyplay: %s: %s\n", path, strerror(errno));
-	exit(EXIT_FAILURE);
-    }
-    return fp;
-}
-
 int 
 main (int argc, char **argv)
 {

--- a/ttyrec.c
+++ b/ttyrec.c
@@ -77,6 +77,16 @@
 #include <libutil.h>
 #endif
 
+#if defined(SVR4) && !defined(CDEL)
+#if defined(_POSIX_VDISABLE)
+#define CDEL _POSIX_VDISABLE
+#elif defined(CDISABLE)
+#define CDEL CDISABLE
+#else /* not _POSIX_VISIBLE && not CDISABLE */
+#define CDEL 255
+#endif /* not _POSIX_VISIBLE && not CDISABLE */
+#endif /* SVR4 && ! CDEL */
+
 void done(void);
 void fail(void);
 void fixtty(void);
@@ -104,6 +114,7 @@ char	line[] = "/dev/ptyXX";
 #endif
 #endif /* !SVR4 */
 int	aflg;
+int	uflg;
 
 int
 main(argc, argv)
@@ -115,14 +126,18 @@ main(argc, argv)
 	void finish();
 	char *getenv();
 
-	while ((ch = getopt(argc, argv, "a")) != EOF)
+	while ((ch = getopt(argc, argv, "auh?")) != EOF)
 		switch((char)ch) {
 		case 'a':
 			aflg++;
 			break;
+		case 'u':
+		        uflg++;
+			break;
+		case 'h':
 		case '?':
 		default:
-			fprintf(stderr, _("usage: script [-a] [file]\n"));
+			fprintf(stderr, _("usage: ttyrec [-u] [-a] [file]\n"));
 			exit(1);
 		}
 	argc -= optind;
@@ -203,6 +218,63 @@ finish()
 		done();
 }
 
+struct linebuf {
+    char str[BUFSIZ + 1]; /* + 1 for an additional NULL character.*/
+    int len;
+};
+
+
+void
+check_line (const char *line)
+{
+    static int uuencode_mode = 0;
+    static FILE *uudecode;
+
+    if (uuencode_mode == 1) {
+	fprintf(uudecode, "%s", line);
+	if (strcmp(line, "end\n") == 0) {
+	    pclose(uudecode);
+	    uuencode_mode = 0;
+	}
+    } else {
+	int dummy; char dummy2[BUFSIZ];
+	if (sscanf(line, "begin %o %s", &dummy, dummy2) == 2) {
+	    /* 
+	     * uuencode line found! 
+	     */
+	    uudecode = popen("uudecode", "w");
+	    fprintf(uudecode, "%s", line);
+	    uuencode_mode = 1;
+	}
+    }
+}
+
+void
+check_output(const char *str, int len)
+{
+    static struct linebuf lbuf = {"", 0};
+    int i;
+
+    for (i = 0; i < len; i++) {
+	if (lbuf.len < BUFSIZ) {
+	    lbuf.str[lbuf.len] = str[i];
+	    if (lbuf.str[lbuf.len] == '\r') {
+		lbuf.str[lbuf.len] = '\n';
+	    }
+	    lbuf.len++;
+	    if (lbuf.str[lbuf.len - 1] == '\n') {
+		if (lbuf.len > 1) { /* skip a blank line. */
+		    lbuf.str[lbuf.len] = '\0';
+		    check_line(lbuf.str);
+		}
+		lbuf.len = 0;
+	    }
+	} else {/* buffer overflow */
+	    lbuf.len = 0;
+	}
+    }
+}
+
 void
 dooutput()
 {
@@ -222,6 +294,8 @@ dooutput()
 		cc = read(master, obuf, BUFSIZ);
 		if (cc <= 0)
 			break;
+		if (uflg)
+		    check_output(obuf, cc);
 		h.len = cc;
 		gettimeofday(&h.tv, NULL);
 		(void) write(1, obuf, cc);
@@ -370,19 +444,23 @@ getslave()
 		perror("open(fd, O_RDWR)");
 		fail();
 	}
-	if (ioctl(slave, I_PUSH, "ptem") < 0) {
-		perror("ioctl(fd, I_PUSH, ptem)");
-		fail();
-	}
-	if (ioctl(slave, I_PUSH, "ldterm") < 0) {
-		perror("ioctl(fd, I_PUSH, ldterm)");
-		fail();
-	}
-	if (ioctl(slave, I_PUSH, "ttcompat") < 0) {
-		perror("ioctl(fd, I_PUSH, ttcompat)");
-		fail();
+	if (isastream(slave)) {
+		if (ioctl(slave, I_PUSH, "ptem") < 0) {
+			perror("ioctl(fd, I_PUSH, ptem)");
+			fail();
+		}
+		if (ioctl(slave, I_PUSH, "ldterm") < 0) {
+			perror("ioctl(fd, I_PUSH, ldterm)");
+			fail();
+		}
+#ifndef _HPUX_SOURCE
+		if (ioctl(slave, I_PUSH, "ttcompat") < 0) {
+			perror("ioctl(fd, I_PUSH, ttcompat)");
+			fail();
+		}
+#endif
+		(void) ioctl(0, TIOCGWINSZ, (char *)&win);
 	}
-	(void) ioctl(0, TIOCGWINSZ, (char *)&win);
 #else /* !SVR4 */
 #ifndef HAVE_openpty
 	line[strlen("/dev/")] = 't';

--- /dev/null
+++ b/ttytime.c
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+
+#include "io.h"
+#include "ttyrec.h"
+
+int
+calc_time (const char *filename)
+{
+    Header start, end;
+    FILE *fp = efopen(filename, "r");
+
+    read_header(fp, &start);
+    fseek(fp, start.len, SEEK_CUR);
+    while (1) {
+	Header h;
+	if (read_header(fp, &h) == 0) {
+	    break;
+	}
+	end = h;
+	fseek(fp, h.len, SEEK_CUR);
+    }
+    return end.tv.tv_sec - start.tv.tv_sec;
+}
+
+int 
+main (int argc, char **argv)
+{
+    int i;
+    for (i = 1; i < argc; i++) {
+	char *filename = argv[i];
+	printf("%7d	%s\n", calc_time(filename), filename);
+    }
+    return 0;
+}