deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bug fix: no nm arguments (tested on linux)

Browse source
This commit is contained in:
fros4943 2006-11-06 22:21:57 +00:00
parent 76055eba40
commit 3d551593ad
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: ContikiMoteType.java,v 1.4 2006/11/06 18:01:56 fros4943 Exp $ * $Id: ContikiMoteType.java,v 1.5 2006/11/06 22:21:57 fros4943 Exp $
*/ */
package se.sics.cooja.contikimote; package se.sics.cooja.contikimote;
@ -582,12 +582,21 @@ public class ContikiMoteType implements MoteType {
if (nmPath == null || nmPath.equals("")) if (nmPath == null || nmPath.equals(""))
return null; return null;
String[] nmExecArray;
if (!nmArgs.trim().equals("")) {
// Arguments need to be passed to program
String[] splittedNmArgs = nmArgs.split(" "); String[] splittedNmArgs = nmArgs.split(" ");
String[] nmExecArray = new String[1 + splittedNmArgs.length + 1]; nmExecArray = new String[1 + splittedNmArgs.length + 1];
nmExecArray[0] = nmPath.trim(); nmExecArray[0] = nmPath.trim();
nmExecArray[nmExecArray.length-1] = libraryFile.getAbsolutePath(); nmExecArray[nmExecArray.length-1] = libraryFile.getAbsolutePath();
System.arraycopy(splittedNmArgs, 0, nmExecArray, 1, splittedNmArgs.length); System.arraycopy(splittedNmArgs, 0, nmExecArray, 1, splittedNmArgs.length);
} else {
nmExecArray = new String[2];
nmExecArray[0] = nmPath.trim();
nmExecArray[1] = libraryFile.getAbsolutePath();
}
String line; String line;
Process p = Runtime.getRuntime().exec(nmExecArray); Process p = Runtime.getRuntime().exec(nmExecArray);
@ -607,6 +616,7 @@ public class ContikiMoteType implements MoteType {
if (nmData == null || nmData.size() == 0) if (nmData == null || nmData.size() == 0)
return null; return null;
logger.debug("#4");
return nmData; return nmData;
} }