v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

tmate-server -> tmate-slave

Browse Source
This commit is contained in:
Nicolas Viennot 2013-06-10 22:29:13 -04:00
parent e36905a646
commit 0f1159aa30
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -16,6 +16,6 @@ Makefile
Makefile.in Makefile.in
configure configure
keys/ keys/
tmate-server tmate-slave
cscope.* cscope.*
tags tags

42
Makefile.am
View File

@ -1,7 +1,7 @@
# $Id$ # $Id$
# Obvious program stuff. # Obvious program stuff.
bin_PROGRAMS = tmate-server bin_PROGRAMS = tmate-slave
dist_man1_MANS = tmate.1 dist_man1_MANS = tmate.1
# Distribution tarball options. # Distribution tarball options.
@ -60,7 +60,7 @@ CFLAGS += -erroff=E_EMPTY_DECLARATION
endif endif
# List of sources. # List of sources.
dist_tmate_server_SOURCES = \ dist_tmate_slave_SOURCES = \
arguments.c \ arguments.c \
attributes.c \ attributes.c \
cfg.c \ cfg.c \
@ -177,7 +177,7 @@ dist_tmate_server_SOURCES = \
tmate-debug.c \ tmate-debug.c \
tmate-decoder.c \ tmate-decoder.c \
tmate-encoder.c \ tmate-encoder.c \
tmate-server.c \ tmate-slave.c \
tmate-ssh-client-pty.c \ tmate-ssh-client-pty.c \
tmate-ssh-client.c \ tmate-ssh-client.c \
tmate-ssh-server.c \ tmate-ssh-server.c \
@ -192,60 +192,60 @@ dist_tmate_server_SOURCES = \
window.c \ window.c \
xmalloc.c \ xmalloc.c \
xterm-keys.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. # Pile in all the compat/ stuff that is needed.
if NO_FORKPTY if NO_FORKPTY
nodist_tmate_server_SOURCES += compat/forkpty-@PLATFORM@.c nodist_tmate_slave_SOURCES += compat/forkpty-@PLATFORM@.c
endif endif
if NO_IMSG 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 endif
if NO_CLOSEFROM if NO_CLOSEFROM
nodist_tmate_server_SOURCES += compat/closefrom.c nodist_tmate_slave_SOURCES += compat/closefrom.c
endif endif
if NO_DAEMON if NO_DAEMON
nodist_tmate_server_SOURCES += compat/daemon.c nodist_tmate_slave_SOURCES += compat/daemon.c
endif endif
if NO_SETENV if NO_SETENV
nodist_tmate_server_SOURCES += compat/setenv.c nodist_tmate_slave_SOURCES += compat/setenv.c
endif endif
if NO_STRLCAT if NO_STRLCAT
nodist_tmate_server_SOURCES += compat/strlcat.c nodist_tmate_slave_SOURCES += compat/strlcat.c
endif endif
if NO_STRLCPY if NO_STRLCPY
nodist_tmate_server_SOURCES += compat/strlcpy.c nodist_tmate_slave_SOURCES += compat/strlcpy.c
endif endif
if NO_ASPRINTF if NO_ASPRINTF
nodist_tmate_server_SOURCES += compat/asprintf.c nodist_tmate_slave_SOURCES += compat/asprintf.c
endif endif
if NO_FGETLN if NO_FGETLN
nodist_tmate_server_SOURCES += compat/fgetln.c nodist_tmate_slave_SOURCES += compat/fgetln.c
endif endif
if NO_GETOPT if NO_GETOPT
nodist_tmate_server_SOURCES += compat/getopt.c nodist_tmate_slave_SOURCES += compat/getopt.c
endif endif
if NO_STRCASESTR if NO_STRCASESTR
nodist_tmate_server_SOURCES += compat/strcasestr.c nodist_tmate_slave_SOURCES += compat/strcasestr.c
endif endif
if NO_STRSEP if NO_STRSEP
nodist_tmate_server_SOURCES += compat/strsep.c nodist_tmate_slave_SOURCES += compat/strsep.c
endif endif
if NO_VIS if NO_VIS
nodist_tmate_server_SOURCES += compat/vis.c compat/unvis.c nodist_tmate_slave_SOURCES += compat/vis.c compat/unvis.c
endif endif
if NO_STRTONUM if NO_STRTONUM
nodist_tmate_server_SOURCES += compat/strtonum.c nodist_tmate_slave_SOURCES += compat/strtonum.c
endif endif
if NO_B64_NTOP if NO_B64_NTOP
nodist_tmate_server_SOURCES += compat/b64_ntop.c nodist_tmate_slave_SOURCES += compat/b64_ntop.c
endif endif
tmate_server_LDADD = \ tmate_slave_LDADD = \
libssh/build/src/libssh.a \ libssh/build/src/libssh.a \
msgpack/src/.libs/libmsgpackc.a msgpack/src/.libs/libmsgpackc.a
*.c: $(tmate_server_LDADD) *.c: $(tmate_slave_LDADD)
libssh/build/src/libssh.a: libssh/build/src/libssh.a:
cd libssh/build && cmake .. -DWITH_SFTP=OFF -DWITH_SERVER=ON -DWITH_PCAP=OFF -DWITH_STATIC_LIB=ON cd libssh/build && cmake .. -DWITH_SFTP=OFF -DWITH_SERVER=ON -DWITH_PCAP=OFF -DWITH_STATIC_LIB=ON

2
tmate-server.c → tmate-slave.c
View File

@ -55,7 +55,7 @@ get_full_path(const char *wd, const char *path)
static void usage(void) 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) int main(int argc, char **argv)

2
tmate.h
View File

@ -100,7 +100,7 @@ extern void tmate_flush_pty(struct tmate_ssh_client_pty *client);
extern void tmate_ssh_server_main(int port); extern void tmate_ssh_server_main(int port);
/* tmate-server.c */ /* tmate-slave.c */
extern struct tmate_encoder *tmate_encoder; extern struct tmate_encoder *tmate_encoder;