From 0f1159aa30b1879378a87418e13b5f48c1d893b2 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <nicolas@viennot.biz>
Date: Mon, 10 Jun 2013 22:29:13 -0400
Subject: [PATCH] tmate-server -> tmate-slave

---
 .gitignore                      |  2 +-
 Makefile.am                     | 42 ++++++++++++++++-----------------
 tmate-server.c => tmate-slave.c |  2 +-
 tmate.h                         |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)
 rename tmate-server.c => tmate-slave.c (98%)

diff --git a/.gitignore b/.gitignore
index 06b9396d..9cb8c4e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,6 @@ Makefile
 Makefile.in
 configure
 keys/
-tmate-server
+tmate-slave
 cscope.*
 tags
diff --git a/Makefile.am b/Makefile.am
index 3004ed89..ae66b225 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 # Obvious program stuff.
-bin_PROGRAMS = tmate-server
+bin_PROGRAMS = tmate-slave
 dist_man1_MANS = tmate.1
 
 # Distribution tarball options.
@@ -60,7 +60,7 @@ CFLAGS += -erroff=E_EMPTY_DECLARATION
 endif
 
 # List of sources.
-dist_tmate_server_SOURCES = \
+dist_tmate_slave_SOURCES = \
 	arguments.c \
 	attributes.c \
 	cfg.c \
@@ -177,7 +177,7 @@ dist_tmate_server_SOURCES = \
 	tmate-debug.c \
 	tmate-decoder.c \
 	tmate-encoder.c \
-	tmate-server.c \
+	tmate-slave.c \
 	tmate-ssh-client-pty.c \
 	tmate-ssh-client.c \
 	tmate-ssh-server.c \
@@ -192,60 +192,60 @@ dist_tmate_server_SOURCES = \
 	window.c \
 	xmalloc.c \
 	xterm-keys.c
-nodist_tmate_server_SOURCES = osdep-@PLATFORM@.c
+nodist_tmate_slave_SOURCES = osdep-@PLATFORM@.c
 
 # Pile in all the compat/ stuff that is needed.
 if NO_FORKPTY
-nodist_tmate_server_SOURCES += compat/forkpty-@PLATFORM@.c
+nodist_tmate_slave_SOURCES += compat/forkpty-@PLATFORM@.c
 endif
 if NO_IMSG
-nodist_tmate_server_SOURCES += compat/imsg.c compat/imsg-buffer.c
+nodist_tmate_slave_SOURCES += compat/imsg.c compat/imsg-buffer.c
 endif
 if NO_CLOSEFROM
-nodist_tmate_server_SOURCES += compat/closefrom.c
+nodist_tmate_slave_SOURCES += compat/closefrom.c
 endif
 if NO_DAEMON
-nodist_tmate_server_SOURCES += compat/daemon.c
+nodist_tmate_slave_SOURCES += compat/daemon.c
 endif
 if NO_SETENV
-nodist_tmate_server_SOURCES += compat/setenv.c
+nodist_tmate_slave_SOURCES += compat/setenv.c
 endif
 if NO_STRLCAT
-nodist_tmate_server_SOURCES += compat/strlcat.c
+nodist_tmate_slave_SOURCES += compat/strlcat.c
 endif
 if NO_STRLCPY
-nodist_tmate_server_SOURCES += compat/strlcpy.c
+nodist_tmate_slave_SOURCES += compat/strlcpy.c
 endif
 if NO_ASPRINTF
-nodist_tmate_server_SOURCES += compat/asprintf.c
+nodist_tmate_slave_SOURCES += compat/asprintf.c
 endif
 if NO_FGETLN
-nodist_tmate_server_SOURCES += compat/fgetln.c
+nodist_tmate_slave_SOURCES += compat/fgetln.c
 endif
 if NO_GETOPT
-nodist_tmate_server_SOURCES += compat/getopt.c
+nodist_tmate_slave_SOURCES += compat/getopt.c
 endif
 if NO_STRCASESTR
-nodist_tmate_server_SOURCES += compat/strcasestr.c
+nodist_tmate_slave_SOURCES += compat/strcasestr.c
 endif
 if NO_STRSEP
-nodist_tmate_server_SOURCES += compat/strsep.c
+nodist_tmate_slave_SOURCES += compat/strsep.c
 endif
 if NO_VIS
-nodist_tmate_server_SOURCES += compat/vis.c compat/unvis.c
+nodist_tmate_slave_SOURCES += compat/vis.c compat/unvis.c
 endif
 if NO_STRTONUM
-nodist_tmate_server_SOURCES += compat/strtonum.c
+nodist_tmate_slave_SOURCES += compat/strtonum.c
 endif
 if NO_B64_NTOP
-nodist_tmate_server_SOURCES += compat/b64_ntop.c
+nodist_tmate_slave_SOURCES += compat/b64_ntop.c
 endif
 
-tmate_server_LDADD = \
+tmate_slave_LDADD = \
 	libssh/build/src/libssh.a \
 	msgpack/src/.libs/libmsgpackc.a
 
-*.c: $(tmate_server_LDADD)
+*.c: $(tmate_slave_LDADD)
 
 libssh/build/src/libssh.a:
 	cd libssh/build && cmake .. -DWITH_SFTP=OFF -DWITH_SERVER=ON -DWITH_PCAP=OFF -DWITH_STATIC_LIB=ON
diff --git a/tmate-server.c b/tmate-slave.c
similarity index 98%
rename from tmate-server.c
rename to tmate-slave.c
index 6196629a..1a87e5d9 100644
--- a/tmate-server.c
+++ b/tmate-slave.c
@@ -55,7 +55,7 @@ get_full_path(const char *wd, const char *path)
 
 static void usage(void)
 {
-	fprintf(stderr, "usage: tmate-server [-p PORT]\n");
+	fprintf(stderr, "usage: tmate-slave [-p PORT]\n");
 }
 
 int main(int argc, char **argv)
diff --git a/tmate.h b/tmate.h
index 2087ff39..cec80cfd 100644
--- a/tmate.h
+++ b/tmate.h
@@ -100,7 +100,7 @@ extern void tmate_flush_pty(struct tmate_ssh_client_pty *client);
 
 extern void tmate_ssh_server_main(int port);
 
-/* tmate-server.c */
+/* tmate-slave.c */
 
 extern struct tmate_encoder *tmate_encoder;