head 1.5; access; symbols OPENPKG_E1_MP_HEAD:1.5 OPENPKG_E1_MP:1.5 OPENPKG_E1_MP_2_STABLE:1.3.10.1 OPENPKG_E1_FP:1.3.10.1 OPENPKG_2_STABLE_MP:1.5 OPENPKG_2_STABLE_20061018:1.3.10.1 OPENPKG_2_STABLE_20060622:1.3 OPENPKG_2_STABLE:1.3.0.10 OPENPKG_2_STABLE_BP:1.3 OPENPKG_2_5_RELEASE:1.3 OPENPKG_2_5_SOLID:1.3.0.8 OPENPKG_2_5_SOLID_BP:1.3 OPENPKG_2_4_RELEASE:1.3 OPENPKG_2_4_SOLID:1.3.0.6 OPENPKG_2_4_SOLID_BP:1.3 OPENPKG_CW_FP:1.3 OPENPKG_2_3_RELEASE:1.3 OPENPKG_2_3_SOLID:1.3.0.4 OPENPKG_2_3_SOLID_BP:1.3 OPENPKG_2_2_RELEASE:1.3 OPENPKG_2_2_SOLID:1.3.0.2 OPENPKG_2_2_SOLID_BP:1.3 OPENPKG_2_1_RELEASE:1.2 OPENPKG_2_1_SOLID:1.2.0.10 OPENPKG_2_1_SOLID_BP:1.2 OPENPKG_2_0_RELEASE:1.2 OPENPKG_2_0_SOLID:1.2.0.8 OPENPKG_2_0_SOLID_BP:1.2 OPENPKG_1_3_RELEASE:1.2 OPENPKG_1_3_SOLID:1.2.0.6 OPENPKG_1_3_SOLID_BP:1.2 OPENPKG_1_2_SOLID:1.2.0.4 OPENPKG_1_2_SOLID_BP:1.2 OPENPKG_1_STABLE:1.2.0.2 OPENPKG_1_STABLE_BP:1.2; locks; strict; comment @# @; 1.5 date 2006.10.12.18.59.53; author rse; state Exp; branches; next 1.4; commitid iaENdnBqxnaqwqQr; 1.4 date 2006.08.27.09.51.11; author rse; state Exp; branches; next 1.3; commitid ubc8aiVIGWtRXsKr; 1.3 date 2004.08.12.18.48.17; author rse; state Exp; branches 1.3.10.1; next 1.2; 1.2 date 2002.06.22.20.39.43; author rse; state dead; branches; next 1.1; 1.1 date 2002.05.29.19.56.13; author rse; state Exp; branches; next ; 1.3.10.1 date 2006.10.16.14.52.49; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.5 log @first cut for Solaris fixes @ text @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 #endif +#include + /* * 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 +#include + 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 @ 1.4 log @upgrading package: minicom 2.1 -> 2.2rc2 @ text @d120 21 @ 1.3 log @add some Debian bugfixes @ text @d1 35 a35 59 A bunch of bugfixes, taken over from the Debian "minicom" package. Index: src/file.c --- src/file.c.orig 2003-04-22 01:56:46 +0200 +++ src/file.c 2004-08-12 20:42:47 +0200 @@@@ -509,7 +509,8 @@@@ GETSDIR_ENTRY *d; { GETSDIR_ENTRY *my_d; - int indxr, len; + int indxr, len, i; + char *j; my_d = d; for(indxr = nrents, len = 0; indxr; --indxr, ++my_d) @@@@ -529,8 +530,18 @@@@ for(indxr = nrents; indxr; --indxr, ++my_d) if(my_d->cflags & FL_TAG) { /* this could be *much* more efficient */ - strcat(ret_buf, my_d->fname); - strcat(ret_buf, " "); + for (i = strlen(ret_buf), j = my_d->fname; *j; j++) { + if (*j == ' ') { + if ((ret_buf = (char*)realloc(ret_buf, ++len)) == NULL) { + file_tell(_("Too many files tagged - buffer would overflow")); + return(NULL); + } + ret_buf[i++] = '\\'; + } + ret_buf[i++] = *j; + } + ret_buf[i++] = ' '; + ret_buf[i] = '\0'; } ret_buf[strlen(ret_buf) - 1] = (char) 0; Index: src/minicom.c --- src/minicom.c.orig 2003-05-16 22:33:19 +0200 +++ src/minicom.c 2004-08-12 20:42:47 +0200 @@@@ -998,7 +998,6 @@@@ if (lang != NULL) { unsigned int j = 0; for (; j < sizeof(l)/sizeof(*l); j++) { - printf("%s/%s\n", v[i], l[j]); if (!strncmp(lang, l[j], strlen(l[j]))) { args[argk++] = "-8"; done = 1; Index: src/rwconf.c --- src/rwconf.c.orig 2003-04-13 00:52:20 +0200 +++ src/rwconf.c 2004-08-12 20:43:17 +0200 @@@@ -105,7 +105,7 @@@@ { "", PUBLIC, "pprog11" }, { "", PUBLIC, "pprog12" }, /* Serial port & friends */ - { DFL_PORT, PRIVATE, "port" }, + { DFL_PORT, PUBLIC, "port" }, { CALLIN, PRIVATE, "callin" }, { CALLOUT, PRIVATE, "callout" }, { UUCPLOCK, PRIVATE, "lock" }, d37 4 a40 4 --- src/updown.c.orig 2003-04-13 00:52:20 +0200 +++ src/updown.c 2004-08-12 20:43:46 +0200 @@@@ -352,6 +352,22 @@@@ (void) mcd(""); d63 3 a65 3 --- src/util.c.orig 2003-03-30 20:55:54 +0200 +++ src/util.c 2004-08-12 20:42:47 +0200 @@@@ -113,7 +113,7 @@@@ d69 3 a71 3 - while((p = strchr(p, '\\')) != (char *)NULL) + while((p = strchr(p, '\\')) != (char *)NULL && *(p+1) != ' ') strcpy(p, p + 1); d74 46 @ 1.3.10.1 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @d1 59 a59 35 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 #endif +#include + /* * 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 +#include + extern char **environ; d61 4 a64 4 --- 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(""); d87 3 a89 3 --- 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 @@@@ d93 3 a95 3 - while ((p = strchr(p, '\\'))) + while ((p = strchr(p, '\\')) && *(p+1) != ' ') memmove(p, p + 1, strlen(p+1)); a97 67 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 @ 1.2 log @upgrading package: minicom 1.83.1 -> 2.00.0 @ text @d1 12 a12 4 --- src/updown.c.orig Thu Jul 9 14:49:47 1998 +++ src/updown.c Sun Dec 13 18:34:51 1998 @@@@ -230,7 +230,7 @@@@ do_log(cmdline); /* jl 22.06.97 */ d14 21 a34 9 if (P_PFULL(g) == 'N') { - win = wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1); + win = wopen(5, 5, 74, 11, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1); snprintf(title, sizeof(title), _("%.30s %s - Press CTRL-C to quit"), P_PNAME(g), what == 'U' ? _("upload") : _("download")); wtitle(win, TMID, title); --- src/window.c.orig Tue Aug 11 03:10:29 1998 +++ src/window.c Tue Aug 11 03:07:12 1998 @@@@ -104,7 +104,7 @@@@ d36 30 a65 18 int useattr = 1; int dirflush = 1; -extern int LINES, COLS; +int LINES, COLS; int usecolor = 0; WIN *stdwin; char *_tptr = CNULL; --- src/windiv.c.orig Mon Mar 2 14:28:51 1998 +++ src/windiv.c Tue Aug 11 02:48:32 1998 @@@@ -12,6 +12,7 @@@@ * * hgk+jl 02.98 File selection window */ +#include #include #include #include "port.h" @@@@ -244,8 +245,14 @@@@ d67 8 a74 7 /* get regular files */ dirlist[nCnt].d_ino = dirent->d_ino; - dirlist[nCnt].d_off = dirent->d_off; dirlist[nCnt].d_reclen = dirent->d_reclen; +#if (defined(BSD) && (BSD >= 199306)) + dirlist[nCnt].d_type = dirent->d_type; + dirlist[nCnt].d_namlen = dirent->d_namlen; d76 4 a79 14 + dirlist[nCnt].d_off = dirent->d_off; +#endif + strcpy(dirlist[nCnt].d_name, dirent->d_name ); nMaxWidth = max(nMaxWidth, strlen(dirent->d_name)); nCnt++; --- src/ascii-xfr.c.orig Sun Mar 8 08:10:26 1998 +++ src/ascii-xfr.c Sun Dec 13 21:55:16 1998 @@@@ -14,6 +14,10 @@@@ #include #include #include +#if (defined(__unix__) || defined(unix)) && !defined(USG) +#include /* get BSD definition if present */ d81 1 d83 13 d97 1 a97 29 /* * Externals. --- src/sysdep1.c.orig Wed Mar 15 08:45:03 2000 +++ src/sysdep1.c Fri Nov 10 09:26:24 2000 @@@@ -69 +69 @@@@ -#if defined(TIOCM_RTS) && defined(TIOCMODG) +#if defined(TIOCM_RTS) && defined(TIOCMGET) @@@@ -72 +72 @@@@ - ioctl(fd, TIOCMODG, &mcs); + ioctl(fd, TIOCMGET, &mcs); @@@@ -74 +74 @@@@ - ioctl(fd, TIOCMODS, &mcs); + ioctl(fd, TIOCMSET, &mcs); @@@@ -180 +180 @@@@ -#ifdef TIOCMODG +#ifdef TIOCMGET @@@@ -183 +183 @@@@ - ioctl(fd, TIOCMODG, &mcs); + ioctl(fd, TIOCMGET, &mcs); @@@@ -221,2 +221,2 @@@@ -#ifdef TIOCMODG - ioctl(fd, TIOCMODG, &m_word); +#ifdef TIOCMGET + ioctl(fd, TIOCMGET, &m_word); @@@@ -243,2 +243,2 @@@@ -#ifdef TIOCMODS - ioctl(fd, TIOCMODS, &m_word); +#ifdef TIOCMSET + ioctl(fd, TIOCMSET, &m_word); @ 1.1 log @Finally rename all foo-X.Y.patch files to foo.patch in order to allow us to preserve history in CVS for patch files. @ text @@