X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Fao-dbg%2Fao-dbg-main.c;h=8c87903510b5a325297afca854a1944a4cccbdaf;hp=72249a6b0855402d65f5093eb925a893dc2ec239;hb=f14c799ae7ff3be56c28f5694f04c03daff7708e;hpb=1c2a0b6653623b689d68d7349a6b2dce3e20a4a6

diff --git a/ao-tools/ao-dbg/ao-dbg-main.c b/ao-tools/ao-dbg/ao-dbg-main.c
index 72249a6b..8c879035 100644
--- a/ao-tools/ao-dbg/ao-dbg-main.c
+++ b/ao-tools/ao-dbg/ao-dbg-main.c
@@ -16,6 +16,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ao-dbg.h"
 #include <unistd.h>
 #include <sys/types.h>
@@ -24,6 +28,7 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <poll.h>
+#include <getopt.h>
 
 static int s51_port = 0;
 static char *cpu = "8051";
@@ -32,6 +37,8 @@ char *s51_prompt = "> ";
 struct ccdbg *s51_dbg;
 int s51_interrupted = 0;
 int s51_monitor = 0;
+char *s51_tty = NULL;
+char *s51_device = NULL;
 
 static FILE *s51_input;
 static FILE *s51_output;
@@ -48,14 +55,19 @@ void s51_sigint()
 	s51_interrupted = 1;
 }
 
+static const struct option options[] = {
+	{ .name = "tty", .has_arg = 1, .val = 'T' },
+	{ .name = "device", .has_arg = 1, .val = 'D' },
+	{ 0, 0, 0, 0 },
+};
+
 int
 main(int argc, char **argv)
 {
 	int flags, opt;
 	char *endptr;
-	struct sigvec vec, ovec;
 
-	while ((opt = getopt(argc, argv, "PVvHhmt:X:c:r:Z:s:S:p:")) != -1) {
+	while ((opt = getopt_long(argc, argv, "PVvHhmt:X:c:r:Z:s:S:p:T:", options, NULL)) != -1) {
 		switch (opt) {
 		case 't':
 			cpu = optarg;
@@ -104,6 +116,12 @@ main(int argc, char **argv)
 		case 'm':
 			s51_monitor = 1;
 			break;
+		case 'T':
+			s51_tty = optarg;
+			break;
+		case 'D':
+			s51_device = optarg;
+			break;
 		}
 	}
 	if (s51_port) {
@@ -150,22 +168,16 @@ main(int argc, char **argv)
 				perror("fdopen");
 				exit(1);
 			}
-			vec.sv_handler = SIG_IGN;
-			vec.sv_mask = 0;
-			vec.sv_flags = 0;
-			sigvec(SIGINT, &vec, &ovec);
+			signal(SIGINT, SIG_IGN);
 			command_read();
-			sigvec(SIGINT, &ovec, NULL);
+			signal(SIGINT, SIG_DFL);
 			fclose(s51_input);
 			fclose(s51_output);
 		}
 	} else {
 		s51_input = stdin;
 		s51_output = stdout;
-		vec.sv_handler = s51_sigint;
-		vec.sv_mask = 0;
-		vec.sv_flags = 0;
-		sigvec(SIGINT, &vec, &ovec);
+		signal(SIGINT, s51_sigint);
 		command_read();
 	}
 	exit(0);
@@ -189,13 +201,16 @@ s51_putc(int c)
 	putc(c, s51_output);
 }
 
+#if HAVE_LIBREADLINE
 #include <readline/readline.h>
 #include <readline/history.h>
+#endif
 
 int
 s51_read_line(char *line, int len)
 {
 	int ret;
+#if HAVE_LIBREADLINE
 	if (s51_output == stdout && s51_input == stdin && s51_prompt) {
 		char *r;
 
@@ -206,7 +221,9 @@ s51_read_line(char *line, int len)
 		line[len-1] = '\0';
 		add_history(r);
 		return 1;
-	} else {
+	} else
+#endif
+	{
 		if (s51_prompt)
 			s51_printf("%s", s51_prompt);
 		else