unified MX27, MX25, MX37 trees

[karo-tx-redboot.git] / packages / fs / jffs2 / v2_0 / src / fs-ecos.c

diff --git a/packages/fs/jffs2/v2_0/src/fs-ecos.c b/packages/fs/jffs2/v2_0/src/fs-ecos.c
index df9d9523754b43beb6550a0012ff3858bbb2e14d..b25c05043af2ad63e589ae66db5f94cd1ee7ca1c 100644 (file)
--- a/packages/fs/jffs2/v2_0/src/fs-ecos.c
+++ b/packages/fs/jffs2/v2_0/src/fs-ecos.c
@@ -21,9 +21,10 @@
 #include <string.h>
 #include <cyg/io/config_keys.h>
 
-#if (__GNUC__ == 3) && (__GNUC_MINOR__ == 2) && defined (__ARM_ARCH_4__)
+#if (__GNUC__ == 3) && (__GNUC_MINOR__ == 2) && \
+    (defined (__arm__) || defined (_mips))
 #error This compiler is known to be broken. Please see:
-#error http://ecos.sourceware.org/ml/ecos-patches/2003-08/msg00006.html
+#error "http://ecos.sourceware.org/ml/ecos-patches/2003-08/msg00006.html"
 #endif
 
 //==========================================================================
@@ -1645,6 +1646,9 @@ static int jffs2_fo_dirread(struct CYG_FILE_TAG *fp, struct CYG_UIO_TAG *uio)
        struct _inode *d_inode = (struct _inode *) fp->f_data;
        struct dirent *ent = (struct dirent *) uio->uio_iov[0].iov_base;
        char *nbuf = ent->d_name;
+#ifdef CYGPKG_FS_JFFS2_RET_DIRENT_DTYPE
+       struct _inode *c_ino;
+#endif
        int nlen = sizeof (ent->d_name) - 1;
        off_t len = uio->uio_iov[0].iov_len;
        struct jffs2_inode_info *f;
@@ -1669,11 +1673,23 @@ static int jffs2_fo_dirread(struct CYG_FILE_TAG *fp, struct CYG_UIO_TAG *uio)
                D1(printk
                   (KERN_DEBUG "Dirent 0: \".\", ino #%lu\n", inode->i_ino));
                filldir(nbuf, nlen, (const unsigned char *) ".", 1);
-               goto out;
+#ifdef CYGPKG_FS_JFFS2_RET_DIRENT_DTYPE
+               // Flags here are the same as jffs2_mkdir. Make sure
+                // d_type is the same as st_mode of calling stat.
+                ent->d_type = 
+                  jemode_to_cpu(cpu_to_jemode(S_IRUGO|S_IXUGO|S_IWUSR|S_IFDIR));
+#endif
+                goto out;
        }
        if (offset == 1) {
                filldir(nbuf, nlen, (const unsigned char *) "..", 2);
-               goto out;
+#ifdef CYGPKG_FS_JFFS2_RET_DIRENT_DTYPE
+                // Flags here are the same as jffs2_mkdir. Make sure
+                // d_type is the same as st_mode of calling stat.
+                ent->d_type = 
+                  jemode_to_cpu(cpu_to_jemode(S_IRUGO|S_IXUGO|S_IWUSR|S_IFDIR));
+#endif
+                goto out;
        }
 
        curofs = 1;
@@ -1700,6 +1716,18 @@ static int jffs2_fo_dirread(struct CYG_FILE_TAG *fp, struct CYG_UIO_TAG *uio)
                   (KERN_DEBUG "Dirent %ld: \"%s\", ino #%u, type %d\n", offset,
                    fd->name, fd->ino, fd->type));
                filldir(nbuf, nlen, fd->name, strlen((char *)fd->name));
+#ifdef CYGPKG_FS_JFFS2_RET_DIRENT_DTYPE
+               c_ino = jffs2_iget(inode->i_sb, fd->ino);
+               if(IS_ERR(c_ino)) {
+                       D1(printk(KERN_WARNING "get entry inode failed\n"));
+                       // fileio already set it to zero, so not needed here
+                       // ent->d_type = 0;
+               }
+               else {
+                       ent->d_type = c_ino->i_mode;
+                       jffs2_iput(c_ino);
+               }
+#endif
                goto out_sem;
        }
        /* Reached the end of the directory */