Changeset 1945

Timestamp:

May 2, 2005, 4:48:50 AM (20 years ago)

Author:

bird

Message:

Fixed bad d_type.

File:

• trunk/src/emx/src/lib/misc/dirent.c (modified) (3 diffs, 1 prop)

trunk/src/emx/src/lib/misc/dirent.c

@@ -162 +162 @@
     LIBCLOG_ENTER("dirp=%p pdent=%p ppdent=%p\n", (void *)dirp, (void *)pdent, (void *)ppdent);
     int cch;
+    struct _dircontents *pd;
     /* done? */
-    if (dirp->dd_cp == NULL)
+    pd = dirp->dd_cp;
+    if (pd == NULL)
     {
         //errno = ENOENT;
@@ -173 +175 @@
      * Copy the data over to the entry.
      */
-    cch = strlen(dirp->dd_cp->_d_entry);
-    memcpy(pdent->d_name, dirp->dd_cp->_d_entry, cch + 1);
+    cch = strlen(pd->_d_entry);
+    memcpy(pdent->d_name, pd->_d_entry, cch + 1);
     pdent->d_namlen = cch;
     pdent->d_reclen = pdent->d_namlen;
@@ -180 +182 @@
     if (_readdir_ino == 0)
         _readdir_ino = 1;
-    pdent->d_type = (pdent->d_attr & A_DIR) ? DT_DIR : DT_REG;
-    pdent->d_size = dirp->dd_cp->_d_size;
-    pdent->d_attr = dirp->dd_cp->_d_attr;
-    pdent->d_time = dirp->dd_cp->_d_time;
-    pdent->d_date = dirp->dd_cp->_d_date;
+    pdent->d_type = (pd->_d_attr & A_DIR) ? DT_DIR : DT_REG;
+    pdent->d_size = pd->_d_size;
+    pdent->d_time = pd->_d_time;
+    pdent->d_date = pd->_d_date;
+    pdent->d_attr = pd->_d_attr;
 
     /*
      * Advance the stream and return successfully.
      */
-    dirp->dd_cp = dirp->dd_cp->_d_next;
+    dirp->dd_cp = pd->_d_next;
     dirp->dd_loc++;
     *ppdent = pdent;