commit e31aaa9fc8b4a86d7afcee96314b2771a6ec2e2d
author oliverschmidt <oliverschmidt> mer. juin 28 23:10:43 2006 +0000
committer oliverschmidt <oliverschmidt> mer. juin 28 23:10:43 2006 +0000
tree f08e11542c636b456a6dcdfaad229ee2a99983ea
parent 2b9fbcd75ba8c577a7398d058d5f32267ee553f9

Removed support for relative paths (and in fact added testing for absolute paths) as relative paths are not re-applyable by their very nature.

contiki-apple2/apps/config.c

diff --git a/contiki-apple2/apps/config.c b/contiki-apple2/apps/config.c
index 73db7d8..409da35 100644
--- a/contiki-apple2/apps/config.c
+++ b/contiki-apple2/apps/config.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: config.c,v 1.12 2006/05/30 20:57:35 oliverschmidt Exp $
+ * $Id: config.c,v 1.13 2006/06/28 23:10:44 oliverschmidt Exp $
  *
  */
 
@@ -95,10 +95,8 @@
     program_handler_load(config.driver, NULL);
   }
 
-  if(*config.prefix) {
-    if(chdir(config.prefix) == 0) {
-      config_setprefixlen(strlen(config.prefix));
-    }
+  if(*config.prefix == '/') {
+    config_setprefixok(chdir(config.prefix) == 0);
   }
 
 #ifdef WITH_UIP

contiki-apple2/apps/config.h

diff --git a/contiki-apple2/apps/config.h b/contiki-apple2/apps/config.h
index cb6d9c0..ea7e1b3 100644
--- a/contiki-apple2/apps/config.h
+++ b/contiki-apple2/apps/config.h
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki desktop environment 
  *
- * $Id: config.h,v 1.7 2006/05/28 20:50:13 oliverschmidt Exp $
+ * $Id: config.h,v 1.8 2006/06/28 23:10:44 oliverschmidt Exp $
  *
  */
 #ifndef __CONFIG_H__
@@ -53,12 +53,12 @@
 } config_t;
 
 extern unsigned char lanslot;
-extern unsigned char prefixlen;
+extern unsigned char prefixok;
 
-#define config_getlanslot()	    lanslot
-#define config_setlanslot(slot)	    lanslot = (slot)
+#define config_getlanslot()	lanslot
+#define config_setlanslot(slot)	lanslot = (slot)
 
-#define config_getprefixlen()	    prefixlen
-#define config_setprefixlen(len)    prefixlen = (len)
+#define config_getprefixok()	prefixok
+#define config_setprefixok(ok)  prefixok = (ok)
 
 #endif /* __CONFIG_H__ */

contiki-apple2/apps/configedit.c

diff --git a/contiki-apple2/apps/configedit.c b/contiki-apple2/apps/configedit.c
index 664ebbf..e3aa78b 100644
--- a/contiki-apple2/apps/configedit.c
+++ b/contiki-apple2/apps/configedit.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: configedit.c,v 1.11 2006/05/28 20:50:13 oliverschmidt Exp $
+ * $Id: configedit.c,v 1.12 2006/06/28 23:10:45 oliverschmidt Exp $
  *
  */
 
@@ -252,13 +252,8 @@
     *slot = config_getlanslot() + '0';
   }
 
-  if(config_getprefixlen()) {
-    static unsigned char diff;
+  if(config_getprefixok()) {
     getcwd(prefix, sizeof(prefix));
-    diff = strlen(prefix) - config_getprefixlen();
-    if(diff) {
-      strcpy(prefix, prefix + diff);
-    }
   }
 
 #ifdef WITH_UIP
@@ -391,12 +386,8 @@
     program_handler_load(config.driver, NULL);
   }
 
-  if(*config.prefix) {
-    if(chdir(config.prefix) == 0) {
-      config_setprefixlen(strlen(config.prefix));
-    } else {
-      config_setprefixlen(0);
-    }
+  if(*config.prefix == '/') {
+    config_setprefixok(chdir(config.prefix) == 0);
   }
 
 #ifdef WITH_UIP

contiki-apple2/main.c

diff --git a/contiki-apple2/main.c b/contiki-apple2/main.c
index 18ee966..0332ee3 100644
--- a/contiki-apple2/main.c
+++ b/contiki-apple2/main.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki desktop environment 
  *
- * $Id: main.c,v 1.17 2006/05/29 21:07:53 oliverschmidt Exp $
+ * $Id: main.c,v 1.18 2006/06/28 23:10:43 oliverschmidt Exp $
  *
  */
 
@@ -64,7 +64,7 @@
 #endif
 
 unsigned char lanslot;
-unsigned char prefixlen;
+unsigned char prefixok;
 
 #pragma bssseg(push, "UIPBUF");
 u8_t uip_buf[UIP_BUFSIZE + 2];