Commit: 27e89af5bab875e5d53b6057109c0dd7237e62ed - bsdmorseplus (git)

My own rewrite of the BSD morse code recreational utility

Commit MetaInfo

• Revisão: 27e89af5bab875e5d53b6057109c0dd7237e62ed (tree)
• Hora: 2021-08-29 21:25:53
• Autor: Joel Matthew Rees <joel.rees@gmai...>
• Commiter: Joel Matthew Rees

Mensagem de Log

first step not working right

Mudança Sumário

• modified: bsdmorseplus.c

Diff

--- a/bsdmorseplus.c
+++ b/bsdmorseplus.c
@@ -122,11 +122,94 @@ const struct punc {
 	{ '\0', NULL }
 };
 
+char errorcode[] = "........"; /* JMR20210829 */
+
+
+/* JMR20210829 */
+const char * 
+tomorseif(c)
+	int c;
+{
+	int i;
+
+	if (isalpha(c))
+		return alph[c - (isupper(c)) ? 'A' : 'a'];
+	else if (isdigit(c))
+		return digit[c - '0'];
+	else if (isspace(c))
+		return " ";  /* BT has a different purpose. */
+	else {
+		for ( i = 0; other[i].c; ++i ) {
+			if (other[i].c == c) {
+				return other[i].morse  ;
+			}
+		}
+	}
+        return errorcode;
+}
+
 
 static int sflag;
+
+/* JMR20210829 */
+static char vocbuf[ 8 * 4 + 1 ]; /* Enough to copy errorcode[] */
+
+const char * 
+tovocalmorse( code )
+	const char * code;
+{
+	if (sflag)
+		return code;
+	else { 
+		char * insertion = vocbuf;
+		while ( *code ) {
+			const char * conv = (*code == '.') 
+				? "dit" 
+				: (*code == '-') ? "daw" : " ";
+			strcpy(insertion, conv);
+			insertion += strlen(conv);
+			if ( *++code == '\0' )
+				break;
+                        * insertion++ = ' ';
+		}
+		* insertion++ = '\n';
+		* insertion = '\0';
+		return vocbuf;
+	}
+}
+
+
 static int dflag;
 
 
+/* JMR20210829 */
+int
+totextif(s)
+	const char *s;
+{
+	int i;
+	
+	for (i = 0; i < 10; i++)
+		if (strcmp(digit[i], s) == 0) {
+			return '0' + i;
+		}
+	
+	for (i = 0; i < 26; i++)
+		if (strcmp(alph[i], s) == 0) {
+			return 'A' + i;
+		}
+	i = 0;
+	while (other[i].c) {
+		if (strcmp(other[i].morse, s) == 0) {
+			return other[i].c;
+		}
+		i++;
+	}
+	if (strcmp("...-.-", s) == 0) /* Why SK but no KA? */
+		return '\n';
+	return 'x';	/* line noise */
+}
+
 void
 decode(s)
 	const char *s;
@@ -226,8 +309,11 @@ main(argc, argv)
 
 	if (dflag) {
 		if (*argv) {
+			char outstr;
 			do {
-				decode(*argv);
+/*				decode(*argv); */
+				outstr = totextif( argv );
+				putchar( outstr );
 			} while (*++argv);
 		} else {
 			char foo[10];	/* All morse chars shorter than this */