提交: a23dffc1e8c1b95e34d2c6d5b78aa32b7458b38b - ttyrec (git)

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

Commit MetaInfo

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

Log Message

update to ttyrec-1.0.1

Change Summary

• modified: Makefile
• modified: README
• modified: ttyplay.c

差異

--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
 CFLAGS = -O2
-VERSION = 1.0
+VERSION = 1.0.1
 
 TARGET = ttyrec ttyplay
 

--- a/README
+++ b/README
@@ -5,7 +5,7 @@ Usage:
   % ttyrec
   (In the excuted shell, do whatever you want and exit)
 
-  % ttyplay < ttyrecord
+  % ttyplay ttyrecord
 
 Have fun!
 

--- a/ttyplay.c
+++ b/ttyplay.c
@@ -36,14 +36,16 @@
 #include <assert.h>
 #include <unistd.h>
 #include <sys/time.h>
+#include <errno.h>
+#include <string.h>
 
 #include "ttyrec.h"
 
-typedef void (*WaitFunc) (struct timeval prev, 
-			  struct timeval cur, 
-			  double speed);
-typedef int (*ReadFunc) (Header *h, char **buf);
-typedef void (*WriteFunc) (char *buf, int len);
+typedef void	(*WaitFunc)	(struct timeval prev, 
+				 struct timeval cur, 
+				 double speed);
+typedef int	(*ReadFunc)	(FILE *fp, Header *h, char **buf);
+typedef void	(*WriteFunc)	(char *buf, int len);
 
 struct timeval
 timeval_diff (struct timeval tv1, struct timeval tv2)
@@ -78,9 +80,9 @@ ttynowait (struct timeval prev, struct timeval cur, double speed)
 }
 
 int
-ttyread (Header *h, char **buf)
+ttyread (FILE *fp, Header *h, char **buf)
 {
-    if (fread(h, sizeof(Header), 1, stdin) == 0) {
+    if (fread(h, sizeof(Header), 1, fp) == 0) {
 	return 0;
     }
 
@@ -89,21 +91,21 @@ ttyread (Header *h, char **buf)
 	perror("malloc");
     }
 	
-    if (fread(*buf, 1, h->len, stdin) == 0) {
+    if (fread(*buf, 1, h->len, fp) == 0) {
 	perror("fread");
     }
     return 1;
 }
 
 int
-ttypread (Header *h, char **buf)
+ttypread (FILE *fp, Header *h, char **buf)
 {
     /*
      * Read persistently just like tail -f.
      */
-    while (ttyread(h, buf) == 0) {
+    while (ttyread(fp, h, buf) == 0) {
 	usleep(250000);
-	clearerr(stdin);
+	clearerr(fp);
     }
     return 1;
 }
@@ -121,20 +123,20 @@ ttynowrite (char *buf, int len)
 }
 
 void
-ttyplay (double speed, ReadFunc read_func, 
+ttyplay (FILE *fp, double speed, ReadFunc read_func, 
 	 WriteFunc write_func, WaitFunc wait_func)
 {
     int first_time = 1;
     struct timeval prev;
 
     setbuf(stdout, NULL);
-    setbuf(stdin, NULL);
+    setbuf(fp, NULL);
 
     while (1) {
 	char *buf;
 	Header h;
 
-	if (read_func(&h, &buf) == 0) {
+	if (read_func(fp, &h, &buf) == 0) {
 	    break;
 	}
 
@@ -150,20 +152,59 @@ ttyplay (double speed, ReadFunc read_func,
 }
 
 void
-ttyskipall (void)
+ttyskipall (FILE *fp)
 {
     /*
      * Skip all records.
      */
-    ttyplay(0, ttyread, ttynowrite, ttynowait);
+    ttyplay(fp, 0, ttyread, ttynowrite, ttynowait);
+}
+
+typedef void (*ProcessFunc) (FILE *fp, double speed, 
+			     ReadFunc read_func, WaitFunc wait_func);
+
+void ttyplayback (FILE *fp, double speed, 
+		  ReadFunc read_func, WaitFunc wait_func)
+{
+    ttyplay(fp, speed, ttyread, ttywrite, wait_func);
+}
+
+void ttypeek (FILE *fp, double speed, 
+	      ReadFunc read_func, WaitFunc wait_func)
+{
+    ttyskipall(fp);
+    ttyplay(fp, speed, ttypread, ttywrite, ttynowait);
+}
+
+
+void
+usage (void)
+{
+    printf("Usage: ttyplay [OPTION] [FILE]\n");
+    printf("  -s SPEED Set speed to SPEED [1.0]\n");
+    printf("  -n       No wait mode\n");
+    printf("  -p       Peek another person's ttyrecord\n");
+    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);
+    }
 }
 
 int 
 main (int argc, char **argv)
 {
     double speed = 1.0;
-    ReadFunc read_func = ttyread;
-    WaitFunc wait_func = ttywait;
+    ReadFunc read_func  = ttyread;
+    WaitFunc wait_func  = ttywait;
+    ProcessFunc process = ttyplayback;
+    FILE *input = stdin;
 
     while (1) {
         int ch = getopt(argc, argv, "s:np");
@@ -174,7 +215,7 @@ main (int argc, char **argv)
 	case 's':
 	    if (optarg == NULL) {
 		perror("-s option requires an argument");
-		exit(1);
+		exit(EXIT_FAILURE);
 	    }
 	    sscanf(optarg, "%lf", &speed);
 	    break;
@@ -182,20 +223,18 @@ main (int argc, char **argv)
 	    wait_func = ttynowait;
 	    break;
 	case 'p':
-	    ttyskipall();
-	    read_func = ttypread;
-	    wait_func = ttynowait;
+	    process = ttypeek;
 	    break;
 	default:
-	    printf("Usage: ttyplay [OPTION] < ttyrecord\n");
-	    printf("  -s SPEED Set speed to SPEED [1.0]\n");
-	    printf("  -n       No wait mode\n");
-	    printf("  -p       Peek another person's ttyrecord\n");
-	    exit(1);
+	    usage();
 	}
     }
 
-    ttyplay(speed, read_func, ttywrite, wait_func);
+    if (optind < argc) {
+	input = efopen(argv[optind], "r");
+    }
+
+    process(input, speed, read_func, wait_func);
 
     return 0;
 }