Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21354
Added Files:
expect-10.9.patch
Log Message:
add 10.9 variant to that builds against tcl 8.6.0
--- NEW FILE: expect-10.9.patch ---
--- expect5.45/exp_inter.c.orig 2013-07-14 13:25:14.000000000 -0400
+++ expect5.45/exp_inter.c 2013-07-14 13:30:18.000000000 -0400
@@ -404,8 +404,8 @@
int matchBytes)
{
int seenBytes; /* either printed or echoed */
- int echoBytes;
- int offsetBytes;
+ int echoBytes = 0;
+ int offsetBytes = 0;
/* write is unlikely to fail, since we just read from same descriptor */
seenBytes = esPtr->printed + esPtr->echoed;
@@ -437,7 +437,7 @@
int key)
{
Tcl_UniChar *eobOld; /* old end of buffer */
- int cc;
+ int cc = 0;
int numchars;
Tcl_UniChar *str;
--- expect5.45/expect.c.orig 2013-07-14 13:28:09.000000000 -0400
+++ expect5.45/expect.c 2010-10-26 18:09:36.000000000 -0400
@@ -2899,7 +2899,7 @@
int def = FALSE;
char* chan = NULL;
int i;
- ExpState *esPtr;
+ ExpState *esPtr = NULL;
for (i=1; i<objc; i++) {
char *name;
--- expect5.45/exp_log.c.orig 2013-07-14 13:41:34.000000000 -0400
+++ expect5.45/exp_log.c 2013-07-14 13:41:56.000000000 -0400
@@ -85,7 +85,7 @@
Tcl_UniChar *buf;
int lenChars;
{
- int wc;
+ int wc = 0;
ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
if (esPtr->valid)
--- expect5.45/expect.c.orig 2013-07-14 13:43:25.000000000 -0400
+++ expect5.45/expect.c 2013-07-14 13:44:06.000000000 -0400
@@ -2363,7 +2363,12 @@
/* "!e" means no case matched - transfer by default */
if (!e || e->transfer) {
- int remainder = numchars-match;
+ int remainder;
+ if (match > numchars) {
+ match = numchars;
+ eo->matchlen = match;
+ }
+ remainder = numchars-match;
/* delete matched chars from input buffer */
esPtr->printed -= match;
if (numchars != 0) {
--- expect5.45/exp_clib.c.orig 2013-07-15 08:54:50.000000000 -0400
+++ expect5.45/exp_clib.c 2013-07-15 08:55:35.000000000 -0400
@@ -1476,8 +1476,8 @@
char *str;
{
if (exp_is_debugging) {
- fprintf(stderr,str);
- if (exp_logfile) fprintf(exp_logfile,str);
+ fprintf(stderr,"%s",str);
+ if (exp_logfile) fprintf(exp_logfile,"%s",str);
}
}
--- expect5.45/pty_termios.c.orig 2013-07-15 08:56:10.000000000 -0400
+++ expect5.45/pty_termios.c 2013-07-15 08:56:40.000000000 -0400
@@ -641,7 +641,7 @@
if (0 > (slave = open(slave_name, O_RDWR))) {
static char buf[500];
exp_pty_error = buf;
- sprintf(exp_pty_error,"open(%s,rw) = %d
(%s)",slave_name,slave,expErrnoMsg(errno));
+ sprintf(exp_pty_error,"open(%s,rw) = %d
(%d)",slave_name,slave,expErrnoMsg(errno));
return(-1);
}
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
