Date: Mon, 29 Jul 1996 06:33:46 -0700 (MST) From: Don Yuniskis <dgy@rtd.com> To: freebsd-ports@freefall.FreeBSD.org (FreeBSD ports) Subject: ecu diffs Message-ID: <199607291333.GAA27538@seagull.rtd.com>
next in thread | raw e-mail | index | archive | help
Greetings!
The following diffs are agains ecu-3.34b on FreeBSD 2.1R.
I realize 3.39 is out -- but I'm running 3.34b. Most of these
changes don't appear to be reflected in 3.39, either.
The patches are a bit sloppy for distribution in anything
other than an FBSD port -- though they've already been submitted
to the author...
-don
----------8<---------------8<------------------8<-------------
*** work/ecu/config.c Sun Apr 9 00:23:38 1995
--- work.new/ecu/config.c Fri Jul 26 01:49:07 1996
***************
*** 1050,1055 ****
--- 1050,1056 ----
break;
case S_FREEBSD:
fputs("SYSTEM = FreeBSD\n", fpmake);
+ fputs("HDBLIBDIR = /etc/uucp\n", fpmake);
break;
}
***************
*** 1587,1593 ****
printf("\nWhat is the maximum number of screen columns (>= 80)? ");
printf("[%d]\n: ", screen_columns);
tgets(s128);
! if(s128[0] && (screen_lines = atoi(s128)) < 80)
fputs("\7",stderr);
else
itmp = 1;
--- 1588,1594 ----
printf("\nWhat is the maximum number of screen columns (>= 80)? ");
printf("[%d]\n: ", screen_columns);
tgets(s128);
! if(s128[0] && (screen_columns = atoi(s128)) < 80)
fputs("\7",stderr);
else
itmp = 1;
diff -r --context work/ecu/ecuDCE.c work.new/ecu/ecuDCE.c
*** work/ecu/ecuDCE.c Thu Jan 12 13:19:44 1995
--- work.new/ecu/ecuDCE.c Fri Jul 26 02:29:24 1996
***************
*** 169,180 ****
type = MI_INIT;
else if (ulindex(typestr, "dial_") == 0)
type = MI_DIAL;
else if (!strcmpi(typestr, "autoanswer"))
type = MI_AUTOANS;
else if (!strcmpi(typestr, "ok_string"))
type = MI_OKSTRING;
- else if (!strcmpi(typestr, "connect_string"))
- type = MI_CONNSTR;
else
{
erc = eSyntaxError;
--- 169,181 ----
type = MI_INIT;
else if (ulindex(typestr, "dial_") == 0)
type = MI_DIAL;
+ /* DGY 07/25/96 allow "connect_string_" to be conditioned by baud */
+ else if (ulindex(typestr, "connect_string_") == 0)
+ type = MI_CONNSTR;
else if (!strcmpi(typestr, "autoanswer"))
type = MI_AUTOANS;
else if (!strcmpi(typestr, "ok_string"))
type = MI_OKSTRING;
else
{
erc = eSyntaxError;
***************
*** 187,192 ****
--- 188,194 ----
else if (ulindex(typestr, "_default") > 0)
{
truth = !(((type == MI_INIT) && Lmodem_init[0]) ||
+ ((type == MI_CONNSTR) && Lmodem_connstring[0]) ||
((type == MI_DIAL) && Lmodem_dial[0]));
}
else
***************
*** 207,214 ****
if (erc = skip_colon(&sesd))
goto SHOW_ERROR;
! /* make sure init or dial string not empty or too long */
! if ((erc = skip_cmd_break(&sesd)) && (type != MI_AUTOANS))
goto SHOW_ERROR;
if ((sesd.cb - sesd.index) > (MI_MAX_LEN - 1))
--- 209,217 ----
if (erc = skip_colon(&sesd))
goto SHOW_ERROR;
! /* make sure init connect or dial string not empty or too long */
! if ((erc = skip_cmd_break(&sesd)) &&
! !((type == MI_AUTOANS) || (type == MI_OKSTRING)))
goto SHOW_ERROR;
if ((sesd.cb - sesd.index) > (MI_MAX_LEN - 1))
diff -r --context work/ecu/ecuphrase.c work.new/ecu/ecuphrase.c
*** work/ecu/ecuphrase.c Wed May 4 01:39:00 1994
--- work.new/ecu/ecuphrase.c Fri Jul 26 04:52:56 1996
***************
*** 243,249 ****
phrase_help()
{
ff(se, "^r == \\r ^n == \\n ^t == \\t ^^ == '^'\r\n");
! ff(se, "^p#. pause # secs\r\n");
! ff(se, "^a#. arg number # of %%# invocation\r\n");
} /* end of phrase_help */
/* vi: set tabstop=4 shiftwidth=4: */
--- 243,249 ----
phrase_help()
{
ff(se, "^r == \\r ^n == \\n ^t == \\t ^^ == '^'\r\n");
! ff(se, "^p#. pause # seconds / 10\r\n");
! ff(se, "^a#. argument # of invocation\r\n");
} /* end of phrase_help */
/* vi: set tabstop=4 shiftwidth=4: */
diff -r --context work/ecu/ecutty.c work.new/ecu/ecutty.c
*** work/ecu/ecutty.c Tue May 9 15:35:27 1995
--- work.new/ecu/ecutty.c Sat Jul 27 03:08:44 1996
***************
*** 227,239 ****
#endif /* M_SYSV */
#if defined(ISCSVR4) || defined(LINUX) || defined(ESIXSVR4) || defined(__FreeBSD__)
! ulong colors_initial = 0x00002528L;
! ulong colors_current = 0x00002528L;
! ulong colors_normal = 0x00002528L; /* white */
! ulong colors_success = 0x00002028L; /* green */
! ulong colors_alert = 0x00002128L; /* yellow */
! ulong colors_error = 0x00001F28L; /* red */
! ulong colors_notify = 0x00002428L; /* cyan */
#define COLORS_DEFINED
#endif /* ISCSVR4 */
--- 227,240 ----
#endif /* M_SYSV */
#if defined(ISCSVR4) || defined(LINUX) || defined(ESIXSVR4) || defined(__FreeBSD__)
! ulong colors_initial = 0x00070700L; /* value unimportant */
! ulong colors_current = 0x00070700L; /* value unimportant */
! /* note that the contents of the "color" file can override these... */
! ulong colors_normal = 0x00070700L; /* white on black */
! ulong colors_success = 0x00020200L; /* green on black */
! ulong colors_alert = 0x000E0E00L; /* yellow on black */
! ulong colors_error = 0x00040400L; /* red on black */
! ulong colors_notify = 0x00030300L; /* cyan on black */
#define COLORS_DEFINED
#endif /* ISCSVR4 */
***************
*** 423,435 ****
return;
#ifdef __FreeBSD__
fgcolor = (clrs >> 8) & 0xff;
- if (fgcolor >= 30)
- fgcolor -= 30;
bgcolor = clrs & 0xff;
- if (bgcolor >= 40)
- bgcolor -= 40;
- ff(se, "\033[m"); /* reset all prev attrs */
if (fgcolor & 0x10)
{
fgcolor &= ~0x10;
--- 424,432 ----
return;
#ifdef __FreeBSD__
+ ff(se, "\033[m"); /* reset all prev attrs */
fgcolor = (clrs >> 8) & 0xff;
bgcolor = clrs & 0xff;
if (fgcolor & 0x10)
{
fgcolor &= ~0x10;
***************
*** 441,447 ****
ff(se, "\033[5m"); /* set intense */
}
! ff(se, "\033[3%d;4%dm", fgcolor, bgcolor);
#else
#if defined(SVR4) || defined(LINUX)
#if defined(ESIXSVR4) || defined(LINUX)
--- 438,448 ----
ff(se, "\033[5m"); /* set intense */
}
! /* normal */
! ff(se, "\033[=%ldF\033[=%ldG", (clrs >> 8) & 0xFF, clrs & 0xFF);
!
! /* reverse */
! ff(se, "\033[=%ldH\033[=%ldI", (clrs >> 24) & 0xFF, (clrs >> 16) & 0xFF);
#else
#if defined(SVR4) || defined(LINUX)
#if defined(ESIXSVR4) || defined(LINUX)
***************
*** 646,651 ****
--- 647,655 ----
ulong fgnd;
ulong bgnd;
+ if (got_original_colors)
+ return;
+
colors_initial = colors_normal; /* scoterm can use color but ... */
if (ioctl(TTYIN, GIO_ATTR, &cur_attr) == -1) /* ... GIO_ATTR won't work */
return;
***************
*** 657,662 ****
--- 661,667 ----
write(1, "\033[7m", 4); /* select reverse */
#ifdef __FreeBSD__
(void) ioctl(TTYIN, GIO_ATTR, &cur_attr);
+ cur_attr >>= 8;
#else
cur_attr = (uint) ioctl(TTYIN, GIO_ATTR, 0);
#endif
***************
*** 670,675 ****
--- 675,681 ----
write(1, "\033[m", 3); /* select normal */
#ifdef __FreeBSD__
(void) ioctl(TTYIN, GIO_ATTR, &cur_attr);
+ cur_attr >>= 8;
#else
cur_attr = (uint) ioctl(TTYIN, GIO_ATTR, 0);
#endif
***************
*** 740,747 ****
} /* while records left to ready */
#if defined(M_SYSV) || defined(__FreeBSD__)
! if (ioctl(TTYIN, GIO_ATTR, 0) == -1)
colors_initial = colors_normal; /* hack for scoterm */
#endif
fclose(fp);
--- 746,757 ----
} /* while records left to ready */
#if defined(M_SYSV) || defined(__FreeBSD__)
! /* DGY 07/25/96 ioctl will always fail on FreeBSD if argp is NULL */
! {
! uint dummy;
! if (ioctl(TTYIN, GIO_ATTR, &dummy) == -1)
colors_initial = colors_normal; /* hack for scoterm */
+ }
#endif
fclose(fp);
diff -r --context work/ecu/nap.c work.new/ecu/nap.c
*** work/ecu/nap.c Tue Apr 11 13:03:21 1995
--- work.new/ecu/nap.c Fri Jul 26 01:49:09 1996
***************
*** 98,104 ****
(t)->time--; \
(t)->millitm += 1000; \
} \
! } else /* ; supplied by invoker */
#else /* old tvsub */
#define tbsub(t, t0) \
if(1) { \
--- 98,104 ----
(t)->time--; \
(t)->millitm += 1000; \
} \
! } /* ; supplied by invoker */
#else /* old tvsub */
#define tbsub(t, t0) \
if(1) { \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199607291333.GAA27538>