| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141 |
- Index: src/Makefile.in
- --- src/Makefile.in.orig 2006-07-30 13:45:20 +0200
- +++ src/Makefile.in 2006-08-27 11:48:53 +0200
- @@ -209,7 +209,7 @@
- minicom_keyserv_SOURCES = keyserv.c wkeys.c sysdep2.c
- MINICOM_LIBPORT = $(top_builddir)/lib/libport.a
- LDADD = $(MINICOM_LIBPORT)
- -AM_CFLAGS = @CFLAGS@ -Wall -W
- +AM_CFLAGS = @CFLAGS@
- confdir = @MINICOM_CONFDIR@
- AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/lib -DCONFDIR=\"$(confdir)\" \
- -DLOCALEDIR=\"$(datadir)/locale\"
- Index: src/minicom.h
- --- src/minicom.h.orig 2005-10-31 12:10:57 +0100
- +++ src/minicom.h 2006-08-27 11:49:07 +0200
- @@ -34,6 +34,8 @@
- #include <sys/un.h>
- #endif
-
- +#include <time.h>
- +
- /*
- * kubota@debian.or.jp 08/08/98
- * COLS must be equal to or less than MAXCOLS.
- Index: src/port.h
- --- src/port.h.orig 2005-10-31 11:31:38 +0100
- +++ src/port.h 2006-08-27 11:48:53 +0200
- @@ -105,4 +105,7 @@
- # endif
- #endif
-
- +#include <limits.h>
- +#include <time.h>
- +
- extern char **environ;
- Index: src/updown.c
- --- src/updown.c.orig 2005-08-14 22:39:30 +0200
- +++ src/updown.c 2006-08-27 11:48:53 +0200
- @@ -351,6 +351,22 @@
- mcd("");
- timer_update();
-
- + /* return code == 1 if exeve failed */
- + if (win && status == 0x0001) {
- +#if VC_MUSIC
- + if (P_SOUND[0] == 'Y') {
- + wprintf(win, _("\n Failure executing protocol. Press any key to continue..."));
- + music();
- + } else
- + sleep(1);
- +#else
- + /* MARK updated 02/17/94 - If there was no VC_MUSIC capability, */
- + /* then at least make some beeps! */
- + if (P_SOUND[0] == 'Y') wprintf(win, "\007\007\007");
- + sleep(1);
- +#endif
- + } else
- +
- /* If we got interrupted, status != 0 */
- if (win && (status & 0xFF00) == 0) {
- #if VC_MUSIC
- Index: src/util.c
- --- src/util.c.orig 2005-11-09 00:34:25 +0100
- +++ src/util.c 2006-08-27 11:48:53 +0200
- @@ -116,7 +116,7 @@
-
- /* Delete escape-characters ment for the shell */
- p = cmd;
- - while ((p = strchr(p, '\\')))
- + while ((p = strchr(p, '\\')) && *(p+1) != ' ')
- memmove(p, p + 1, strlen(p+1));
-
- /* Split line into words */
- Index: src/window.c
- --- src/window.c.orig 2005-11-06 20:20:57 +0100
- +++ src/window.c 2006-08-27 11:48:53 +0200
- @@ -58,6 +58,7 @@
- #define swap(x, y) { int d = (x); (x) = (y); (y) = d; }
-
- /* Terminal capabilities */
- +static const char *BS;
- static const char *CM, *IS, *RS, *AC, *EA;
- static const char *ME, *SE, *UE, *AE;
- static const char *AS, *MB, *MD, *MR, *SO, *US;
- @@ -337,8 +338,8 @@
- else if (NL != NULL && x == 0 && x == curx && y == cury + 1)
- outstr(NL);
- #endif
- - else if (BC != NULL && y == cury && x == curx - 1)
- - outstr(BC);
- + else if (BS != NULL && y == cury && x == curx - 1)
- + outstr(BS);
- else
- outstr(tgoto(CM, x, y));
- curx = x;
- @@ -2002,7 +2003,7 @@
- CL = tgetstr("cl", &_tptr);
- IC = tgetstr("ic", &_tptr);
- DC = tgetstr("dc", &_tptr);
- - BC = tgetstr("bc", &_tptr);
- + BS = tgetstr("bc", &_tptr);
- CR = tgetstr("cr", &_tptr);
- NL = tgetstr("nl", &_tptr);
- AC = tgetstr("ac", &_tptr);
- @@ -2061,11 +2062,11 @@
- _has_am = tgetflag("am");
- _mv_standout = tgetflag("ms");
- if (tgetflag("bs")) {
- - if (BC == NULL)
- - BC = "\b";
- + if (BS == NULL)
- + BS = "\b";
- }
- else
- - BC = NULL;
- + BS = NULL;
-
- /* Special IBM box-drawing characters */
- D_UL = 201;
- Index: lib/Makefile.in
- --- lib/Makefile.in.orig 2006-07-30 13:45:19.000000000 +0200
- +++ lib/Makefile.in 2006-10-12 20:57:25.294695588 +0200
- @@ -172,7 +172,7 @@
- noinst_LIBRARIES = libport.a
- noinst_HEADERS = libport.h getopt.h
- libport_a_SOURCES =
- -libport_a_LIBADD = @LIBOBJS@ @LIBPORT_GETOPT_LONG_DEP@
- +libport_a_LIBADD = @LIBOBJS@ $(LIBPORT_GETOPT_LONG_DEP)
- all: all-am
-
- .SUFFIXES:
- @@ -226,6 +226,8 @@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/snprintf.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/usleep.Po@am__quote@
-
- +getopt_long.o: $(LIBPORT_GETOPT_LONG_DEP)
- +
- .c.o:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
|