[rkward-cvs] SF.net SVN: rkward: [1174] trunk/rkward/rkward/rbackend/rembedinternal.cpp

[tfry at users.sourceforge.net]

Revision: 1174
          http://svn.sourceforge.net/rkward/?rev=1174&view=rev
Author:   tfry
Date:     2007-01-18 08:45:57 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
Small cleanup

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rembedinternal.cpp

Modified: trunk/rkward/rkward/rbackend/rembedinternal.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-01-18 16:27:00 UTC (rev 1173)
+++ trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-01-18 16:45:57 UTC (rev 1174)
@@ -195,14 +195,6 @@
 				if (RunLast) R_dot_Last ();
 		}
 
-		// clean up temp directory
-		char *tmpdir;
-		if((tmpdir = getenv ("R_SESSION_TMPDIR"))) {
-			char buf[1024];
-			snprintf ((char *) buf, 1024, "rm -rf %s", tmpdir);
-			R_system ((char *) buf);
-		}
-
 		REmbedInternal::this_pointer->shutdown (false);
 	}
 	/*else {
@@ -319,7 +311,6 @@
 
 // Code-recipe below essentially copied from http://stat.ethz.ch/R-manual/R-devel/doc/manual/R-exts.html#Linking-GUIs-and-other-front_ends-to-R
 // modified quite a bit for our needs.
-	char *tmpdir;
 
 	if (!suicidal) {
 		R_dot_Last ();
@@ -327,11 +318,16 @@
 
 	R_RunExitFinalizers();
 
+#ifdef R_2_4
+	R_CleanTempDir ();
+#else
+	char *tmpdir;
 	if((tmpdir = getenv("R_SESSION_TMPDIR"))) {
 		char buf[1024];
 		snprintf((char *)buf, 1024, "rm -rf %s", tmpdir);
 		R_system((char *)buf);
 	}
+#endif
 
 	/* close all the graphics devices */
 	if (!suicidal) KillAllDevices ();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.