From 9dd21af86744690a940e4d102637a078410d350e Mon Sep 17 00:00:00 2001 From: Martin Lund Date: Wed, 4 May 2016 20:20:06 +0200 Subject: [PATCH] Renamed "gotty" to "tio" Renamed to "tio" because it is shorter and this new name also more precisely reflects what the program is - a simple TTY terminal I/O application. "tio" can be considered short for terminal I/O or TTY I/O or a combination of the two, whichever you prefer. Also, wanted to avoid naming conflicts with other projects. --- .gitignore | 4 ++-- ChangeLog | 21 ++--------------- LICENSE | 2 +- README | 35 +++++++++++++--------------- configure.ac | 2 +- man/Makefile.am | 2 +- man/{gotty.1 => tio.1} | 22 ++++++++--------- src/Makefile.am | 16 ++++++------- src/bash-completion/{gotty => tio} | 8 +++---- src/include/{gotty => tio}/log.h | 2 +- src/include/{gotty => tio}/options.h | 4 ++-- src/include/{gotty => tio}/print.h | 4 ++-- src/include/{gotty => tio}/time.h | 4 ++-- src/include/{gotty => tio}/tty.h | 4 ++-- src/log.c | 6 ++--- src/main.c | 10 ++++---- src/options.c | 10 ++++---- src/time.c | 4 ++-- src/tty.c | 18 +++++++------- 19 files changed, 79 insertions(+), 99 deletions(-) rename man/{gotty.1 => tio.1} (69%) rename src/bash-completion/{gotty => tio} (96%) rename src/include/{gotty => tio}/log.h (94%) rename src/include/{gotty => tio}/options.h (92%) rename src/include/{gotty => tio}/print.h (94%) rename src/include/{gotty => tio}/time.h (90%) rename src/include/{gotty => tio}/tty.h (91%) diff --git a/.gitignore b/.gitignore index fcce545..ec7aa45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ *.tar.xz src/*.o -src/gotty +src/tio Makefile.in Makefile aclocal.m4 @@ -20,4 +20,4 @@ src/include/config.h.in src/include/config.h.in~ src/include/stamp-h1 *.swp -/gotty-* +/tio-* diff --git a/ChangeLog b/ChangeLog index efa66ff..63f6f07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,21 +1,4 @@ -=== Go TTY v1.5 === +=== tio v1.6 === -Changes since Go TTY v1.4: +Changes since tio v1.5: - * Added log feature - - Added "--log " option which writes all activity to specified - file. - - * Add support for configurable bash completion path - - Rewrote the configure script to support the following options: - - --with-bash-completion-dir=PATH - --without-bash-completion-dir - -Jakob Haufe: - - * Don't hardcode path for bash completions - - Instead, use pkg-config to find out where the completions should go. diff --git a/LICENSE b/LICENSE index 1c74b52..8ce49cf 100644 --- a/LICENSE +++ b/LICENSE @@ -11,5 +11,5 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License version 2 -along with gotty, in a file named COPYING. If not, see +along with tio, in a file named COPYING. If not, see . diff --git a/README b/README index a90dabb..8dbb105 100644 --- a/README +++ b/README @@ -1,25 +1,22 @@ -=== Go TTY - The Really Simple TTY Terminal Application === +=== tio - the simple TTY terminal I/O application === 1. Introduction - Go TTY or "gotty" is a really simple TTY terminal application which - features a simple commandline interface to easily connect to TTY devices - for basic input/output. - - Go TTY was created because the author needed a simple no-nonsense TTY - terminal application to go do quick debugging. - - Let's Go TTY! - http://gotty.io + "tio" is a simple TTY terminal application which features a straightfoward + commandline interface to easily connect to TTY devices for basic + input/output. + It was created because the author needed a simple no-nonsense TTY + terminal application to easily connect to various terminal TTY devices. 2. Usage The commandline interface is straightforward as reflected in the output - from 'gotty --help': + from 'tio --help': - Usage: gotty [] + Usage: tio [] Options: -b, --baudrate Baud rate (default: 115200) @@ -39,23 +36,23 @@ The only option which requires a bit of elaboration is the --no-autoconnect option. - By default gotty automatically connects to the provided device if present. + By default tio automatically connects to the provided device if present. If the device is not present it will wait for it to appear and then connect. If the connection is lost (eg. device disconnects) it will wait for the device to reappear and then reconnect. - However, if the --no-autoconnect option is provided gotty will exit if the + However, if the --no-autoconnect option is provided tio will exit if the device is not present or exit if an established connection is lost. - Go TTY features full bash autocompletion support. + Tio features full bash autocompletion support. 3. Download - Find the latest release tarball at http://gotty.io + Find the latest release tarball at http://tio.github.io The latest source is available on github: - https://github.com/gotty/gotty + https://github.com/tio/tio 4. Installation @@ -71,18 +68,18 @@ 5. Contributing - Go TTY is open source. Any contributions (bug fixes, doc, ideas, etc.) are + Tio is open source. Any contributions (bug fixes, doc, ideas, etc.) are welcome. 6. Support - Submit bug reports on github: https://github.com/gotty/gotty/issues + Submit bug reports on github: https://github.com/tio/tio/issues 7. License - Go TTY is GPLv2+. See COPYING file for license details. + Tio is GPLv2+. See COPYING file for license details. 8. Authors diff --git a/configure.ac b/configure.ac index bade960..0e58e0e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.68]) -AC_INIT([Go TTY], [1.5], [], [gotty], [http://gotty.io]) +AC_INIT([tio], [1.6], [], [tio], [http://tio.github.io]) AC_CONFIG_HEADERS([src/include/config.h]) AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip -Wall -Werror]) AM_SILENT_RULES([yes]) diff --git a/man/Makefile.am b/man/Makefile.am index 5ab829a..a7398bb 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1 +1 @@ -dist_man_MANS = gotty.1 +dist_man_MANS = tio.1 diff --git a/man/gotty.1 b/man/tio.1 similarity index 69% rename from man/gotty.1 rename to man/tio.1 index a09129e..b251173 100644 --- a/man/gotty.1 +++ b/man/tio.1 @@ -1,20 +1,20 @@ -.TH "gotty" "1" "30 September 2014" +.TH "tio" "1" "30 September 2014" .SH "NAME" -gotty \- The really simple TTY terminal application +tio \- The simple TTY terminal I/O application .SH "SYNOPSIS" .PP -.B gotty +.B tio [] .SH "DESCRIPTION" .PP -.B Go TTY +.B tio or -.B gotty -is a really simple TTY terminal application which features a simple commandline -interface to easily connect to TTY devices for basic input/output. +.B tio +is a simple TTY terminal application which features a straightforward +commandline interface to easily connect to TTY devices for basic input/output. .SH "OPTIONS" @@ -67,17 +67,17 @@ In session, press ctrl-g + q to quit. .TP The most common use is without options. For example: -gotty /dev/ttyUSB0 +tio /dev/ttyUSB0 .TP Which corresponds to: -gotty -b 115200 -d 8 -f none -s 1 -p none /dev/ttyUSB0 +tio -b 115200 -d 8 -f none -s 1 -p none /dev/ttyUSB0 .TP It is recommended to connect serial tty devices by id. For example: -gotty /dev/serial/by-id/usb-FTDI_TTL232R-3V3_FTGQVXBL-if00-port0 +tio /dev/serial/by-id/usb-FTDI_TTL232R-3V3_FTGQVXBL-if00-port0 .PP -Using serial devices by id ensures that gotty automatically reconnects to the +Using serial devices by id ensures that tio automatically reconnects to the correct serial device if the device is disconnected and then reconnected. .SH "AUTHOR" diff --git a/src/Makefile.am b/src/Makefile.am index 5eeaa72..545a08c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,16 +1,16 @@ -bin_PROGRAMS = gotty -gotty_SOURCES = tty.c \ +bin_PROGRAMS = tio +tio_SOURCES = tty.c \ options.c \ time.c \ main.c \ log.c \ - include/gotty/tty.h \ - include/gotty/options.h \ - include/gotty/time.h \ - include/gotty/print.h \ - include/gotty/log.h + include/tio/tty.h \ + include/tio/options.h \ + include/tio/time.h \ + include/tio/print.h \ + include/tio/log.h if ENABLE_BASH_COMPLETION bashcompletiondir=@BASH_COMPLETION_DIR@ -dist_bashcompletion_DATA=bash-completion/gotty +dist_bashcompletion_DATA=bash-completion/tio endif diff --git a/src/bash-completion/gotty b/src/bash-completion/tio similarity index 96% rename from src/bash-completion/gotty rename to src/bash-completion/tio index b03642a..31f3b89 100644 --- a/src/bash-completion/gotty +++ b/src/bash-completion/tio @@ -1,8 +1,8 @@ # -# Bash completion script for gotty. +# Bash completion script for tio. # -_gotty() +_tio() { local cur prev opts base COMPREPLY=() @@ -100,5 +100,5 @@ _gotty() return 0 } -# Bind completion to gotty command -complete -o default -F _gotty gotty +# Bind completion to tio command +complete -o default -F _tio tio diff --git a/src/include/gotty/log.h b/src/include/tio/log.h similarity index 94% rename from src/include/gotty/log.h rename to src/include/tio/log.h index f50284b..82153a7 100644 --- a/src/include/gotty/log.h +++ b/src/include/tio/log.h @@ -1,5 +1,5 @@ /* - * Go TTY - The Really Simple Terminal Application + * tio - the simple TTY terminal I/O application * * Copyright (c) 2014-2016 Martin Lund * diff --git a/src/include/gotty/options.h b/src/include/tio/options.h similarity index 92% rename from src/include/gotty/options.h rename to src/include/tio/options.h index 1470964..dc57352 100644 --- a/src/include/gotty/options.h +++ b/src/include/tio/options.h @@ -1,7 +1,7 @@ /* - * Go TTY - The Really Simple Terminal Application + * tio - the simple TTY terminal I/O application * - * Copyright (c) 2014 Martin Lund + * Copyright (c) 2014-2016 Martin Lund * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/include/gotty/print.h b/src/include/tio/print.h similarity index 94% rename from src/include/gotty/print.h rename to src/include/tio/print.h index 385f512..a5c2a90 100644 --- a/src/include/gotty/print.h +++ b/src/include/tio/print.h @@ -1,7 +1,7 @@ /* - * Go TTY - The Really Simple Terminal Application + * tio - the simple TTY terminal I/O application * - * Copyright (c) 2014 Martin Lund + * Copyright (c) 2014-2016 Martin Lund * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/include/gotty/time.h b/src/include/tio/time.h similarity index 90% rename from src/include/gotty/time.h rename to src/include/tio/time.h index dd9405f..8e0fef6 100644 --- a/src/include/gotty/time.h +++ b/src/include/tio/time.h @@ -1,7 +1,7 @@ /* - * Go TTY - The Really Simple Terminal Application + * tio - the simple TTY terminal I/O application * - * Copyright (c) 2014 Martin Lund + * Copyright (c) 2014-2016 Martin Lund * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/include/gotty/tty.h b/src/include/tio/tty.h similarity index 91% rename from src/include/gotty/tty.h rename to src/include/tio/tty.h index ad09d4d..3506024 100644 --- a/src/include/gotty/tty.h +++ b/src/include/tio/tty.h @@ -1,7 +1,7 @@ /* - * Go TTY - The Really Simple Terminal Application + * tio - the simple TTY terminal I/O application * - * Copyright (c) 2014 Martin Lund + * Copyright (c) 2014-2016 Martin Lund * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/log.c b/src/log.c index 39e2ffd..157714a 100644 --- a/src/log.c +++ b/src/log.c @@ -1,5 +1,5 @@ /* - * Go TTY - The Really Simple Terminal Application + * tio - the simple TTY terminal I/O application * * Copyright (c) 2014-2016 Martin Lund * @@ -23,8 +23,8 @@ #include #include #include -#include "gotty/options.h" -#include "gotty/print.h" +#include "tio/options.h" +#include "tio/print.h" static FILE *fp; static bool error = false; diff --git a/src/main.c b/src/main.c index 50a2ee1..153eb4f 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,7 @@ /* - * Go TTY - The Really Simple Terminal Application + * tio - the simple TTY terminal I/O application * - * Copyright (c) 2014 Martin Lund + * Copyright (c) 2014-2016 Martin Lund * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,9 +21,9 @@ #include #include -#include "gotty/options.h" -#include "gotty/tty.h" -#include "gotty/log.h" +#include "tio/options.h" +#include "tio/tty.h" +#include "tio/log.h" int main(int argc, char *argv[]) { diff --git a/src/options.c b/src/options.c index ae80f00..7aab70f 100644 --- a/src/options.c +++ b/src/options.c @@ -1,7 +1,7 @@ /* - * Go TTY - The Really Simple Terminal Application + * tio - the simple TTY terminal I/O application * - * Copyright (c) 2014 Martin Lund + * Copyright (c) 2014-2016 Martin Lund * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -29,8 +29,8 @@ #include #include #include "config.h" -#include "gotty/options.h" -#include "gotty/print.h" +#include "tio/options.h" +#include "tio/print.h" struct option_t option = { @@ -318,7 +318,7 @@ void parse_options(int argc, char *argv[]) break; case 'v': - printf("Go TTY v%s\n", VERSION); + printf("tio v%s\n", VERSION); printf("Copyright (c) 2014-2016 Martin Lund\n"); printf("\n"); printf("License GPLv2: GNU GPL version 2 or later .\n"); diff --git a/src/time.c b/src/time.c index 1ac7ecb..d86774f 100644 --- a/src/time.c +++ b/src/time.c @@ -1,7 +1,7 @@ /* - * Go TTY - The Really Simple Terminal Application + * tio - the simple TTY terminal I/O application * - * Copyright (c) 2014 Martin Lund + * Copyright (c) 2014-2016 Martin Lund * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/tty.c b/src/tty.c index 1cd1471..fd9d838 100644 --- a/src/tty.c +++ b/src/tty.c @@ -1,7 +1,7 @@ /* - * Go TTY - The Really Simple Terminal Application + * tio - the simple TTY terminal I/O application * - * Copyright (c) 2014 Martin Lund + * Copyright (c) 2014-2016 Martin Lund * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -31,11 +31,11 @@ #include #include #include -#include "gotty/tty.h" -#include "gotty/print.h" -#include "gotty/options.h" -#include "gotty/time.h" -#include "gotty/log.h" +#include "tio/tty.h" +#include "tio/print.h" +#include "tio/options.h" +#include "tio/time.h" +#include "tio/log.h" static int connected = false; struct termios new_stdout, old_stdout, old_tio; @@ -120,7 +120,7 @@ void disconnect_tty(void) { if (tainted) putchar('\n'); - color_printf("[gotty %s] Disconnected", current_time()); + color_printf("[tio %s] Disconnected", current_time()); close(fd); connected = false; } @@ -156,7 +156,7 @@ int connect_tty(void) tcflush(fd, TCIOFLUSH); /* Print connect status */ - color_printf("[gotty %s] Connected", current_time()); + color_printf("[tio %s] Connected", current_time()); connected = true; tainted = false; bzero(&c_stdin[0], 3);