Author: nextgens
Date: 2006-07-02 17:23:30 +0000 (Sun, 02 Jul 2006)
New Revision: 9428
Modified:
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
trunk/freenet/src/freenet/support/CPUInformation/CPUID.java
trunk/freenet/src/net/i2p/util/NativeBigInteger.java
Log:
hopefully address #516
(/tmp needs to allow the creation of executable files)
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-07-02
15:04:31 UTC (rev 9427)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-07-02
17:23:30 UTC (rev 9428)
@@ -12,6 +12,7 @@
import freenet.client.InserterException;
import freenet.config.SubConfig;
import freenet.keys.FreenetURI;
+import freenet.node.ExtVersion;
import freenet.node.Node;
import freenet.node.Version;
import freenet.node.useralerts.UserAlert;
@@ -413,7 +414,18 @@
buf.append("Version\n");
buf.append("</div>\n");
buf.append("<div class=\"infobox-content\">\n");
- buf.append("Freenet "+Version.nodeVersion+" Build
#"+Version.buildNumber()+" r"+Version.cvsRevision);
+
+ int ExtBuildNumber = -1;
+ String ExtVer = null;
+ try{
+ ExtBuildNumber = ExtVersion.buildNumber();
+ ExtVer = ExtVersion.cvsRevision;
+ buf.append("Freenet "+Version.nodeVersion+" Build
#"+Version.buildNumber()+" r"+Version.cvsRevision+"<br/>");
+ buf.append("Freenet-ext Build #"+ExtBuildNumber+"
r"+ExtVer+"<br/>");
+ }catch(Exception ex){
+ // Compatibility code ... will be removed
+ }
+
if(Version.buildNumber() < Version.highestSeenBuild &&
advancedDarknetOutputEnabled) {
buf.append("<br />");
buf.append("<b>A newer version is available! (Build
#"+Version.highestSeenBuild+")</b>");
Modified: trunk/freenet/src/freenet/support/CPUInformation/CPUID.java
===================================================================
--- trunk/freenet/src/freenet/support/CPUInformation/CPUID.java 2006-07-02
15:04:31 UTC (rev 9427)
+++ trunk/freenet/src/freenet/support/CPUInformation/CPUID.java 2006-07-02
17:23:30 UTC (rev 9428)
@@ -9,6 +9,8 @@
import java.io.InputStream;
import java.net.URL;
+import freenet.support.Logger;
+
/**
* @author Iakin
* A class for retrieveing details about the CPU using the CPUID assembly
instruction.
@@ -476,7 +478,12 @@
File outFile = null;
try {
InputStream libStream = resource.openStream();
- outFile = File.createTempFile("jcpuid", "lib.tmp");
+ try{
+ outFile = File.createTempFile("jcpuid", "lib.tmp");
+ }catch (IOException e){
+ Logger.error("CPUID", "Can't create the temporary file in
"+System.getProperty("java.io.tmpdir")+" trying something else now.");
+ outFile = new File("cpuid-lib.tmp");
+ }
FileOutputStream fos = new FileOutputStream(outFile);
byte buf[] = new byte[4096*1024];
while (true) {
Modified: trunk/freenet/src/net/i2p/util/NativeBigInteger.java
===================================================================
--- trunk/freenet/src/net/i2p/util/NativeBigInteger.java 2006-07-02
15:04:31 UTC (rev 9427)
+++ trunk/freenet/src/net/i2p/util/NativeBigInteger.java 2006-07-02
17:23:30 UTC (rev 9428)
@@ -19,6 +19,7 @@
import java.io.File;
import freenet.support.HexUtil;
+import freenet.support.Logger;
import freenet.support.CPUInformation.AMDCPUInfo;
import freenet.support.CPUInformation.CPUID;
import freenet.support.CPUInformation.CPUInfo;
@@ -499,7 +500,12 @@
File outFile = null;
try {
InputStream libStream = resource.openStream();
- outFile = File.createTempFile("jbigi", "lib.tmp");
+ try{
+ outFile = File.createTempFile("jbigi", "lib.tmp");
+ }catch (IOException e){
+ Logger.error("NativeBigInt", "Can't create the temporary file
in "+System.getProperty("java.io.tmpdir")+" trying something else now.");
+ outFile = new File("jbigi-lib.tmp");
+ }
FileOutputStream fos = new FileOutputStream(outFile);
byte buf[] = new byte[4096*1024];
while (true) {
