--- gforth/libcc.fs	2007/04/25 22:11:29	1.12
+++ gforth/libcc.fs	2007/05/31 18:10:39	1.16
@@ -99,6 +99,12 @@ struct
     \  counted string: c-name
 end-struct cff%
 
+variable c-source-file-id \ contains the source file id of the current batch
+0 c-source-file-id !
+variable lib-handle-addr \ points to the library handle of the current batch.
+                         \ the library handle is 0 if the current
+                         \ batch is not yet compiled.
+2variable lib-filename \ filename without extension
 
 : .nb ( n -- )
     0 .r ;
@@ -120,6 +126,18 @@ end-struct cff%
     c c-addr1 c!
     c-addr1 u1 1 /string ;
 
+: s+ { addr1 u1 addr2 u2 -- addr u }
+    u1 u2 + allocate throw { addr }
+    addr1 addr u1 move
+    addr2 addr u1 + u2 move
+    addr u1 u2 +
+;
+
+: append { addr1 u1 addr2 u2 -- addr u }
+    addr1 u1 u2 + dup { u } resize throw { addr }
+    addr2 addr u1 + u2 move
+    addr u ;
+
 \ linked list stuff (should go elsewhere)
 
 hex
@@ -158,19 +176,22 @@ end-struct c-prefix%
 variable c-prefix-lines 0 c-prefix-lines !
 variable c-prefix-lines-end c-prefix-lines c-prefix-lines-end !
 
+: print-c-prefix-line ( node -- )
+    dup c-prefix-chars swap c-prefix-count @ type cr ;
+
+: print-c-prefix-lines ( -- )
+    c-prefix-lines @ ['] print-c-prefix-line list-map ;
+
 : save-c-prefix-line ( c-addr u -- )
+    c-source-file-id @ ?dup-if
+	>r 2dup r> write-line throw
+    then
     align here 0 , c-prefix-lines-end list-append ( c-addr u )
     longstring, ;
 
 : \c ( "rest-of-line" -- )
     -1 parse save-c-prefix-line ;
 
-: print-c-prefix-line ( node -- )
-    dup c-prefix-chars swap c-prefix-count @ type cr ;
-
-: print-c-prefix-lines ( -- )
-    c-prefix-lines @ ['] print-c-prefix-line list-map ;
-
 \c #include "engine/libcc.h"
 
 \ Types (for parsing)
@@ -333,7 +354,7 @@ create gen-wrapped-types
 : gen-wrapper-function ( addr -- )
     \ addr points to the return type index of a c-function descriptor
     dup { descriptor }
-    c@+ { ret } count 2dup { d: pars } chars + count { d: c-name }
+    count { ret } count 2dup { d: pars } chars + count { d: c-name }
     ." void " descriptor wrapper-function-name 2dup type drop free throw
     .\" (void)\n"
     .\" {\n  Cell MAYBE_UNUSED *sp = gforth_SP;\n  Float MAYBE_UNUSED *fp = gforth_FP;\n  "
@@ -346,17 +367,22 @@ create gen-wrapped-types
     endif
     .\" }\n" ;
 
-variable c-source-file-id \ contains the source file id of the current batch
-0 c-source-file-id !
-variable lib-handle-addr \ points to the library handle of the current batch.
-                         \ the library handle is 0 if the current
-                         \ batch is not yet compiled.
+: tempdir ( -- c-addr u )
+    s" TMPDIR" getenv dup 0= if
+        2drop s" /tmp"
+    then ;
+
+: gen-filename ( x -- c-addr u )
+    \ generates a filename without extension for lib-handle-addr X
+    0 <<# ['] #s $10 base-execute #> 
+    tempdir s" /gforth-c-" s+ 2swap append #>> ;
 
 : init-c-source-file ( -- )
     c-source-file-id @ 0= if
-	s" xxx.c" w/o create-file throw dup c-source-file-id !
-	['] print-c-prefix-lines swap outfile-execute
-	here 0 , lib-handle-addr !
+	here 0 , dup lib-handle-addr ! gen-filename 2dup lib-filename 2!
+	s" .c" s+ 2dup w/o create-file throw dup c-source-file-id !
+        ['] print-c-prefix-lines swap outfile-execute
+        drop free throw
     endif ;
 
 : c-source-file ( -- file-id )
@@ -365,10 +391,17 @@ variable lib-handle-addr \ points to the
 : compile-wrapper-function ( -- )
     c-source-file close-file throw
     0 c-source-file-id !
-    s" gcc -fPIC -shared -Wl,-soname,xxx.so.1 -Wl,-export_dynamic -o xxx.so.1 -O xxx.c" system
-    $? abort" compiler generated error"
-    s" /home/anton/gforth/xxx.so.1" open-lib dup 0= abort" open-lib failed"
-    ( lib-handle ) lib-handle-addr @ ! ;
+    s" gcc -I. -fPIC -shared -Wl,-soname," lib-filename 2@ s+
+    s" .so.1 -Wl,-export_dynamic -o " append lib-filename 2@ append
+    s" .so.1 -O " append lib-filename 2@ append s" .c" append ( c-addr u )
+    2dup system drop free throw
+    $? abort" compiler generated error" \ !! call dlerror
+    lib-filename 2@ s" .so.1" s+
+    2dup open-lib dup 0= abort" open-lib failed" \ !! call dlerror
+    ( lib-handle ) lib-handle-addr @ !
+    2dup delete-file throw drop free throw
+    lib-filename 2@ s" .c" s+ 2dup delete-file throw drop free throw
+    lib-filename 2@ drop free throw 0 0 lib-filename 2! ;
 \    s" ar rcs xxx.a xxx.o" system
 \    $? abort" ar generated error" ;
 
@@ -413,35 +446,3 @@ s" Library not found" exception constant
     create parse-name open-lib dup 0= err-nolib and throw ,
   does> ( -- lib )
     @ ;
-
-\ test
-
-\ test all parameter and return types
-
-\ cr .( #include "engine/libcc.h")
-\ cr .( #include <unistd.h>)
-\ cr ." typedef void (* func)(int);
-\ cr ." int test1(int,char*,long,double,void (*)(int));"
-\ cr ." Cell *test2(void);"
-\ cr ." int test3(void);"
-\ cr ." float test4(void);"
-\ cr ." func test5(void);"
-\ cr ." void test6(void);"
-\ cr
-
-\ c-function dlseek lseek n d n -- d
-\ c-function n test1 n a d r func -- n
-\ c-function a test2 -- a
-\ c-function d test3 -- d
-\ c-function r test4 -- r
-\ c-function func test5 -- func
-\ c-function void test6 -- void
-
-\c #include <string.h>
-\c #include <stdlib.h>
-
-c-function strlen strlen a -- n
-c-function labs labs n -- n
-
-cr s\" fooo\0" 2dup dump drop .s strlen cr .s drop cr 
--5 labs .s drop cr