serialconsole-developers — Further development of sc, includes commit mails

[Serialconsole-developers] [sc commit] sc README, 1.9, 1.10 sc.c, 1.13, 1.14

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1558

Modified Files:
	README sc.c 
Log Message:
add -k and -K command line arguments to send key sequences

Index: README
===================================================================
RCS file: /cvsroot/serialconsole/sc/README,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- README	6 Mar 2009 00:32:24 -0000	1.9
+++ README	18 Jun 2015 06:41:46 -0000	1.10
@@ -17,6 +17,12 @@
 
 CHANGES
 
+0.96
+- add "-k" and "-K" parameters which send keys/bytes every second.
+  This is useful for serial consoles to enter the BIOS and you don't want to
+  press the keys yourself continuously. Use the escape action 'k' to stop
+  sending the keys/bytes.
+
 0.95
 - add "-d" parameters which sets a delay after writing a newline character.
 - allow arbitrary characters to be composed with the escape character.

Index: sc.c
===================================================================
RCS file: /cvsroot/serialconsole/sc/sc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- sc.c	26 Nov 2010 02:00:23 -0000	1.13
+++ sc.c	18 Jun 2015 06:41:46 -0000	1.14
@@ -34,11 +34,8 @@
 #include <sysexits.h>
 #include <termios.h>
 #include <unistd.h>
+#include <assert.h>
 
-
-#if !defined(SC_VERSION)
-#define SC_VERSION "0.9-dev"
-#endif
 #if !defined(DEFAULTDEVICE)
 #define DEFAULTDEVICE	"cuad0"
 #endif
@@ -154,7 +151,7 @@
 };
 
 
-static int scrunning = 1;
+static volatile int scrunning = 1;
 static char *path_dev = PATH_DEV "/";
 static int qflag = 0;
 
@@ -330,28 +327,41 @@
 }
 
 static int
-loop(int sfd, int escchr, int msdelay)
+loop(const int sfd, const int escchr, const int msdelay, const char *key_sequence, int key_sequence_len)
 {
 	enum escapestates escapestate = ESCAPESTATE_WAITFOREC;
 	unsigned char escapedigit;
 	int i;
 	char c;
-#if defined(HAS_BROKEN_POLL)
-	/* use select(2) */
-	fd_set fds[2];
 
-	FD_ZERO(fds+1);
-	FD_SET(STDIN_FILENO, fds+1);
-	FD_SET(sfd, fds+1);
+#if defined(HAS_BROKEN_POLL)
 	while (scrunning) {
-		bcopy(fds+1, fds, sizeof(*fds));
-		if ((i = select(sfd+1, fds, NULL, NULL, NULL)) < 0
+		fd_set fds;
+		struct timeval tv;
+		struct timeval *tvp = NULL;
+
+		if (key_sequence && key_sequence_len > 0) {
+			tv.tv_sec = 1;
+			tv.tv_usec = 0;
+			tvp = &tv;
+		}
+
+		FD_ZERO(fds);
+		FD_SET(STDIN_FILENO, fds);
+		FD_SET(sfd, fds);
+
+		if ((i = select(sfd+1, fds, NULL, NULL, tvp)) < 0
 				&& errno != EINTR) {
 			warn("select()");
 			return EX_OSERR;
 		}
 #else
 	struct pollfd pfds[2];
+	int poll_timeout = -1;
+
+	if (key_sequence && key_sequence_len > 0) {
+		poll_timeout = 1000; /* milliseconds */
+	}
 
 	bzero(pfds, sizeof(pfds));
 	pfds[0].fd = STDIN_FILENO;
@@ -359,7 +369,7 @@
 	pfds[1].fd = sfd;
 	pfds[1].events = POLLIN;
 	while (scrunning) {
-		if ((i = poll(pfds, sizeof(pfds)/sizeof(pfds[0]), -1)) < 0
+		if ((i = poll(pfds, sizeof(pfds)/sizeof(pfds[0]), poll_timeout)) < 0
 				&& errno != EINTR) {
 			warn("poll()");
 			return EX_OSERR;
@@ -379,12 +389,25 @@
 			return(EX_OSERR);
 		}
 #endif
+
+		/* check timeout */
+		if (key_sequence && key_sequence_len > 0 && i == 0) {
+			i = write(sfd, key_sequence, key_sequence_len);
+			if (i != key_sequence_len) {
+				err(EX_OSERR, "could not write key sequence to serial device.");
+			}
+		}
+
 #if defined(HAS_BROKEN_POLL)
 		if (FD_ISSET(STDIN_FILENO, fds)) {
 #else
 		if (pfds[0].revents & POLLIN) {
 #endif
-			if ((i = read(STDIN_FILENO, &c, 1)) > 0) {
+			i = read(STDIN_FILENO, &c, 1);
+			if (i < 0) {
+				err(EX_OSERR, "could not read from STDIN.");
+			}
+			if (i > 0) {
 				switch (escapestate) {
 					case ESCAPESTATE_WAITFORCR:
 						if (c == '\r') {
@@ -416,6 +439,13 @@
 								tcsendbreak(sfd, 0);
 								continue;
 
+							case 'k':
+							case 'K':
+								fprintf(stderr, "->stop sending key sequence<-\r\n");
+								key_sequence = NULL;
+								key_sequence_len = 0;
+								continue;
+
 							case 'x':
 							case 'X':
 								escapestate = ESCAPESTATE_WAITFOR1STHEXDIGIT;
@@ -423,7 +453,10 @@
 
 							default:
 								if (((unsigned char)c) != escchr) {
-									write(sfd, &escchr, 1);
+									i = write(sfd, &escchr, 1);
+									if (i < 0) {
+										err(EX_OSERR, "could not write to serial device.");
+									}
 								}
 						}
 						break;
@@ -457,8 +490,7 @@
 					usleep(msdelay*1000);
 			}
 			if (i < 0) {
-				warn("read/write");
-				return(EX_OSERR);
+				err(EX_OSERR, "could not write to serial device.");
 			}
 		}
 #if defined(HAS_BROKEN_POLL)
@@ -466,12 +498,15 @@
 #else
 		if (pfds[1].revents & POLLIN) {
 #endif
-			if ((i = read(sfd, &c, 1)) > 0) {
-				i = write(STDOUT_FILENO, &c, 1);
-			}
+			i = read(sfd, &c, 1);
 			if (i < 0) {
-				warn("read/write");
-				return(EX_OSERR);
+				err(EX_OSERR, "could not read from serial device.");
+			}
+			if (i > 0) {
+				i = write(STDOUT_FILENO, &c, 1);
+				if (i < 0) {
+					err(EX_OSERR, "could not write to STDIN.");
+				}
 			}
 		}
 	}
@@ -496,12 +531,168 @@
 #endif
 }
 
+/**
+ * parse a key sequence.
+ * The string key_sequence is modified in place.
+ * The string key_sequence may only contain hex-digits and white space.
+ * It must have a length of at least 2 characters to parse a key.
+ * @param[in,out] key_sequence string of hex-digits on input; binary values on output.
+ * @return number of bytes parsed and converted in key_sequence.
+ */
+static int
+parse_key_sequence(char *key_sequence)
+{
+	int digits_read = 0;
+	unsigned char b = 0;
+	char *c;
+	int key_sequence_len = 0;
+
+	if (key_sequence == NULL) {
+		return 0;
+	}
+
+	for(c = key_sequence; *c; ++c) {
+		if (isspace(*c)) continue;
+		if (! isxdigit(*c)) {
+			fprintf(stderr, "invalid character in key sequence: %c (0x%02x)\n", *c, (int)*c);
+			return -1;
+		}
+		if (digits_read == 0) {
+			b = hex2dec(*c) << 4;
+		} else if (digits_read == 1) {
+			b |= hex2dec(*c);
+			key_sequence[key_sequence_len++] = b;
+			key_sequence[key_sequence_len] = 0;
+			b = 0;
+		}
+		++digits_read;
+		digits_read &= 1;
+	}
+
+	return key_sequence_len;
+}
+
+/**
+ * parse a key identifier into a key sequence.
+ * @param key_id a key identifier.
+ * @param[out] key_sequence will be set to an allocated array of bytes. The caller has to free the returned value.
+ * @param[out] key_sequence_len size of key_sequence in bytes.
+ * @return 0 if key_id is NULL;
+ *         0 if key_id is a valid identifier, key_sequence and key_sequence_len are set;
+ *        -1 if key_id is an invalid identifier;
+ *        -2 upon parameter error.
+ */
+static int
+parse_key_identifier(const char *key_id, char **key_sequence, int *key_sequence_len)
+{
+	struct key_s {
+		const char *id;
+		const char *seq;
+		const char *comment;
+	};
+
+	struct key_s key[] = {
+		{ "F1", "\x1bOP", "VT100 F1" },
+		{ "F2", "\x1bOQ", "VT100 F2" },
+		{ "F3", "\x1bOR", "VT100 F3" },
+		{ "F4", "\x1bOS", "VT100 F4" },
+		{ "xtermF1", "\x1b[11~", "xterm F1" },
+		{ "xtermF2", "\x1b[12~", "xterm F2" },
+		{ "xtermF3", "\x1b[13~", "xterm F3" },
+		{ "xtermF4", "\x1b[14~", "xterm F4" },
+		{ "F5",  "\x1b[15~", "xterm F5" },
+		{ "F6",  "\x1b[17~", "xterm F6" },
+		{ "F7",  "\x1b[18~", "xterm F7" },
+		{ "F8",  "\x1b[19~", "xterm F8" },
+		{ "F9",  "\x1b[20~", "xterm F9" },
+		{ "F10", "\x1b[21~", "xterm F10" },
+		{ "F11", "\x1b[23~", "xterm F11" },
+		{ "F12", "\x1b[24~", "xterm F12" },
+		{ "DEL", "\x1b[3~", "xterm DEL" },
+		{ NULL, NULL, NULL }
+	};
+
+	struct key_s *k;
+
+	if (key_id == NULL) {
+		return 0;
+	}
+
+	if (strcmp(key_id, "list") == 0) {
+		fprintf(stderr,
+			"id\tcomment\t\tkey sequence\n"
+			"------------------------------------------------------------------------------\n");
+		for(k = key; k->id; ++k) {
+			const char *c;
+			fprintf(stderr, "%s\t%s:\t", k->id, k->comment);
+			for(c = k->seq; *c; ++c) {
+				fprintf(stderr, "%02x ", *c);
+			}
+			fprintf(stderr, "\n");
+		}
+		return -1;
+	}
+
+	if (! key_sequence) { return -2; }
+	if (! key_sequence_len) { return -2; }
+
+	for(k = key; k->id; ++k) {
+		if (strcmp(key_id, k->id) == 0) {
+			*key_sequence = strdup(k->seq);
+			*key_sequence_len = strlen(k->seq);
+			return 0;
+		}
+	}
+
+	return -1;
+}
+
+
+static void
+unittest()
+{
+	{
+		char *s = strdup(" 1b   5b\t 33 7e  ");
+		assert(parse_key_sequence(s) == 4);
+		assert(s[0] == 0x1b);
+		assert(s[1] == 0x5b);
+		assert(s[2] == 0x33);
+		assert(s[3] == 0x7e);
+		free(s);
+
+		assert(parse_key_sequence(NULL) == 0);
+
+		s = strdup("4");
+		assert(parse_key_sequence(s) == 0);
+		free(s);
+
+		s = strdup("44");
+		assert(parse_key_sequence(s) == 1);
+		assert(s[0] == 0x44);
+		free(s);
+	}
+	{
+		char *key_sequence;
+		int key_sequence_len;
+		assert(parse_key_identifier(NULL, &key_sequence, &key_sequence_len) == 0);
+		assert(parse_key_identifier("does not exist", &key_sequence, &key_sequence_len) < 0);
+		assert(parse_key_identifier("F1", NULL, &key_sequence_len) < 0);
+		assert(parse_key_identifier("F8", &key_sequence, NULL) < 0);
+
+		assert(parse_key_identifier("F4", &key_sequence, &key_sequence_len) == 0);
+		assert(key_sequence_len == 3);
+		assert(key_sequence[0] == 0x1b);
+		assert(key_sequence[1] == 0x4f);
+		assert(key_sequence[2] == 0x53);
+		free(key_sequence);
+	}
+}
 
 static void
 usage(void)
 {
 	fprintf(stderr, "Connect to a serial device, using this system as a console. Version %s.\n"
-			"usage:\tsc [-fmq] [-d ms] [-e escape] [-p parms] [-s speed] device\n"
+			"usage:\tsc [-fmq] [-d ms] [-e escape] [-p parms] [-s speed] [-k 'key sequence'] [-K <key>] device\n"
 			"\t-f: use hardware flow control (CRTSCTS)\n"
 			"\t-m: use modem lines (!CLOCAL)\n"
 			"\t-q: don't show connect, disconnect and escape action messages\n"
@@ -509,12 +700,15 @@
 			"\t-e: escape char or \"none\", default '~'\n"
 			"\t-p: bits per char, parity, stop bits, default \"%s\"\n"
 			"\t-s: speed, default \"%s\"\n"
+		        "\t-k: send key(s) once per second. 'key sequence' contains hex digits and white space.\n"
+			"\t-K: send a single key once per second. Use 'list' to show valid key identifiers.\n"
 			"\tdevice, default \"%s\"\n",
 			SC_VERSION, DEFAULTPARMS, DEFAULTSPEED, DEFAULTDEVICE);
 	fprintf(stderr, "escape actions are started with the 3 character combination: CR + ~ +\n"
 		        "\t~ - send '~' character\n"
 		        "\t. - disconnect\n"
 		        "\tb - send break\n"
+		        "\tk - stop sending the key (sequence)\n"
    		        "\tx<2 hex digits> - send decoded character\n");
 #if defined(TERMIOS_SPEED_IS_INT)
 	fprintf(stderr, "available speeds depend on device\n");
@@ -550,8 +744,12 @@
 	int msdelay = 0;
 	int i;
 	char c;
+	char *key_sequence = NULL;
+	int key_sequence_len = 0;
 
-	while ((c = getopt(argc, argv, "d:e:fhmp:qs:?")) != -1) {
+	unittest();
+
+	while ((c = getopt(argc, argv, "d:e:fhk:K:mp:qs:?")) != -1) {
 		switch (c) {
 			case 'd':
 				msdelay=atoi(optarg);
@@ -584,6 +782,18 @@
 			case 's':
 				speed = optarg;
 				break;
+			case 'k':
+				key_sequence = optarg;
+				key_sequence_len = parse_key_sequence(key_sequence);
+				if (key_sequence_len < 0) {
+					errx(EX_USAGE, "invalid key in key_sequence");
+				}
+				break;
+			case 'K':
+				if (parse_key_identifier(optarg, &key_sequence, &key_sequence_len) < 0) {
+					return EX_USAGE;
+				}
+				break;
 			case 'h':
 			case '?':
 			default:
@@ -599,6 +809,10 @@
 		usage();
 	}
 
+	if (key_sequence_len > 0) {
+		fprintf(stderr, "will send %i bytes/keys every second\n", key_sequence_len);
+	}
+
 	if (strchr(tty, '/') == NULL) {
 		if (strlen(path_dev) + strlen(tty) > PATH_MAX) {
 			errx(EX_USAGE, "Device name \"%s\" is too long.", tty);
@@ -669,7 +883,7 @@
 	}
 	modemcontrol(sfd, 1);
 
-	ec = loop(sfd, escchr, msdelay);
+	ec = loop(sfd, escchr, msdelay, key_sequence, key_sequence_len);
 
 error:
 	if (sfd >= 0) {
@@ -682,3 +896,17 @@
 	if (!qflag) fprintf(stderr, "Connection closed.\n");
 	return ec;
 }
+
+/*
+ * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-default-style: bsd
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */

[Serialconsole-developers] [sc commit] sc .cvsignore, 1.2, 1.3 Makefile, 1.12, 1.13 sc.1, 1.9, 1.10

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13646

Modified Files:
	.cvsignore Makefile sc.1 
Log Message:
some minor details

Index: .cvsignore
===================================================================
RCS file: /cvsroot/serialconsole/sc/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	16 Nov 2006 23:43:44 -0000	1.2
+++ .cvsignore	26 Nov 2010 02:01:07 -0000	1.3
@@ -1,2 +1,3 @@
 .gdb_history
 sc
+sc.dSYM

Index: Makefile
===================================================================
RCS file: /cvsroot/serialconsole/sc/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile	26 Jan 2009 11:07:52 -0000	1.12
+++ Makefile	26 Nov 2010 02:01:07 -0000	1.13
@@ -11,7 +11,7 @@
 CFLAGS+=	-Wall -g
 
 # Release version
-CFLAGS+=	-DSC_VERSION='"0.95"'
+CFLAGS+=	-DSC_VERSION='"0.96"'
 
 # Enable this for operating systems that have a broken poll(2)
 # implementation:
@@ -22,6 +22,7 @@
 #CFLAGS+=	-DDEFAULTDEVICE='"cuad0"'
 
 #CFLAGS+=	-DDEFAULTDEVICE='"ttyS0"'	# for Linux
+#CFLAGS+=	-DDEFAULTDEVICE='"ttyUSB0"'	# for Linux USB devices
 
 # default speed to use
 #CFLAGS+=	-DDEFAULTSPEED='"9600"'
@@ -30,7 +31,7 @@
 #CFLAGS+=	-DDEFAULTPARMS='"8n1"'
 
 ### install options
-PREFIX?=/usr/local
+PREFIX?=$(DESTDIR)/usr/local
 
 all:	sc
 

Index: sc.1
===================================================================
RCS file: /cvsroot/serialconsole/sc/sc.1,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sc.1	6 Mar 2009 00:28:38 -0000	1.9
+++ sc.1	26 Nov 2010 02:01:07 -0000	1.10
@@ -96,7 +96,9 @@
 .Fl e
 option.  Some escape actions output a message indicating which action was executed.  To turn off those messages use the
 .Fl q
-option.
+option.  A note for non-english keyboard layouts: your ~ key may be in
+compose mode to create characters like ~a.  In this case you will have to
+press ~ twice to send a single character to the sc program.
 .Pp
 The supported escapes (assuming the default
 .Ql ~ )

[Serialconsole-developers] [sc commit] sc sc.c,1.12,1.13

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13516

Modified Files:
	sc.c 
Log Message:
make -h a valid option

Index: sc.c
===================================================================
RCS file: /cvsroot/serialconsole/sc/sc.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sc.c	4 Dec 2007 02:34:46 -0000	1.12
+++ sc.c	26 Nov 2010 02:00:23 -0000	1.13
@@ -551,7 +551,7 @@
 	int i;
 	char c;
 
-	while ((c = getopt(argc, argv, "d:e:fmp:qs:?")) != -1) {
+	while ((c = getopt(argc, argv, "d:e:fhmp:qs:?")) != -1) {
 		switch (c) {
 			case 'd':
 				msdelay=atoi(optarg);
@@ -584,6 +584,7 @@
 			case 's':
 				speed = optarg;
 				break;
+			case 'h':
 			case '?':
 			default:
 				usage();

[Serialconsole-developers] [sc commit] web index.html,1.1,1.2

[Stefan B. <ste...@us...>]

Update of /cvsroot/serialconsole/web
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16515

Modified Files:
	index.html 
Log Message:
Add correct sf logo

Index: index.html
===================================================================
RCS file: /cvsroot/serialconsole/web/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.html	17 Nov 2006 00:38:52 -0000	1.1
+++ index.html	11 Mar 2009 22:26:18 -0000	1.2
@@ -30,6 +30,11 @@
 
 <hr>
 
+<div style="float:right"><a href="http://sourceforge.net/projects/serialconsole"><img
+src="http://sflogo.sourceforge.net/sflogo.php?group_id=182287&type=12"
+width="120" height="30" border="0" alt="Get Serial Console (sc) at
+SourceForge.net. Fast, secure and Free Open Source software downloads"
+/></a></div>
 $Header$
 
 </body>

[Serialconsole-developers] [sc commit] sc README,1.8,1.9

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16277

Modified Files:
	README 
Log Message:
removed wrong entry


Index: README
===================================================================
RCS file: /cvsroot/serialconsole/sc/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- README	29 Nov 2007 05:04:32 -0000	1.8
+++ README	6 Mar 2009 00:32:24 -0000	1.9
@@ -20,7 +20,6 @@
 0.95
 - add "-d" parameters which sets a delay after writing a newline character.
 - allow arbitrary characters to be composed with the escape character.
-- escape break character is now 'x'
 
 0.94
 - Fix DTR setting code

[Serialconsole-developers] [sc commit] sc sc.1,1.8,1.9

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12673

Modified Files:
	sc.1 
Log Message:
added two similar programs in SEE ALSO section


Index: sc.1
===================================================================
RCS file: /cvsroot/serialconsole/sc/sc.1,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sc.1	29 Nov 2007 22:02:02 -0000	1.8
+++ sc.1	6 Mar 2009 00:28:38 -0000	1.9
@@ -116,6 +116,10 @@
 .Xr stty 1
 .Xr termios 4
 .Xr tty 4
+.Pp
+Tiny serial terminal: http://brokestream.com/tinyserial.html
+.Pp
+dterm: http://www.knossos.net.nz/dterm.html
 .\" .Sh HISTORY
 .Sh AUTHOR
 The

[Serialconsole-developers] [sc commit] sc Makefile,1.11,1.12

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21130

Modified Files:
	Makefile 
Log Message:
beauty of directory names

Index: Makefile
===================================================================
RCS file: /cvsroot/serialconsole/sc/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	26 Jan 2009 11:07:12 -0000	1.11
+++ Makefile	26 Jan 2009 11:07:52 -0000	1.12
@@ -44,7 +44,7 @@
 	[ -d $(PREFIX)/bin ] || install -m 755 -d $(PREFIX)/bin
 	install -m 755 sc $(PREFIX)/bin/
 	[ -d $(PREFIX)/man/man1 ] || install -m 755 -d $(PREFIX)/man/man1
-	install -m 644 sc.1 $(PREFIX)/man/man1
+	install -m 644 sc.1 $(PREFIX)/man/man1/
 
 uninstall:
 	rm -f $(PREFIX)/bin/sc $(PREFIX)/man/man1/sc.1

[Serialconsole-developers] [sc commit] sc Makefile,1.10,1.11

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21101

Modified Files:
	Makefile 
Log Message:
fixed install:

Index: Makefile
===================================================================
RCS file: /cvsroot/serialconsole/sc/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	29 Nov 2007 01:25:06 -0000	1.10
+++ Makefile	26 Jan 2009 11:07:12 -0000	1.11
@@ -41,7 +41,9 @@
 	rm -f *.o sc *~
 
 install:	sc
-	install -m 755 sc $(PREFIX)/bin
+	[ -d $(PREFIX)/bin ] || install -m 755 -d $(PREFIX)/bin
+	install -m 755 sc $(PREFIX)/bin/
+	[ -d $(PREFIX)/man/man1 ] || install -m 755 -d $(PREFIX)/man/man1
 	install -m 644 sc.1 $(PREFIX)/man/man1
 
 uninstall:

[Serialconsole-developers] [sc commit] sc sc.c,1.11,1.12

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv8970

Modified Files:
	sc.c 
Log Message:
added multiple of 7200 baudrates, which are defined in FreeBSD


Index: sc.c
===================================================================
RCS file: /cvsroot/serialconsole/sc/sc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sc.c	29 Nov 2007 22:03:13 -0000	1.11
+++ sc.c	4 Dec 2007 02:34:46 -0000	1.12
@@ -74,8 +74,17 @@
 	{ B1800, 1800 },
 	{ B2400, 2400 },
 	{ B4800, 4800 },
+#if defined(B7200)
+	{ B7200, 7200 },
+#endif
 	{ B9600, 9600 },
+#if defined(B14400)
+	{ B14400, 14400 },
+#endif
 	{ B19200, 19200 },
+#if defined(B28800)
+	{ B28800, 28800 },
+#endif
 	{ B38400, 38400 },
 #if defined(B57600)
 	{ B57600, 57600 },

Re: [Serialconsole-developers] [sc commit] sc sc.1, 1.7, 1.8 sc.c, 1.9, 1.10

[Stefan B. <st...@la...>]

Cool, danke!

Am 29.11.2007 um 23:02 schrieb Dirk Jagdmann:

> Update of /cvsroot/serialconsole/sc
> In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23648
>
> Modified Files:
> 	sc.1 sc.c
> Log Message:
> sending break is again ~B
> chars are composed with ~X
>
>
> Index: sc.1
> ===================================================================
> RCS file: /cvsroot/serialconsole/sc/sc.1,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -d -r1.7 -r1.8
> --- sc.1	29 Nov 2007 05:04:32 -0000	1.7
> +++ sc.1	29 Nov 2007 22:02:02 -0000	1.8
> @@ -33,7 +33,7 @@
> .Nm
> utility opens the specified serial
> .Ar device
> -and configures it according to the given parameters. It then relays  
> characters
> +and configures it according to the given parameters.  It then  
> relays characters
> received on the device to the terminal, and forwards characters from  
> the
> terminal to the device.
> .Pp
> @@ -59,7 +59,7 @@
> .Dq none
> disables any escapes.
> .It Fl f
> -Use hardware flow control. Sets the CRTSCTS flag on the serial  
> device to
> +Use hardware flow control.  Sets the CRTSCTS flag on the serial  
> device to
> enable hardware flow control.  The actual effect of CRTSCTS depends  
> on the
> device driver.
> .It Fl m
> @@ -81,8 +81,8 @@
> .It Fl q
> Be quiet.  By default,
> .Nm
> -will report the device and parameters used before making the  
> connection, and
> -will report the end of the connection before terminating.  With  
> this option,
> +will report the device and parameters used before making the  
> connection,
> +report the end of the connection before terminating and display  
> executed escape actions.  With this option,
> only errors will be reported.
> .It Fl ?
> Print usage summary.
> @@ -92,9 +92,9 @@
> send special characters over the connection, and terminate
> .Nm .
> The escape character must always follow a newline (more specific: a  
> carriage return character) to be interpreted as
> -special. The character can be changed using the
> +special.  The character can be changed using the
> .Fl e
> -option. Some escape actions output a message indicating which  
> action was executed. To turn off those messages use the
> +option.  Some escape actions output a message indicating which  
> action was executed.  To turn off those messages use the
> .Fl q
> option.
> .Pp
> @@ -106,10 +106,10 @@
> Send a single ~ to the device.
> .It Cm ~.
> Disconnect.
> -.It Cm ~X
> +.It Cm ~B
> Send a BREAK to the device, if supported by the driver.
> -.It Cm ~<2x hex character>
> -Reads two hexadecimal digits and sends one byte representing those  
> digits. Valid hex characters are 0-9, a-f, A-F.
> +.It Cm ~X<2x hex character>
> +Reads two hexadecimal digits and sends one byte representing those  
> digits.  Valid hex characters are 0-9, a-f, A-F.
> .El
> .\" .Sh BUGS
> .Sh SEE ALSO
>
> Index: sc.c
> ===================================================================
> RCS file: /cvsroot/serialconsole/sc/sc.c,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -d -r1.9 -r1.10
> --- sc.c	29 Nov 2007 05:04:32 -0000	1.9
> +++ sc.c	29 Nov 2007 22:02:02 -0000	1.10
> @@ -140,7 +140,8 @@
> 	ESCAPESTATE_WAITFORCR = 0,
> 	ESCAPESTATE_WAITFOREC,
> 	ESCAPESTATE_PROCESSCMD,
> -	ESCAPESTATE_WAITFOR2ndDIGIT,
> +	ESCAPESTATE_WAITFOR1STHEXDIGIT,
> +	ESCAPESTATE_WAITFOR2NDHEXDIGIT,
> };
>
>
> @@ -379,34 +380,48 @@
> 								scrunning = 0;
> 								continue;
>
> -							case 'x':
> -							case 'X':
> +							case 'b':
> +							case 'B':
> 								if(!qflag)
> -									fprintf(stderr, "sending a break\r\n");
> +									fprintf(stderr, "->sending a break<-\r\n");
> 								tcsendbreak(sfd, 0);
> 								continue;
>
> +							case 'x':
> +							case 'X':
> +								escapestate = ESCAPESTATE_WAITFOR1STHEXDIGIT;
> +								continue;
> +
> 							default:
> -								if (isxdigit(c)) {
> -									escapedigit = hex2dec(c) * 16;
> -									escapestate = ESCAPESTATE_WAITFOR2ndDIGIT;
> -									continue;
> -								}
> 								if (((unsigned char)c) != escchr) {
> 									write(sfd, &escchr, 1);
> 								}
> 						}
> 						break;
>
> -					case ESCAPESTATE_WAITFOR2ndDIGIT:
> +					case ESCAPESTATE_WAITFOR1STHEXDIGIT:
> +						if (isxdigit(c)) {
> +							escapedigit = hex2dec(c) * 16;
> +							escapestate = ESCAPESTATE_WAITFOR2NDHEXDIGIT;
> +						} else {
> +							escapestate = ESCAPESTATE_WAITFORCR;
> +							if(!qflag)
> +								fprintf(stderr, "->invalid hex digit '%c'<-\r\n", c);
> +						}
> +						continue;
> +
> +					case ESCAPESTATE_WAITFOR2NDHEXDIGIT:
> 						escapestate = ESCAPESTATE_WAITFORCR;
> 						if(isxdigit(c)) {
> 							escapedigit += hex2dec(c);
> 							write(sfd, &escapedigit, 1);
> 							if(!qflag)
> -								fprintf(stderr, "wrote 0x%02X character\r\n", escapedigit);
> +								fprintf(stderr, "->wrote 0x%02X character '%c'<-\r\n",  
> escapedigit, isprint(escapedigit)?escapedigit:'.');
> +						} else {
> +							if(!qflag)
> +								fprintf(stderr, "->invalid hex digit '%c'<-\r\n", c);
> 						}
> -						break;
> +						continue;
> 				}
> 				i = write(sfd, &c, 1);
> 				if(c == '\n' && msdelay > 0)
> @@ -460,18 +475,18 @@
> 			"usage:\tsc [-fmq] [-d ms] [-e escape] [-p parms] [-s speed]  
> device\n"
> 			"\t-f: use hardware flow control (CRTSCTS)\n"
> 			"\t-m: use modem lines (!CLOCAL)\n"
> -			"\t-q: don't show connect and disconnect messages\n"
> +			"\t-q: don't show connect, disconnect and escape action messages 
> \n"
>  			"\t-d: delay in milliseconds after each newline character\n"
> 			"\t-e: escape char or \"none\", default '~'\n"
> 			"\t-p: bits per char, parity, stop bits, default \"%s\"\n"
> 			"\t-s: speed, default \"%s\"\n"
> 			"\tdevice, default \"%s\"\n",
> 			SC_VERSION, DEFAULTPARMS, DEFAULTSPEED, DEFAULTDEVICE);
> -	fprintf(stderr, "escape actions are started with the 3 or 4  
> character combination: CR + ~ +\n"
> +	fprintf(stderr, "escape actions are started with the 3 character  
> combination: CR + ~ +\n"
> 		        "\t~ - send '~' character\n"
> 		        "\t. - disconnect\n"
> -		        "\tx - send break\n"
> -   		        "\t<2 hex digits> - send decoded character\n");
> +		        "\tb - send break\n"
> +   		        "\tx<2 hex digits> - send decoded character\n");
> #if defined(TERMIOS_SPEED_IS_INT)
> 	fprintf(stderr, "available speeds depend on device\n");
> #else
>
>
> -------------------------------------------------------------------------
> SF.Net email is sponsored by: The Future of Linux Business White Paper
> from Novell.  From the desktop to the data center, Linux is going
> mainstream.  Let it simplify your IT future.
> http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
> _______________________________________________
> Serialconsole-developers mailing list
> Ser...@li...
> https://lists.sourceforge.net/lists/listinfo/serialconsole-developers

-- 
Stefan Bethke <st...@la...>   Fon +49 170 346 0140

[Serialconsole-developers] [sc commit] sc sc.c,1.10,1.11

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24209

Modified Files:
	sc.c 
Log Message:
added cygwin compatibility
fixed two warning messages


Index: sc.c
===================================================================
RCS file: /cvsroot/serialconsole/sc/sc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sc.c	29 Nov 2007 22:02:02 -0000	1.10
+++ sc.c	29 Nov 2007 22:03:13 -0000	1.11
@@ -149,6 +149,26 @@
 static char *path_dev = PATH_DEV "/";
 static int qflag = 0;
 
+#ifdef __CYGWIN__
+static int
+cfmakeraw(struct termios *termios_p)
+{
+  termios_p->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
+  termios_p->c_oflag &= ~OPOST;
+  termios_p->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
+  termios_p->c_cflag &= ~(CSIZE|PARENB);
+  termios_p->c_cflag |= CS8;
+  return 0;
+}
+
+static int
+cfsetspeed(struct termios *termios_p, speed_t speed)
+{
+  int r=cfsetospeed(termios_p, speed);
+  if(r<0) return r;
+  return cfsetispeed(termios_p, speed);
+}
+#endif
 
 static void
 sighandler(int sig)
@@ -607,7 +627,7 @@
 	}
 	if (tcsetattr(sfd, TCSANOW, &tempti)) {
 		ec = EX_OSERR;
-		warn("cftcsetattr(%s)", tty);
+		warn("tcsetattr(%s)", tty);
 		goto error;
 	}
 	signal(SIGHUP, sighandler);
@@ -634,7 +654,7 @@
 	cfmakeraw(&tempti);
 	if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &tempti)) {
 		ec = EX_OSERR;
-		warn("cfmakeraw() tty");
+		warn("tcsetattr() tty");
 		goto error;
 	}
 	modemcontrol(sfd, 1);

[Serialconsole-developers] [sc commit] sc sc.1, 1.7, 1.8 sc.c, 1.9, 1.10

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23648

Modified Files:
	sc.1 sc.c 
Log Message:
sending break is again ~B
chars are composed with ~X


Index: sc.1
===================================================================
RCS file: /cvsroot/serialconsole/sc/sc.1,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sc.1	29 Nov 2007 05:04:32 -0000	1.7
+++ sc.1	29 Nov 2007 22:02:02 -0000	1.8
@@ -33,7 +33,7 @@
 .Nm
 utility opens the specified serial
 .Ar device
-and configures it according to the given parameters. It then relays characters
+and configures it according to the given parameters.  It then relays characters
 received on the device to the terminal, and forwards characters from the
 terminal to the device.
 .Pp
@@ -59,7 +59,7 @@
 .Dq none
 disables any escapes.
 .It Fl f
-Use hardware flow control. Sets the CRTSCTS flag on the serial device to
+Use hardware flow control.  Sets the CRTSCTS flag on the serial device to
 enable hardware flow control.  The actual effect of CRTSCTS depends on the
 device driver.
 .It Fl m
@@ -81,8 +81,8 @@
 .It Fl q
 Be quiet.  By default,
 .Nm
-will report the device and parameters used before making the connection, and
-will report the end of the connection before terminating.  With this option,
+will report the device and parameters used before making the connection,
+report the end of the connection before terminating and display executed escape actions.  With this option,
 only errors will be reported.
 .It Fl ?
 Print usage summary.
@@ -92,9 +92,9 @@
 send special characters over the connection, and terminate
 .Nm .
 The escape character must always follow a newline (more specific: a carriage return character) to be interpreted as
-special. The character can be changed using the
+special.  The character can be changed using the
 .Fl e
-option. Some escape actions output a message indicating which action was executed. To turn off those messages use the
+option.  Some escape actions output a message indicating which action was executed.  To turn off those messages use the
 .Fl q
 option.
 .Pp
@@ -106,10 +106,10 @@
 Send a single ~ to the device.
 .It Cm ~.
 Disconnect.
-.It Cm ~X
+.It Cm ~B
 Send a BREAK to the device, if supported by the driver.
-.It Cm ~<2x hex character>
-Reads two hexadecimal digits and sends one byte representing those digits. Valid hex characters are 0-9, a-f, A-F.
+.It Cm ~X<2x hex character>
+Reads two hexadecimal digits and sends one byte representing those digits.  Valid hex characters are 0-9, a-f, A-F.
 .El
 .\" .Sh BUGS
 .Sh SEE ALSO

Index: sc.c
===================================================================
RCS file: /cvsroot/serialconsole/sc/sc.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sc.c	29 Nov 2007 05:04:32 -0000	1.9
+++ sc.c	29 Nov 2007 22:02:02 -0000	1.10
@@ -140,7 +140,8 @@
 	ESCAPESTATE_WAITFORCR = 0,
 	ESCAPESTATE_WAITFOREC,
 	ESCAPESTATE_PROCESSCMD,
-	ESCAPESTATE_WAITFOR2ndDIGIT,
+	ESCAPESTATE_WAITFOR1STHEXDIGIT,
+	ESCAPESTATE_WAITFOR2NDHEXDIGIT,
 };
 
 
@@ -379,34 +380,48 @@
 								scrunning = 0;
 								continue;
 
-							case 'x':
-							case 'X':
+							case 'b':
+							case 'B':
 								if(!qflag)
-									fprintf(stderr, "sending a break\r\n");
+									fprintf(stderr, "->sending a break<-\r\n");
 								tcsendbreak(sfd, 0);
 								continue;
 
+							case 'x':
+							case 'X':
+								escapestate = ESCAPESTATE_WAITFOR1STHEXDIGIT;
+								continue;
+
 							default:
-								if (isxdigit(c)) {
-									escapedigit = hex2dec(c) * 16;
-									escapestate = ESCAPESTATE_WAITFOR2ndDIGIT;
-									continue;
-								}
 								if (((unsigned char)c) != escchr) {
 									write(sfd, &escchr, 1);
 								}
 						}
 						break;
 
-					case ESCAPESTATE_WAITFOR2ndDIGIT:
+					case ESCAPESTATE_WAITFOR1STHEXDIGIT:
+						if (isxdigit(c)) {
+							escapedigit = hex2dec(c) * 16;
+							escapestate = ESCAPESTATE_WAITFOR2NDHEXDIGIT;
+						} else {
+							escapestate = ESCAPESTATE_WAITFORCR;
+							if(!qflag)
+								fprintf(stderr, "->invalid hex digit '%c'<-\r\n", c);
+						}
+						continue;
+
+					case ESCAPESTATE_WAITFOR2NDHEXDIGIT:
 						escapestate = ESCAPESTATE_WAITFORCR;
 						if(isxdigit(c)) {
 							escapedigit += hex2dec(c);
 							write(sfd, &escapedigit, 1);
 							if(!qflag)
-								fprintf(stderr, "wrote 0x%02X character\r\n", escapedigit);
+								fprintf(stderr, "->wrote 0x%02X character '%c'<-\r\n", escapedigit, isprint(escapedigit)?escapedigit:'.');
+						} else {
+							if(!qflag)
+								fprintf(stderr, "->invalid hex digit '%c'<-\r\n", c);
 						}
-						break;
+						continue;
 				}
 				i = write(sfd, &c, 1);
 				if(c == '\n' && msdelay > 0)
@@ -460,18 +475,18 @@
 			"usage:\tsc [-fmq] [-d ms] [-e escape] [-p parms] [-s speed] device\n"
 			"\t-f: use hardware flow control (CRTSCTS)\n"
 			"\t-m: use modem lines (!CLOCAL)\n"
-			"\t-q: don't show connect and disconnect messages\n"
+			"\t-q: don't show connect, disconnect and escape action messages\n"
  			"\t-d: delay in milliseconds after each newline character\n"
 			"\t-e: escape char or \"none\", default '~'\n"
 			"\t-p: bits per char, parity, stop bits, default \"%s\"\n"
 			"\t-s: speed, default \"%s\"\n"
 			"\tdevice, default \"%s\"\n",
 			SC_VERSION, DEFAULTPARMS, DEFAULTSPEED, DEFAULTDEVICE);
-	fprintf(stderr, "escape actions are started with the 3 or 4 character combination: CR + ~ +\n"
+	fprintf(stderr, "escape actions are started with the 3 character combination: CR + ~ +\n"
 		        "\t~ - send '~' character\n"
 		        "\t. - disconnect\n"
-		        "\tx - send break\n"
-   		        "\t<2 hex digits> - send decoded character\n");
+		        "\tb - send break\n"
+   		        "\tx<2 hex digits> - send decoded character\n");
 #if defined(TERMIOS_SPEED_IS_INT)
 	fprintf(stderr, "available speeds depend on device\n");
 #else

Re: [Serialconsole-developers] [sc commit] sc README, 1.7, 1.8 sc.1, 1.6, 1.7 sc.c, 1.8, 1.9

[Stefan B. <st...@la...>]

=C4h, das finde ich nicht so klasse.

~B ist bei cu und ssh die Sequenz, um ein Break zu senden. Kannst du =20
f=FCr das Hex-Senden nicht eine Drei-Zeichen-Sequenz verwenden, z. B. =20=

~xDD?

Und stilistisch: Konstanten werden immer in vollst=E4ndigen =20
Gro=DFbuchstaben definiert, also sollte es ESCAPESTATE_WAITFOR2NDDIGIT =20=

hei=DFen.


Gru=DF,
Stefan


Am 29.11.2007 um 06:04 schrieb Dirk Jagdmann:

> Update of /cvsroot/serialconsole/sc
> In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31048
>
> Modified Files:
> 	README sc.1 sc.c
> Log Message:
> added sending of arbitrary character via a new escape action
> sending break is now done with ~x
> updated help texts and manpage
>
>
> Index: README
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/serialconsole/sc/README,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -d -r1.7 -r1.8
> --- README	11 Jul 2007 18:57:57 -0000	1.7
> +++ README	29 Nov 2007 05:04:32 -0000	1.8
> @@ -19,6 +19,8 @@
>
> 0.95
> - add "-d" parameters which sets a delay after writing a newline =20
> character.
> +- allow arbitrary characters to be composed with the escape =20
> character.
> +- escape break character is now 'x'
>
> 0.94
> - Fix DTR setting code
>
> Index: sc.1
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/serialconsole/sc/sc.1,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -d -r1.6 -r1.7
> --- sc.1	25 Oct 2007 01:30:28 -0000	1.6
> +++ sc.1	29 Nov 2007 05:04:32 -0000	1.7
> @@ -91,9 +91,11 @@
> The escape character can be used to end the connection to the serial =20=

> device,
> send special characters over the connection, and terminate
> .Nm .
> -The escape character must always follow a newline to be interpreted =20=

> as
> -special.  It can be changed using the
> +The escape character must always follow a newline (more specific: a =20=

> carriage return character) to be interpreted as
> +special. The character can be changed using the
> .Fl e
> +option. Some escape actions output a message indicating which =20
> action was executed. To turn off those messages use the
> +.Fl q
> option.
> .Pp
> The supported escapes (assuming the default
> @@ -104,8 +106,10 @@
> Send a single ~ to the device.
> .It Cm ~.
> Disconnect.
> -.It Cm ~B
> +.It Cm ~X
> Send a BREAK to the device, if supported by the driver.
> +.It Cm ~<2x hex character>
> +Reads two hexadecimal digits and sends one byte representing those =20=

> digits. Valid hex characters are 0-9, a-f, A-F.
> .El
> .\" .Sh BUGS
> .Sh SEE ALSO
>
> Index: sc.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/serialconsole/sc/sc.c,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -d -r1.8 -r1.9
> --- sc.c	11 Jul 2007 17:27:30 -0000	1.8
> +++ sc.c	29 Nov 2007 05:04:32 -0000	1.9
> @@ -139,12 +139,14 @@
> enum escapestates {
> 	ESCAPESTATE_WAITFORCR =3D 0,
> 	ESCAPESTATE_WAITFOREC,
> -	ESCAPESTATE_PROCESSCMD
> +	ESCAPESTATE_PROCESSCMD,
> +	ESCAPESTATE_WAITFOR2ndDIGIT,
> };
>
>
> static int scrunning =3D 1;
> static char *path_dev =3D PATH_DEV "/";
> +static int qflag =3D 0;
>
>
> static void
> @@ -266,11 +268,42 @@
> 		ti->c_cflag & CRTSCTS ? "" : "no ");
> }
>
> +static int
> +hex2dec(char c)
> +{
> +  switch(c)
> +    {
> +    case '0': return 0;
> +    case '1': return 1;
> +    case '2': return 2;
> +    case '3': return 3;
> +    case '4': return 4;
> +    case '5': return 5;
> +    case '6': return 6;
> +    case '7': return 7;
> +    case '8': return 8;
> +    case '9': return 9;
> +    case 'a': return 10;
> +    case 'b': return 11;
> +    case 'c': return 12;
> +    case 'd': return 13;
> +    case 'e': return 14;
> +    case 'f': return 15;
> +    case 'A': return 10;
> +    case 'B': return 11;
> +    case 'C': return 12;
> +    case 'D': return 13;
> +    case 'E': return 14;
> +    case 'F': return 15;
> +    }
> +  return -1;
> +}
>
> static int
> loop(int sfd, int escchr, int msdelay)
> {
> 	enum escapestates escapestate =3D ESCAPESTATE_WAITFOREC;
> +	unsigned char escapedigit;
> 	int i;
> 	char c;
> #if defined(HAS_BROKEN_POLL)
> @@ -328,6 +361,7 @@
> 							escapestate =3D =
ESCAPESTATE_WAITFOREC;
> 						}
> 						break;
> +
> 					case ESCAPESTATE_WAITFOREC:
> 						if (escchr !=3D -1 && =
((unsigned char)c) =3D=3D escchr) {
> 							escapestate =3D =
ESCAPESTATE_PROCESSCMD;
> @@ -337,21 +371,42 @@
> 							escapestate =3D =
ESCAPESTATE_WAITFORCR;
> 						}
> 						break;
> +
> 					case ESCAPESTATE_PROCESSCMD:
> 						escapestate =3D =
ESCAPESTATE_WAITFORCR;
> -						switch (tolower(c)) {
> +						switch (c) {
> 							case '.':
> 								=
scrunning =3D 0;
> 								=
continue;
> -							case 'b':
> +
> +							case 'x':
> +							case 'X':
> +								=
if(!qflag)
> +									=
fprintf(stderr, "sending a break\r\n");
> 								=
tcsendbreak(sfd, 0);
> 								=
continue;
> +
> 							default:
> +								if =
(isxdigit(c)) {
> +									=
escapedigit =3D hex2dec(c) * 16;
> +									=
escapestate =3D ESCAPESTATE_WAITFOR2ndDIGIT;
> +									=
continue;
> +								}
> 								if =
(((unsigned char)c) !=3D escchr) {
> 									=
write(sfd, &escchr, 1);
> 								}
> 						}
> 						break;
> +
> +					case =
ESCAPESTATE_WAITFOR2ndDIGIT:
> +						escapestate =3D =
ESCAPESTATE_WAITFORCR;
> +						if(isxdigit(c)) {
> +							escapedigit +=3D =
hex2dec(c);
> +							write(sfd, =
&escapedigit, 1);
> +							if(!qflag)
> +								=
fprintf(stderr, "wrote 0x%02X character\r\n", escapedigit);
> +						}
> +						break;
> 				}
> 				i =3D write(sfd, &c, 1);
> 				if(c =3D=3D '\n' && msdelay > 0)
> @@ -401,24 +456,29 @@
> static void
> usage(void)
> {
> -	fprintf(stderr, "Connect to a serial device, using this system =
as =20
> a console, version %s.\n"
> -			"usage: sc [-fmq] [-d ms] [-e escape] [-p parms] =
[-s speed] =20
> device\n"
> +	fprintf(stderr, "Connect to a serial device, using this system =
as =20
> a console. Version %s.\n"
> +			"usage:\tsc [-fmq] [-d ms] [-e escape] [-p =
parms] [-s speed] =20
> device\n"
> 			"\t-f: use hardware flow control (CRTSCTS)\n"
> 			"\t-m: use modem lines (!CLOCAL)\n"
> 			"\t-q: don't show connect and disconnect =
messages\n"
>  			"\t-d: delay in milliseconds after each newline =
character\n"
> -			"\t-e: escape char or \"none\", default \"~\"\n"
> +			"\t-e: escape char or \"none\", default '~'\n"
> 			"\t-p: bits per char, parity, stop bits, default =
\"%s\"\n"
> 			"\t-s: speed, default \"%s\"\n"
> 			"\tdevice, default \"%s\"\n",
> 			SC_VERSION, DEFAULTPARMS, DEFAULTSPEED, =
DEFAULTDEVICE);
> +	fprintf(stderr, "escape actions are started with the 3 or 4 =20
> character combination: CR + ~ +\n"
> +		        "\t~ - send '~' character\n"
> +		        "\t. - disconnect\n"
> +		        "\tx - send break\n"
> +   		        "\t<2 hex digits> - send decoded character\n");
> #if defined(TERMIOS_SPEED_IS_INT)
> -	fprintf(stderr, "\tavailable speeds depend on device\n");
> +	fprintf(stderr, "available speeds depend on device\n");
> #else
> 	{
> 		struct termios_speed *ts =3D termios_speeds;
>
> -		fprintf(stderr, "\tavailable speeds: ");
> +		fprintf(stderr, "available speeds: ");
> 		while (ts->speed !=3D 0) {
> 			fprintf(stderr, "%ld ", ts->speed);
> 			ts++;
> @@ -439,7 +499,6 @@
> 	char *parms =3D DEFAULTPARMS;
> 	int fflag =3D 0;
> 	int mflag =3D 0;
> -	int qflag =3D 0;
> 	int sfd =3D -1;
> 	char buffer[PATH_MAX+1];
> 	struct termios serialti, consoleti, tempti;
>
>
> =
-------------------------------------------------------------------------
> SF.Net email is sponsored by: The Future of Linux Business White Paper
> from Novell.  =46rom the desktop to the data center, Linux is going
> mainstream.  Let it simplify your IT future.
> http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
> _______________________________________________
> Serialconsole-developers mailing list
> Ser...@li...
> https://lists.sourceforge.net/lists/listinfo/serialconsole-developers

--=20
Stefan Bethke <st...@la...>   Fon +49 170 346 0140

[Serialconsole-developers] [sc commit] sc README, 1.7, 1.8 sc.1, 1.6, 1.7 sc.c, 1.8, 1.9

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31048

Modified Files:
	README sc.1 sc.c 
Log Message:
added sending of arbitrary character via a new escape action
sending break is now done with ~x
updated help texts and manpage


Index: README
===================================================================
RCS file: /cvsroot/serialconsole/sc/README,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- README	11 Jul 2007 18:57:57 -0000	1.7
+++ README	29 Nov 2007 05:04:32 -0000	1.8
@@ -19,6 +19,8 @@
 
 0.95
 - add "-d" parameters which sets a delay after writing a newline character.
+- allow arbitrary characters to be composed with the escape character.
+- escape break character is now 'x'
 
 0.94
 - Fix DTR setting code

Index: sc.1
===================================================================
RCS file: /cvsroot/serialconsole/sc/sc.1,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sc.1	25 Oct 2007 01:30:28 -0000	1.6
+++ sc.1	29 Nov 2007 05:04:32 -0000	1.7
@@ -91,9 +91,11 @@
 The escape character can be used to end the connection to the serial device,
 send special characters over the connection, and terminate
 .Nm .
-The escape character must always follow a newline to be interpreted as
-special.  It can be changed using the
+The escape character must always follow a newline (more specific: a carriage return character) to be interpreted as
+special. The character can be changed using the
 .Fl e
+option. Some escape actions output a message indicating which action was executed. To turn off those messages use the
+.Fl q
 option.
 .Pp
 The supported escapes (assuming the default
@@ -104,8 +106,10 @@
 Send a single ~ to the device.
 .It Cm ~.
 Disconnect.
-.It Cm ~B
+.It Cm ~X
 Send a BREAK to the device, if supported by the driver.
+.It Cm ~<2x hex character>
+Reads two hexadecimal digits and sends one byte representing those digits. Valid hex characters are 0-9, a-f, A-F.
 .El
 .\" .Sh BUGS
 .Sh SEE ALSO

Index: sc.c
===================================================================
RCS file: /cvsroot/serialconsole/sc/sc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sc.c	11 Jul 2007 17:27:30 -0000	1.8
+++ sc.c	29 Nov 2007 05:04:32 -0000	1.9
@@ -139,12 +139,14 @@
 enum escapestates {
 	ESCAPESTATE_WAITFORCR = 0,
 	ESCAPESTATE_WAITFOREC,
-	ESCAPESTATE_PROCESSCMD
+	ESCAPESTATE_PROCESSCMD,
+	ESCAPESTATE_WAITFOR2ndDIGIT,
 };
 
 
 static int scrunning = 1;
 static char *path_dev = PATH_DEV "/";
+static int qflag = 0;
 
 
 static void
@@ -266,11 +268,42 @@
 		ti->c_cflag & CRTSCTS ? "" : "no ");
 }
 
+static int
+hex2dec(char c)
+{
+  switch(c)
+    {
+    case '0': return 0;
+    case '1': return 1;
+    case '2': return 2;
+    case '3': return 3;
+    case '4': return 4;
+    case '5': return 5;
+    case '6': return 6;
+    case '7': return 7;
+    case '8': return 8;
+    case '9': return 9;
+    case 'a': return 10;
+    case 'b': return 11;
+    case 'c': return 12;
+    case 'd': return 13;
+    case 'e': return 14;
+    case 'f': return 15;
+    case 'A': return 10;
+    case 'B': return 11;
+    case 'C': return 12;
+    case 'D': return 13;
+    case 'E': return 14;
+    case 'F': return 15;
+    }
+  return -1;
+}
 
 static int
 loop(int sfd, int escchr, int msdelay)
 {
 	enum escapestates escapestate = ESCAPESTATE_WAITFOREC;
+	unsigned char escapedigit;
 	int i;
 	char c;
 #if defined(HAS_BROKEN_POLL)
@@ -328,6 +361,7 @@
 							escapestate = ESCAPESTATE_WAITFOREC;
 						}
 						break;
+
 					case ESCAPESTATE_WAITFOREC:
 						if (escchr != -1 && ((unsigned char)c) == escchr) {
 							escapestate = ESCAPESTATE_PROCESSCMD;
@@ -337,21 +371,42 @@
 							escapestate = ESCAPESTATE_WAITFORCR;
 						}
 						break;
+
 					case ESCAPESTATE_PROCESSCMD:
 						escapestate = ESCAPESTATE_WAITFORCR;
-						switch (tolower(c)) {
+						switch (c) {
 							case '.':
 								scrunning = 0;
 								continue;
-							case 'b':
+
+							case 'x':
+							case 'X':
+								if(!qflag)
+									fprintf(stderr, "sending a break\r\n");
 								tcsendbreak(sfd, 0);
 								continue;
+
 							default:
+								if (isxdigit(c)) {
+									escapedigit = hex2dec(c) * 16;
+									escapestate = ESCAPESTATE_WAITFOR2ndDIGIT;
+									continue;
+								}
 								if (((unsigned char)c) != escchr) {
 									write(sfd, &escchr, 1);
 								}
 						}
 						break;
+
+					case ESCAPESTATE_WAITFOR2ndDIGIT:
+						escapestate = ESCAPESTATE_WAITFORCR;
+						if(isxdigit(c)) {
+							escapedigit += hex2dec(c);
+							write(sfd, &escapedigit, 1);
+							if(!qflag)
+								fprintf(stderr, "wrote 0x%02X character\r\n", escapedigit);
+						}
+						break;
 				}
 				i = write(sfd, &c, 1);
 				if(c == '\n' && msdelay > 0)
@@ -401,24 +456,29 @@
 static void
 usage(void)
 {
-	fprintf(stderr, "Connect to a serial device, using this system as a console, version %s.\n"
-			"usage: sc [-fmq] [-d ms] [-e escape] [-p parms] [-s speed] device\n"
+	fprintf(stderr, "Connect to a serial device, using this system as a console. Version %s.\n"
+			"usage:\tsc [-fmq] [-d ms] [-e escape] [-p parms] [-s speed] device\n"
 			"\t-f: use hardware flow control (CRTSCTS)\n"
 			"\t-m: use modem lines (!CLOCAL)\n"
 			"\t-q: don't show connect and disconnect messages\n"
  			"\t-d: delay in milliseconds after each newline character\n"
-			"\t-e: escape char or \"none\", default \"~\"\n"
+			"\t-e: escape char or \"none\", default '~'\n"
 			"\t-p: bits per char, parity, stop bits, default \"%s\"\n"
 			"\t-s: speed, default \"%s\"\n"
 			"\tdevice, default \"%s\"\n",
 			SC_VERSION, DEFAULTPARMS, DEFAULTSPEED, DEFAULTDEVICE);
+	fprintf(stderr, "escape actions are started with the 3 or 4 character combination: CR + ~ +\n"
+		        "\t~ - send '~' character\n"
+		        "\t. - disconnect\n"
+		        "\tx - send break\n"
+   		        "\t<2 hex digits> - send decoded character\n");
 #if defined(TERMIOS_SPEED_IS_INT)
-	fprintf(stderr, "\tavailable speeds depend on device\n");
+	fprintf(stderr, "available speeds depend on device\n");
 #else
 	{
 		struct termios_speed *ts = termios_speeds;
 
-		fprintf(stderr, "\tavailable speeds: ");
+		fprintf(stderr, "available speeds: ");
 		while (ts->speed != 0) {
 			fprintf(stderr, "%ld ", ts->speed);
 			ts++;
@@ -439,7 +499,6 @@
 	char *parms = DEFAULTPARMS;
 	int fflag = 0;
 	int mflag = 0;
-	int qflag = 0;
 	int sfd = -1;
 	char buffer[PATH_MAX+1];
 	struct termios serialti, consoleti, tempti;

[Serialconsole-developers] [sc commit] sc Makefile,1.9,1.10

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10361

Modified Files:
	Makefile 
Log Message:
raised version to 0.95


Index: Makefile
===================================================================
RCS file: /cvsroot/serialconsole/sc/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile	25 Oct 2007 01:33:15 -0000	1.9
+++ Makefile	29 Nov 2007 01:25:06 -0000	1.10
@@ -11,7 +11,7 @@
 CFLAGS+=	-Wall -g
 
 # Release version
-CFLAGS+=	-DSC_VERSION='"0.94"'
+CFLAGS+=	-DSC_VERSION='"0.95"'
 
 # Enable this for operating systems that have a broken poll(2)
 # implementation:

[Serialconsole-developers] [sc commit] sc Makefile,1.8,1.9

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2906

Modified Files:
	Makefile 
Log Message:
added install:
added uninstall:


Index: Makefile
===================================================================
RCS file: /cvsroot/serialconsole/sc/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	11 Jul 2007 16:50:14 -0000	1.8
+++ Makefile	25 Oct 2007 01:33:15 -0000	1.9
@@ -29,6 +29,9 @@
 # default parameters to use
 #CFLAGS+=	-DDEFAULTPARMS='"8n1"'
 
+### install options
+PREFIX?=/usr/local
+
 all:	sc
 
 sc:	sc.c
@@ -36,3 +39,10 @@
 
 clean:
 	rm -f *.o sc *~
+
+install:	sc
+	install -m 755 sc $(PREFIX)/bin
+	install -m 644 sc.1 $(PREFIX)/man/man1
+
+uninstall:
+	rm -f $(PREFIX)/bin/sc $(PREFIX)/man/man1/sc.1

[Serialconsole-developers] [sc commit] sc sc.1,1.5,1.6

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1608

Modified Files:
	sc.1 
Log Message:
fixed -s


Index: sc.1
===================================================================
RCS file: /cvsroot/serialconsole/sc/sc.1,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sc.1	11 Jul 2007 17:05:20 -0000	1.5
+++ sc.1	25 Oct 2007 01:30:28 -0000	1.6
@@ -73,7 +73,7 @@
 (Even, None, or Odd).  The last digit sets the number of stop bits (1 or 2).
 Default
 .Dq 8N1 .
-.It Fl p Ar speed
+.It Fl s Ar speed
 Use
 .Ar speed
 bits per second.  Available rates depend on the serial device.  Default 9600

[Serialconsole-developers] [sc commit] sc README,1.6,1.7

[Dirk J. <do...@us...>]

Update of /cvsroot/serialconsole/sc
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13588

Modified Files:
	README 
Log Message:
fixed formatting


Index: README
===================================================================
RCS file: /cvsroot/serialconsole/sc/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- README	11 Jul 2007 17:05:20 -0000	1.6
+++ README	11 Jul 2007 18:57:57 -0000	1.7
@@ -29,4 +29,4 @@
 - Make DTR control optional, add Linux compatible ioctl to set/reset DTR.
 
 0.92
-First Public Release
+- First Public Release