Maarrk/tio
1
0
Fork 0
mirror of https://github.com/tio/tio.git synced 2026-05-01 14:57:59 +02:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Various cleanup

Browse source 
Renamed device -> tty_device.

Removed hardcoded tty device name max length.

Updated README.
This commit is contained in:
Martin Lund 2014-09-30 16:05:38 +02:00
parent 9721f2436c
commit cc7f21e735
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -19,7 +19,7 @@
(output from 'gotty --help'): (output from 'gotty --help'):
Usage: gotty [<options>] <device> Usage: gotty [<options>] <tty device>
Options: Options:
-b, --baudrate <baudrate> Baud rate (default: 115200) -b, --baudrate <baudrate> Baud rate (default: 115200)

3
src/include/gotty/options.h
View file

@ -25,11 +25,12 @@
#include <stdbool.h> #include <stdbool.h>
#include <limits.h> #include <limits.h>
#include <termios.h> #include <termios.h>
#include <sys/param.h>
/* Options */ /* Options */
struct option_t struct option_t
{ {
char device[256]; char tty_device[MAXPATHLEN];
bool no_autoconnect; bool no_autoconnect;
struct termios tio; struct termios tio;
}; };

6
src/options.c
View file

@ -39,7 +39,7 @@ struct option_t option =
void print_options_help(char *argv[]) void print_options_help(char *argv[])
{ {
printf("Usage: %s [<options>] <device>\n", argv[0]); printf("Usage: %s [<options>] <tty device>\n", argv[0]);
printf("\n"); printf("\n");
printf("Options:\n"); printf("Options:\n");
printf(" -b, --baudrate <baudrate> Baud rate (default: 115200)\n"); printf(" -b, --baudrate <baudrate> Baud rate (default: 115200)\n");
@ -324,9 +324,9 @@ void parse_options(int argc, char *argv[])
/* Assume first non-option is the tty device name */ /* Assume first non-option is the tty device name */
if (optind < argc) if (optind < argc)
strcpy(option.device, argv[optind++]); strcpy(option.tty_device, argv[optind++]);
if (strlen(option.device) == 0) if (strlen(option.tty_device) == 0)
{ {
printf("Error: Missing device name.\n"); printf("Error: Missing device name.\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);

7
src/tty.c
View file

@ -26,6 +26,7 @@
#include <limits.h> #include <limits.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/param.h>
#include <fcntl.h> #include <fcntl.h>
#include <termios.h> #include <termios.h>
#include <stdbool.h> #include <stdbool.h>
@ -34,8 +35,6 @@
#include "gotty/print.h" #include "gotty/print.h"
#include "gotty/options.h" #include "gotty/options.h"
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
static int connected = false; static int connected = false;
struct termios new_stdout, old_stdout, old_tio; struct termios new_stdout, old_stdout, old_tio;
static int fd; static int fd;
@ -78,7 +77,7 @@ void wait_for_tty_device(void)
/* Timeout */ /* Timeout */
/* Test for device file */ /* Test for device file */
if (stat(option.device, &status) == 0) if (stat(option.tty_device, &status) == 0)
return; return;
} }
} }
@ -146,7 +145,7 @@ int connect_tty(void)
char c_stdin[3]; char c_stdin[3];
/* Open tty device */ /* Open tty device */
fd = open(option.device, O_RDWR | O_NOCTTY ); fd = open(option.tty_device, O_RDWR | O_NOCTTY );
if (fd <0) if (fd <0)
{ {
printf("\033[300DError: %s\n\033[300D", strerror(errno)); printf("\033[300DError: %s\n\033[300D", strerror(errno));