cftp: repository: changeset 4384dcd9e1a7

Navigation

Views: changelog, tags, manifest, raw zip, gz, bz2,

fn_guile.c (catcher): display error instead of evaled string.

changeset 284: 4384dcd9e1a7
parent 283:dd1d808a0a0c
child 570:93d3b04c1b51
author: Dieter Baron <dillo@danbala.tuwien.ac.at>
date: Fri Jan 14 15:46:48 2000 +0000 (10 years ago)
files: ChangeLog TODO fn_guile.c
description: fn_guile.c (catcher): display error instead of evaled string.
--- a/ChangeLog	Tue Jan 11 16:04:26 2000 +0000
+++ b/ChangeLog	Fri Jan 14 15:46:48 2000 +0000
@@ -1,3 +1,7 @@ 2000-01-11  Dieter Baron  <dillo@danbala
+2000-01-13  Dieter Baron  <dillo@danbala.tuwien.ac.at>
+
+	* fn_guile.c (catcher): display error instead of evaled string.
+
 2000-01-11  Dieter Baron  <dillo@danbala.tuwien.ac.at>
 
 	* fn_guile.c (fn_guile, execute_guile, wrapper, catcher):  use
--- a/TODO	Tue Jan 11 16:04:26 2000 +0000
+++ b/TODO	Fri Jan 14 15:46:48 2000 +0000
@@ -1,4 +1,4 @@ b catch guile exceptions
-b catch guile exceptions
+b guile: format error in catcher
 b automake: cftp depends on SCRIPTING_OBJS
 
 * ^[[O triggers bindings for left and O
--- a/fn_guile.c	Tue Jan 11 16:04:26 2000 +0000
+++ b/fn_guile.c	Fri Jan 14 15:46:48 2000 +0000
@@ -66,9 +66,15 @@ static SCM wrapper(void *data, SCM jmpbu
 
 static SCM catcher(void *data, SCM tag, SCM throw_args)
 {
+    char *s;
+    int len;
+    
+    guile_error = 1;
     strcpy(guile_errstr, "ERROR: ");
-    strncat(guile_errstr, (char *)data, 8180);
-    guile_error = 1;
+    /* strncat(guile_errstr, (char *)data, 8180);*/
+    s = scm2cstring(throw_args, &len);
+    strncat(guile_errstr, s, 8180);
+    free(s);
     
     return SCM_BOOL_F;
 }

Powered by Mercurial.