提交: b684765cd88bdbfb09262ed904bbc41b9942af3d - ttyrec (git)

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

Commit MetaInfo

• 修訂: b684765cd88bdbfb09262ed904bbc41b9942af3d (tree)
• 時間: 2019-12-09 16:16:31
• 作者: IWAMOTO Kouichi <sue@iwmt...>
• Commiter: IWAMOTO Kouichi

Log Message

update to ttyrec-1.0.6

Change Summary

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

差異

--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 CC = gcc
 CFLAGS = -O2
-VERSION = 1.0.5
+VERSION = 1.0.6
 
 TARGET = ttyrec ttyplay ttytime
 
 DIST =	ttyrec.c ttyplay.c ttyrec.h io.c io.h ttytime.c\
-	README Makefile ttyrec.1 ttyplay.1
+	README Makefile ttyrec.1 ttyplay.1 ttytime.1
 
 all: $(TARGET)
 

--- a/io.c
+++ b/io.c
@@ -109,12 +109,19 @@ write_header (FILE *fp, Header *h)
     return 1;
 }
 
+static char *progname = "";
+void
+set_progname (const char *name)
+{
+    progname = strdup(name);
+}
+
 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));
+	fprintf(stderr, "%s: %s: %s\n", progname, path, strerror(errno));
 	exit(EXIT_FAILURE);
     }
     return fp;

--- a/ttyplay.1
+++ b/ttyplay.1
@@ -1,6 +1,9 @@
+.\"
+.\" This manual page is written by NAKANO Takeo <[e-mail]>
+.\"
 .TH TTYPLAY 1
 .SH NAME
-ttyplay \- a player of the tty session recorded by ttyrec
+ttyplay \- player of the tty session recorded by ttyrec
 .SH SYNOPSIS
 .br
 .B ttyplay
@@ -22,6 +25,22 @@ output the
 as it grows.
 It means that you can see the "live" shell session 
 running by another user.
+.PP
+If you hit any key during playback, it will go right to the next
+character typed.  This is handy when examining sessions where a user
+spends a lot of time at a prompt.
+.PP
+Additionally, there are some special keys defined:
+.TP
+.BI + " or " f
+ double the speed of playback.
+.TP
+.BI \- " or " s
+ halve the speed of playback.
+.TP
+.BI 1
+set playback to speed 1.0 again.
+
 .SH OPTIONS
 .TP
 .BI \-s " SPEED"
@@ -38,8 +57,6 @@ Ignore the timing information in
 peek another person's tty session.
 .SH "SEE ALSO"
 .BR script (1),
-.BR ttyrec (1)
-.SH AUTHOR
-This manual page is written by NAKANO Takeo <[e-mail]>
-for the Debian GNU/Linux system (but may be used by others).
+.BR ttyrec (1),
+.BR ttytime (1)
 

--- a/ttyplay.c
+++ b/ttyplay.c
@@ -35,13 +35,14 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <unistd.h>
+#include <termios.h>
 #include <sys/time.h>
 #include <string.h>
 
 #include "ttyrec.h"
 #include "io.h"
 
-typedef void	(*WaitFunc)	(struct timeval prev, 
+typedef double	(*WaitFunc)	(struct timeval prev, 
 				 struct timeval cur, 
 				 double speed);
 typedef int	(*ReadFunc)	(FILE *fp, Header *h, char **buf);
@@ -52,38 +53,66 @@ typedef void	(*ProcessFunc)	(FILE *fp, double speed,
 struct timeval
 timeval_diff (struct timeval tv1, struct timeval tv2)
 {
-    struct timeval tv;
+    struct timeval diff;
 
-    tv.tv_sec = tv2.tv_sec - tv1.tv_sec;
-    tv.tv_usec = tv2.tv_usec - tv1.tv_usec;
-    if (tv.tv_usec < 0) {
-	tv.tv_sec--;
-	tv.tv_usec += 1000000;
+    diff.tv_sec = tv2.tv_sec - tv1.tv_sec;
+    diff.tv_usec = tv2.tv_usec - tv1.tv_usec;
+    if (diff.tv_usec < 0) {
+	diff.tv_sec--;
+	diff.tv_usec += 1000000;
     }
 
-    return tv;
+    return diff;
 }
 
-void
+struct timeval
+timeval_div (struct timeval tv1, double n)
+{
+    double x = ((double)tv1.tv_sec  + (double)tv1.tv_usec / 1000000.0) / n;
+    struct timeval div;
+    
+    div.tv_sec  = (int)x;
+    div.tv_usec = (x - (int)x) * 1000000;
+
+    return div;
+}
+
+double
 ttywait (struct timeval prev, struct timeval cur, double speed)
 {
     struct timeval diff = timeval_diff(prev, cur);
+    fd_set readfs;
 
     assert(speed != 0);
+    diff = timeval_div(diff, speed);
 
-    /*
-     * Use select instead of sleep and usleep because some
-     * systems don't support usleep.
-     */
-    diff.tv_sec  /= speed;
-    diff.tv_usec /= speed;
-    select(0, NULL, NULL, NULL, &diff);
+    FD_SET(STDIN_FILENO, &readfs);
+    select(1, &readfs, NULL, NULL, &diff); /* skip if a user hits any key */
+    if (FD_ISSET(0, &readfs)) { /* a user hits a character? */
+        char c;
+        read(STDIN_FILENO, &c, 1); /* drain the character */
+        switch (c) {
+        case '+':
+        case 'f':
+            speed *= 2;
+            break;
+        case '-':
+        case 's':
+            speed /= 2;
+            break;
+        case '1':
+            speed = 1.0;
+            break;
+        }
+    }
+    return speed;
 }
 
-void
+double
 ttynowait (struct timeval prev, struct timeval cur, double speed)
 {
     /* do nothing */
+    return 0; /* Speed isn't important. */
 }
 
 int
@@ -149,7 +178,7 @@ ttyplay (FILE *fp, double speed, ReadFunc read_func,
 	}
 
 	if (!first_time) {
-	    wait_func(prev, h.tv, speed);
+	    speed = wait_func(prev, h.tv, speed);
 	}
 	first_time = 0;
 
@@ -200,7 +229,9 @@ main (int argc, char **argv)
     WaitFunc wait_func  = ttywait;
     ProcessFunc process = ttyplayback;
     FILE *input = stdin;
+    struct termios old, new;
 
+    set_progname(argv[0]);
     while (1) {
         int ch = getopt(argc, argv, "s:np");
         if (ch == EOF) {
@@ -229,7 +260,13 @@ main (int argc, char **argv)
 	input = efopen(argv[optind], "r");
     }
 
+    tcgetattr(0, &old); /* Get current terminal state */
+    new = old;          /* Make a copy */
+    new.c_lflag &= ~(ICANON | ECHO | ECHONL); /* unbuffered, no echo */
+    tcsetattr(0, TCSANOW, &new); /* Make it current */
+
     process(input, speed, read_func, wait_func);
+    tcsetattr(0, TCSANOW, &old);  /* Return terminal state */
 
     return 0;
 }

--- a/ttyrec.1
+++ b/ttyrec.1
@@ -1,10 +1,13 @@
+.\"
+.\" This manual page is written by NAKANO Takeo <[e-mail]>
+.\"
 .TH TTYREC 1
 .SH NAME
 ttyrec \- a tty recorder
 .SH SYNOPSIS
 .br
 .B ttyrec
-.I "[\-a] [file]"
+.I "[\-a][\-u] [file]"
 .br
 .SH DESCRIPTION
 .B Ttyrec
@@ -32,6 +35,27 @@ Append the output to
 or
 .IR ttyrecord ,
 rather than overwriting it.
+.TP
+.B \-u
+With this option,
+.B ttyrec
+automatically calls
+.BR uudecode (1)
+and saves its output when uuencoded data appear on the session.
+It allow you to transfer files from remote host.
+You can call
+.B ttyrec
+with this option, login to the remote host
+and invoke
+.BR uuencode (1)
+on it for the file you want to transfer.
+.TP
+.BI \-e " command"
+Invoke 
+.I command
+when ttyrec starts.
+
+
 .SH ENVIRONMENT
 .TP
 .I SHELL
@@ -45,8 +69,8 @@ the Bourne shell is assumed.
 (Most shells set this variable automatically).
 .SH "SEE ALSO"
 .BR script (1),
-.BR ttyplay (1)
-.SH AUTHOR
-This manual page is written by NAKANO Takeo <[e-mail]>
-for the Debian GNU/Linux system (but may be used by others).
+.BR ttyplay (1),
+.BR ttytime (1),
+.BR uuencode (1),
+.BR uudecode (1)
 

--- a/ttyrec.c
+++ b/ttyrec.c
@@ -50,19 +50,15 @@
 #include <sys/file.h>
 #include <sys/signal.h>
 #include <stdio.h>
+#include <unistd.h>
+#include <string.h>
 
 #if defined(SVR4)
 #include <stdlib.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <stropts.h>
 #endif /* SVR4 */
 
-#ifdef __linux__
-#include <unistd.h>
-#include <string.h>
-#endif
-
 #include <sys/time.h>
 #include "ttyrec.h"
 #include "io.h"
@@ -94,7 +90,7 @@ void getmaster(void);
 void getslave(void);
 void doinput(void);
 void dooutput(void);
-void doshell(void);
+void doshell(const char*);
 
 char	*shell;
 FILE	*fscript;
@@ -125,8 +121,9 @@ main(argc, argv)
 	int ch;
 	void finish();
 	char *getenv();
+	char *command = NULL;
 
-	while ((ch = getopt(argc, argv, "auh?")) != EOF)
+	while ((ch = getopt(argc, argv, "aue:h?")) != EOF)
 		switch((char)ch) {
 		case 'a':
 			aflg++;
@@ -134,10 +131,13 @@ main(argc, argv)
 		case 'u':
 		        uflg++;
 			break;
+		case 'e':
+			command = strdup(optarg);
+			break;
 		case 'h':
 		case '?':
 		default:
-			fprintf(stderr, _("usage: ttyrec [-u] [-a] [file]\n"));
+			fprintf(stderr, _("usage: ttyrec [-u] [-e command] [-a] [file]\n"));
 			exit(1);
 		}
 	argc -= optind;
@@ -175,7 +175,7 @@ main(argc, argv)
 		if (child)
 			dooutput();
 		else
-			doshell();
+			doshell(command);
 	}
 	doinput();
 
@@ -306,7 +306,7 @@ dooutput()
 }
 
 void
-doshell()
+doshell(const char* command)
 {
 	/***
 	int t;
@@ -325,8 +325,11 @@ doshell()
 	(void) dup2(slave, 2);
 	(void) close(slave);
 
-	execl(shell, strrchr(shell, '/') + 1, "-i", 0);
-
+	if (!command) {
+		execl(shell, strrchr(shell, '/') + 1, "-i", 0);
+	} else {
+		execl(shell, strrchr(shell, '/') + 1, "-c", command, 0);	
+	}
 	perror(shell);
 	fail();
 }

--- /dev/null
+++ b/ttytime.1
@@ -0,0 +1,27 @@
+.\"
+.\" This manual page is written by NAKANO Takeo <[e-mail]>
+.\"
+.TH TTYTIME 1
+.SH NAME
+ttytime \- print the time of the recorded session data by ttyrec(1)
+.SH SYNOPSIS
+.br
+.B ttytime
+.I file...
+.SH DESCRIPTION
+.B Ttytime
+tells you the time of recorded data in seconds.
+For example:
+.sp
+.RS
+.nf
+% ttytime *.tty
+    173 foo.tty
+   1832 bar.tty
+.fi
+.RE
+.SH "SEE ALSO"
+.BR script (1),
+.BR ttyrec (1),
+.BR ttyplay (1)
+

--- a/ttytime.c
+++ b/ttytime.c
@@ -61,6 +61,7 @@ int
 main (int argc, char **argv)
 {
     int i;
+    set_progname(argv[0]);
     for (i = 1; i < argc; i++) {
 	char *filename = argv[i];
 	printf("%7d	%s\n", calc_time(filename), filename);