minicom.patch 4.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141
  1. Index: src/Makefile.in
  2. --- src/Makefile.in.orig 2006-07-30 13:45:20 +0200
  3. +++ src/Makefile.in 2006-08-27 11:48:53 +0200
  4. @@ -209,7 +209,7 @@
  5. minicom_keyserv_SOURCES = keyserv.c wkeys.c sysdep2.c
  6. MINICOM_LIBPORT = $(top_builddir)/lib/libport.a
  7. LDADD = $(MINICOM_LIBPORT)
  8. -AM_CFLAGS = @CFLAGS@ -Wall -W
  9. +AM_CFLAGS = @CFLAGS@
  10. confdir = @MINICOM_CONFDIR@
  11. AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/lib -DCONFDIR=\"$(confdir)\" \
  12. -DLOCALEDIR=\"$(datadir)/locale\"
  13. Index: src/minicom.h
  14. --- src/minicom.h.orig 2005-10-31 12:10:57 +0100
  15. +++ src/minicom.h 2006-08-27 11:49:07 +0200
  16. @@ -34,6 +34,8 @@
  17. #include <sys/un.h>
  18. #endif
  19. +#include <time.h>
  20. +
  21. /*
  22. * kubota@debian.or.jp 08/08/98
  23. * COLS must be equal to or less than MAXCOLS.
  24. Index: src/port.h
  25. --- src/port.h.orig 2005-10-31 11:31:38 +0100
  26. +++ src/port.h 2006-08-27 11:48:53 +0200
  27. @@ -105,4 +105,7 @@
  28. # endif
  29. #endif
  30. +#include <limits.h>
  31. +#include <time.h>
  32. +
  33. extern char **environ;
  34. Index: src/updown.c
  35. --- src/updown.c.orig 2005-08-14 22:39:30 +0200
  36. +++ src/updown.c 2006-08-27 11:48:53 +0200
  37. @@ -351,6 +351,22 @@
  38. mcd("");
  39. timer_update();
  40. + /* return code == 1 if exeve failed */
  41. + if (win && status == 0x0001) {
  42. +#if VC_MUSIC
  43. + if (P_SOUND[0] == 'Y') {
  44. + wprintf(win, _("\n Failure executing protocol. Press any key to continue..."));
  45. + music();
  46. + } else
  47. + sleep(1);
  48. +#else
  49. + /* MARK updated 02/17/94 - If there was no VC_MUSIC capability, */
  50. + /* then at least make some beeps! */
  51. + if (P_SOUND[0] == 'Y') wprintf(win, "\007\007\007");
  52. + sleep(1);
  53. +#endif
  54. + } else
  55. +
  56. /* If we got interrupted, status != 0 */
  57. if (win && (status & 0xFF00) == 0) {
  58. #if VC_MUSIC
  59. Index: src/util.c
  60. --- src/util.c.orig 2005-11-09 00:34:25 +0100
  61. +++ src/util.c 2006-08-27 11:48:53 +0200
  62. @@ -116,7 +116,7 @@
  63. /* Delete escape-characters ment for the shell */
  64. p = cmd;
  65. - while ((p = strchr(p, '\\')))
  66. + while ((p = strchr(p, '\\')) && *(p+1) != ' ')
  67. memmove(p, p + 1, strlen(p+1));
  68. /* Split line into words */
  69. Index: src/window.c
  70. --- src/window.c.orig 2005-11-06 20:20:57 +0100
  71. +++ src/window.c 2006-08-27 11:48:53 +0200
  72. @@ -58,6 +58,7 @@
  73. #define swap(x, y) { int d = (x); (x) = (y); (y) = d; }
  74. /* Terminal capabilities */
  75. +static const char *BS;
  76. static const char *CM, *IS, *RS, *AC, *EA;
  77. static const char *ME, *SE, *UE, *AE;
  78. static const char *AS, *MB, *MD, *MR, *SO, *US;
  79. @@ -337,8 +338,8 @@
  80. else if (NL != NULL && x == 0 && x == curx && y == cury + 1)
  81. outstr(NL);
  82. #endif
  83. - else if (BC != NULL && y == cury && x == curx - 1)
  84. - outstr(BC);
  85. + else if (BS != NULL && y == cury && x == curx - 1)
  86. + outstr(BS);
  87. else
  88. outstr(tgoto(CM, x, y));
  89. curx = x;
  90. @@ -2002,7 +2003,7 @@
  91. CL = tgetstr("cl", &_tptr);
  92. IC = tgetstr("ic", &_tptr);
  93. DC = tgetstr("dc", &_tptr);
  94. - BC = tgetstr("bc", &_tptr);
  95. + BS = tgetstr("bc", &_tptr);
  96. CR = tgetstr("cr", &_tptr);
  97. NL = tgetstr("nl", &_tptr);
  98. AC = tgetstr("ac", &_tptr);
  99. @@ -2061,11 +2062,11 @@
  100. _has_am = tgetflag("am");
  101. _mv_standout = tgetflag("ms");
  102. if (tgetflag("bs")) {
  103. - if (BC == NULL)
  104. - BC = "\b";
  105. + if (BS == NULL)
  106. + BS = "\b";
  107. }
  108. else
  109. - BC = NULL;
  110. + BS = NULL;
  111. /* Special IBM box-drawing characters */
  112. D_UL = 201;
  113. Index: lib/Makefile.in
  114. --- lib/Makefile.in.orig 2006-07-30 13:45:19.000000000 +0200
  115. +++ lib/Makefile.in 2006-10-12 20:57:25.294695588 +0200
  116. @@ -172,7 +172,7 @@
  117. noinst_LIBRARIES = libport.a
  118. noinst_HEADERS = libport.h getopt.h
  119. libport_a_SOURCES =
  120. -libport_a_LIBADD = @LIBOBJS@ @LIBPORT_GETOPT_LONG_DEP@
  121. +libport_a_LIBADD = @LIBOBJS@ $(LIBPORT_GETOPT_LONG_DEP)
  122. all: all-am
  123. .SUFFIXES:
  124. @@ -226,6 +226,8 @@
  125. @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/snprintf.Po@am__quote@
  126. @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/usleep.Po@am__quote@
  127. +getopt_long.o: $(LIBPORT_GETOPT_LONG_DEP)
  128. +
  129. .c.o:
  130. @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
  131. @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi