Changeset 654

Timestamp:

12/28/08 09:23:42 (4 years ago)

Author:

reyalp

Message:

• add ability to build CHDK lua for host platform. Not built by default.
• renamed dirent name to d_name to be compatible with conventional libc

Location:

trunk

Files:

• core/edgeoverlay.c (modified) (1 diff)
• core/gui_fselect.c (modified) (7 diffs)
• include/stdlib.h (modified) (1 diff)
• lib/lua/lbaselib.c (modified) (2 diffs)
• lib/lua/liolib.c (modified) (1 diff)
• lib/lua/loadlib.c (modified) (1 diff)
• lib/lua/loslib.c (modified) (6 diffs)
• makefile.inc (modified) (1 diff)
• tools/hostlua (added)
• tools/hostlua/Makefile (added)
• tools/hostlua/include (added)
• tools/hostlua/include/lauxlib.h (added)
• tools/hostlua/include/lua.h (added)
• tools/hostlua/include/luaconf.h (added)
• tools/hostlua/include/lualib.h (added)
• tools/hostlua/include/readme.txt (added)

trunk/core/edgeoverlay.c

@@ -122 +122 @@
         while( (de = readdir(d)) )
         {
-                fr = get_edge_file_num(de->name);
+                fr = get_edge_file_num(de->d_name);
                 if( fr > fnum )
                 {

trunk/core/gui_fselect.c

@@ -124 +124 @@
         de = readdir(d);
         while (de) {
-            if (de->name[0] != 0xE5 /* deleted entry */ && (de->name[0]!='.' || de->name[1]!=0)) {
+            if (de->d_name[0] != 0xE5 /* deleted entry */ && (de->d_name[0]!='.' || de->d_name[1]!=0)) {
                 *ptr = malloc(sizeof(struct fitem));
                 if (*ptr) {
                     (*ptr)->n = count;
-                    (*ptr)->name = malloc(strlen(de->name)+1);
+                    (*ptr)->name = malloc(strlen(de->d_name)+1);
                     if ((*ptr)->name)
-                        strcpy((*ptr)->name, de->name);
-                    sprintf(buf, "%s/%s", dir, de->name);
+                        strcpy((*ptr)->name, de->d_name);
+                    sprintf(buf, "%s/%s", dir, de->d_name);
                     if (stat(buf, &st)==0) {
                         (*ptr)->attr=st.st_attrib;
@@ -137 +137 @@
                         (*ptr)->mtime=st.st_mtime;
                     } else {
-                        (*ptr)->attr=(de->name[0]=='.' && de->name[1]=='.' && de->name[2]==0)?DOS_ATTR_DIRECTORY:0xFF;
+                        (*ptr)->attr=(de->d_name[0]=='.' && de->d_name[1]=='.' && de->d_name[2]==0)?DOS_ATTR_DIRECTORY:0xFF;
                         (*ptr)->size=(*ptr)->mtime=0;
                     }
@@ -401 +401 @@
            d=opendir(current_dir);
            while ((de=readdir(d)) != NULL) {//Loop to find all Canon folders
-               if (de->name[0] != '.' && de->name[1] != '.') {//If item is not UpDir
-                   sprintf(sub_dir, "%s/%s", current_dir, de->name);
+               if (de->d_name[0] != '.' && de->d_name[1] != '.') {//If item is not UpDir
+                   sprintf(sub_dir, "%s/%s", current_dir, de->d_name);
                    d2=opendir(sub_dir);
                    while ((de2=readdir(d2)) != NULL) {//Loop to find all the RAW files inside a Canon folder
-                       if (de2->name[0] == 'C' || de2->name[9] == 'C') {//If file is RAW (Either CRW/CR2 prefix or file extension)
+                       if (de2->d_name[0] == 'C' || de2->d_name[9] == 'C') {//If file is RAW (Either CRW/CR2 prefix or file extension)
                            d3=opendir(current_dir);
                            while ((de3=readdir(d3)) != NULL) {//Loop to find all Canon folders
-                               if (de3->name[0] != '.' && de3->name[1] != '.') {//If item is not UpDir
-                                   sprintf(sub_dir_search, "%s/%s", current_dir, de3->name);
+                               if (de3->d_name[0] != '.' && de3->d_name[1] != '.') {//If item is not UpDir
+                                   sprintf(sub_dir_search, "%s/%s", current_dir, de3->d_name);
                                    d4=opendir(sub_dir_search);
                                    while ((de4=readdir(d4)) != NULL) {//Loop to find a corresponding JPG file inside a Canon folder
-                                       if (de2->name[4] == de4->name[4] && de2->name[5] == de4->name[5] &&//If the four digits of the Canon number are the same
-                                           de2->name[6] == de4->name[6] && de2->name[7] == de4->name[7] &&
-                                           de4->name[9] == 'J' && !(de4->name[0] == 'C' || de4->name[9] == 'C' || de4->name[0] == 0xE5)) {//If file is JPG, is not CRW/CR2 and is not a deleted item
+                                       if (de2->d_name[4] == de4->d_name[4] && de2->d_name[5] == de4->d_name[5] &&//If the four digits of the Canon number are the same
+                                           de2->d_name[6] == de4->d_name[6] && de2->d_name[7] == de4->d_name[7] &&
+                                           de4->d_name[9] == 'J' && !(de4->d_name[0] == 'C' || de4->d_name[9] == 'C' || de4->d_name[0] == 0xE5)) {//If file is JPG, is not CRW/CR2 and is not a deleted item
                                            started();
                                            found=1;//A JPG file with the same Canon number was found
@@ -425 +425 @@
                            //If no JPG found, delete RAW file
                            if (found == 0) {
-                               sprintf(selected_item, "%s/%s", sub_dir, de2->name);
+                               sprintf(selected_item, "%s/%s", sub_dir, de2->d_name);
                                remove(selected_item);
                                finished();
@@ -448 +448 @@
            d=opendir(current_dir);
            while ((de=readdir(d)) != NULL) {//Loop to find all the RAW files inside the Canon folder 
-               if (de->name[0] == 'C' || de->name[9] == 'C') {//If file is RAW (Either CRW/CR2 prefix or file extension)
+               if (de->d_name[0] == 'C' || de->d_name[9] == 'C') {//If file is RAW (Either CRW/CR2 prefix or file extension)
                    d2=opendir(current_dir);
                    while ((de2=readdir(d2)) != NULL) {//Loop to find a corresponding JPG file inside the Canon folder
-                       if (de->name[4] == de2->name[4] && de->name[5] == de2->name[5] &&//If the four digits of the Canon number are the same
-                           de->name[6] == de2->name[6] && de->name[7] == de2->name[7] &&
-                           de2->name[9] == 'J' && !(de2->name[0] == 'C' || de2->name[9] == 'C' || de2->name[0] == 0xE5)) {//If file is JPG and is not CRW/CR2 and is not a deleted item
+                       if (de->d_name[4] == de2->d_name[4] && de->d_name[5] == de2->d_name[5] &&//If the four digits of the Canon number are the same
+                           de->d_name[6] == de2->d_name[6] && de->d_name[7] == de2->d_name[7] &&
+                           de2->d_name[9] == 'J' && !(de2->d_name[0] == 'C' || de2->d_name[9] == 'C' || de2->d_name[0] == 0xE5)) {//If file is JPG and is not CRW/CR2 and is not a deleted item
                            started();
                            found=1;//A JPG file with the same Canon number was found
@@ -461 +461 @@
                    //If no JPG found, delete RAW file                
                    if (found == 0) {
-                       sprintf(selected_item, "%s/%s", current_dir, de->name);
+                       sprintf(selected_item, "%s/%s", current_dir, de->d_name);
                        remove(selected_item);
                        finished();
@@ -519 +519 @@
             de = readdir(d);
             while (de) {
-                if (de->name[0] != 0xE5 /* deleted entry */ && (de->name[0]!='.' || (de->name[1]!='.' && de->name[1]!=0) || (de->name[1]=='.' && de->name[2]!=0))) {
+                if (de->d_name[0] != 0xE5 /* deleted entry */ && (de->d_name[0]!='.' || (de->d_name[1]!='.' && de->d_name[1]!=0) || (de->d_name[1]=='.' && de->d_name[2]!=0))) {
                     started();
-                    sprintf(selected_file, "%s/%s", current_dir, de->name);
+                    sprintf(selected_file, "%s/%s", current_dir, de->d_name);
                     remove(selected_file);
                     finished();

trunk/include/stdlib.h

@@ -213 +213 @@
 #if !CAM_DRYOS
 struct dirent {
-    char                name[100];
+    char                d_name[100];
 };
 #else
 struct dirent {
-    char                name[13];
+    char                d_name[13];
     unsigned long       unk1;
     unsigned char       attrib;

trunk/lib/lua/lbaselib.c

@@ -11 +11 @@
 #include <stdlib.h>
 #include <string.h>
+#ifndef HOST_LUA
 #include <script.h>     // script_console_add_line
+#endif
 
 #define lbaselib_c
@@ -71 +73 @@
 
   }
+#ifdef HOST_LUA
+  fprintf(stdout,"%s\n",buf);
+#else
   script_console_add_line(buf);
+#endif
 
   return 0;

trunk/lib/lua/liolib.c

@@ -22 +22 @@
 #include "lualib.h"
 
-
+#ifdef HOST_LUA
+#include <errno.h>
+#include <ctype.h>
+#endif
 
 #define IO_INPUT        1

trunk/lib/lua/loadlib.c

@@ -331 +331 @@
 
 static int readable (const char *filename) {
+#ifdef HOST_LUA
+  FILE *f = fopen(filename, "r");  /* try to open file */
+  if (f == NULL) return 0;  /* open failed */
+  fclose(f);
+#else
   int f = open(filename,O_RDONLY,0777);
   if (f == -1) return 0;  /* open failed */
   close(f);
+#endif
   return 1;
 }

trunk/lib/lua/loslib.c

@@ -11 +11 @@
 #include <stdlib.h>
 #include <string.h>
-#if 0
+#ifdef HOST_LUA
+#include <errno.h>
 #include <time.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <utime.h>
 #endif
 
@@ -246 +250 @@
 static int os_mkdir (lua_State *L) {
   const char *dirname = luaL_checkstring(L, 1);
+#if defined(HOST_LUA) && !defined(_WIN32)
+  return os_pushresult(L, mkdir(dirname,0777) == 0, dirname);
+#else
   return os_pushresult(L, mkdir(dirname) == 0, dirname);
+#endif
 }
 
@@ -267 +275 @@
   lua_newtable(L); 
   while((de = readdir(dir))) {
-        if(!all && (de->name[0] == 0xE5 || (strcmp(de->name,".")==0) || (strcmp(de->name,"..")==0)))
+        if(!all && (/*de->d_name[0] == 0xE5 ||*/ (strcmp(de->d_name,".")==0) || (strcmp(de->d_name,"..")==0)))
       continue;
         lua_pushinteger(L, i);
-        lua_pushstring(L, de->name);
+        lua_pushstring(L, de->d_name);
         lua_settable(L,-3);
         ++i;
@@ -302 +310 @@
     setfield(L,"mtime",st.st_mtime);    /* time of last modification */
     setfield(L,"ctime",st.st_ctime);    /* time of last change of file status */
+#ifdef HOST_LUA
+// fill in some sane values if we aren't running on the camera
+// from chdk stdlib
+#define DOS_ATTR_DIRECTORY      0x10            /* entry is a sub-directory */
+    setfield(L,"blksize",512); 
+    setfield(L,"blocks",(st.st_size/512) + (st.st_size%512)?1:0); 
+    if ( S_ISDIR(st.st_mode) ) {
+      setfield(L,"attrib",DOS_ATTR_DIRECTORY);
+      setboolfield(L,"is_dir",1);
+      setboolfield(L,"is_file",0);
+    }
+    else {
+      setboolfield(L,"is_dir",0);
+      setfield(L,"attrib",0);
+      if S_ISREG(st.st_mode) {
+        setboolfield(L,"is_file",1);
+      }
+    }
+#else
     setfield(L,"blksize",st.st_blksize); /* This is NOT the dos sector size. Appears to be 512 on all I've tested! */
     setfield(L,"blocks",st.st_blocks);   /* number of blocks required to store file. May not be the same as size on disk, per above*/
@@ -309 +336 @@
         setboolfield(L,"is_dir",st.st_attrib & DOS_ATTR_DIRECTORY);
         setboolfield(L,"is_file",!(st.st_attrib & (DOS_ATTR_DIRECTORY | DOS_ATTR_VOL_LABEL)));
+#endif
 #if 0
     setfield(L,"reserved1",st.reserved1);
@@ -354 +382 @@
   {"stat",      os_stat}, // reyalp - NOT STANDARD
   {"utime",     os_utime}, // reyalp - NOT STANDARD
-  // TODO add directory listing functions
   {"remove",    os_remove},
   {"rename",    os_rename},

trunk/makefile.inc

@@ -262 +262 @@
 HOSTCC=gcc
 HOSTCFLAGS=-g -O2 -Wall
+HOSTAR=ar
 
 PAKWIF=$(topdir)tools/pakwif$(EXE)