From 425355e88d9a8e82379028930d5eca82ac450e5b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 8 Apr 2009 22:26:25 +0300 Subject: Rename movie.c -> movie_play.c The program can only be called as movie_play or movie2ascii, so there is little point to keep the executable as "movie". Besides that, such generic name as "movie" could cause name clashes in Linux distros. diff --git a/.gitignore b/.gitignore index c3e4579..01dbfc5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ depcomp follow install-sh missing -movie +movie_play muc powwow powwow.6 diff --git a/ChangeLog b/ChangeLog index b70539a..800a043 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2009-04-08 kalev + * Rename movie.c -> movie_play.c * Add a configure option to select plugin directory. * configure.in: Display summary at the end of configure run. * cmd2.c: Move aliases/actions back to default group if it was diff --git a/Makefile.am b/Makefile.am index 151acef..e930cbd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Default help file directory AM_CFLAGS=-DPOWWOW_DIR=\"$(pkgdatadir)\" -DPLUGIN_DIR=\"$(plugindir)\" -bin_PROGRAMS = powwow muc catrw follow movie +bin_PROGRAMS = powwow muc catrw follow movie_play powwow_SOURCES = beam.c cmd.c log.c edit.c cmd2.c eval.c \ utils.c main.c tcp.c list.c map.c tty.c \ ptr.c @@ -11,7 +11,7 @@ powwow_HEADERS = beam.h cmd.h log.h edit.h cmd2.h eval.h \ utils.h main.h tcp.h list.h map.h tty.h \ ptr.h defines.h muc_SOURCES = muc.c -movie_SOURCES = movie.c +movie_play_SOURCES = movie_play.c follow_SOURCES = follow.c catrw_SOURCES = catrw.c diff --git a/movie.c b/movie.c deleted file mode 100644 index e88d5ee..0000000 --- a/movie.c +++ /dev/null @@ -1,93 +0,0 @@ -/* - * movie.c -- replay powwow movies or convert them into ASCII - * - * This file is placed in the public domain. - */ - -#include -#include -#include -#include -#include -#include - -void millisec_sleep(msec) -long msec; -{ - struct timeval t; - t.tv_sec = msec / 1000; - t.tv_usec = (msec % 1000) * 1000; - select(0, NULL, NULL, NULL, &t); -} - -int main(argc, argv) -int argc; char *argv[]; -{ - FILE *infile, *outfile; - char buf[4096]; - int i, play = 0; - - if (strstr(argv[0], "movie_play")) - play = 1; - else if (!strstr(argv[0], "movie2ascii")) { - fprintf(stderr, "Please run this program as \"movie_play\" or \"movie2ascii\"\n"); - return 1; - } - - if (play) { - if (argc == 2) { - infile = fopen(argv[1], "rb"); - outfile = stdout; - if (infile == NULL) { - fprintf(stderr, "Error opening input file \"%s\"\n", argv[1]); - return 1; - } - } else { - infile = stdin; - outfile = stdout; - } - } else { - if (argc == 3) { - infile = fopen(argv[1], "rb"); - outfile = fopen(argv[2], "wb"); - if (infile == NULL) { - fprintf(stderr, "Error opening input file \"%s\"\n", argv[1]); - return 1; - } - if (outfile == NULL) { - fprintf(stderr, "Error opening output file \"%s\"\n", argv[2]); - return 1; - } - } else { - fprintf(stderr, "Usage: %s [infile [outfile]]\n", argv[0]); - return 1; - } - } - - while (fgets(buf, 4096, infile) != NULL) { - i = strlen(buf); - if (i > 0 && buf[i-1] == '\n') - buf[i-1] = '\0'; - if (!strncmp(buf, "sleep ", 6)) { - if (play) - millisec_sleep(atoi(buf + 6)); - } - else if (!strncmp(buf, "line ", 5)) - fprintf(outfile, "%s\n", buf + 5); - else if (!strncmp(buf, "prompt ", 7)) - fprintf(outfile, "%s", buf + 7); - else { - fprintf(stderr, "Syntax error in line:\n%s\n", buf); - return 1; - } - fflush(outfile); - } - if (feof(infile)) { - fprintf(outfile, "\n"); - return 0; - } else { - fprintf(stderr, "Error reading file\n"); - return 1; - } -} - diff --git a/movie_play.c b/movie_play.c new file mode 100644 index 0000000..c095137 --- /dev/null +++ b/movie_play.c @@ -0,0 +1,93 @@ +/* + * movie_play.c -- replay powwow movies or convert them into ASCII + * + * This file is placed in the public domain. + */ + +#include +#include +#include +#include +#include +#include + +void millisec_sleep(msec) +long msec; +{ + struct timeval t; + t.tv_sec = msec / 1000; + t.tv_usec = (msec % 1000) * 1000; + select(0, NULL, NULL, NULL, &t); +} + +int main(argc, argv) +int argc; char *argv[]; +{ + FILE *infile, *outfile; + char buf[4096]; + int i, play = 0; + + if (strstr(argv[0], "movie_play")) + play = 1; + else if (!strstr(argv[0], "movie2ascii")) { + fprintf(stderr, "Please run this program as \"movie_play\" or \"movie2ascii\"\n"); + return 1; + } + + if (play) { + if (argc == 2) { + infile = fopen(argv[1], "rb"); + outfile = stdout; + if (infile == NULL) { + fprintf(stderr, "Error opening input file \"%s\"\n", argv[1]); + return 1; + } + } else { + infile = stdin; + outfile = stdout; + } + } else { + if (argc == 3) { + infile = fopen(argv[1], "rb"); + outfile = fopen(argv[2], "wb"); + if (infile == NULL) { + fprintf(stderr, "Error opening input file \"%s\"\n", argv[1]); + return 1; + } + if (outfile == NULL) { + fprintf(stderr, "Error opening output file \"%s\"\n", argv[2]); + return 1; + } + } else { + fprintf(stderr, "Usage: %s [infile [outfile]]\n", argv[0]); + return 1; + } + } + + while (fgets(buf, 4096, infile) != NULL) { + i = strlen(buf); + if (i > 0 && buf[i-1] == '\n') + buf[i-1] = '\0'; + if (!strncmp(buf, "sleep ", 6)) { + if (play) + millisec_sleep(atoi(buf + 6)); + } + else if (!strncmp(buf, "line ", 5)) + fprintf(outfile, "%s\n", buf + 5); + else if (!strncmp(buf, "prompt ", 7)) + fprintf(outfile, "%s", buf + 7); + else { + fprintf(stderr, "Syntax error in line:\n%s\n", buf); + return 1; + } + fflush(outfile); + } + if (feof(infile)) { + fprintf(outfile, "\n"); + return 0; + } else { + fprintf(stderr, "Error reading file\n"); + return 1; + } +} + -- cgit v0.10.2