WebSVN – SvarDOS – Diff – /tree/trunk/tree.c

  */
 typedef struct DIRDATA
+{
   DWORD subdirCnt;          /* how many subdirectories we have */
   DWORD fileCnt;            /* how many [normal] files we have */
-  DWORD dwDirAttributes;    /* Directory attributes            */
+  unsigned short attrib;    /* Directory attributes            */
 } DIRDATA;
 /**
  * Contains the information stored in a Stack necessary to allow
  * non-recursive function to display directory tree.
+  }
   /*  cycle through entries counting directories found until no more entries */
   do {
-    if (((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0) &&
+    if (((findData.attrib & FILE_A_DIR) != 0) &&
-	((findData.dwFileAttributes &
+        ((findData.attrib &
-	 (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) == 0 || dspAll) )
+         (FILE_A_HIDDEN | FILE_A_SYSTEM)) == 0 || dspAll) ) {
-    {
-      if ( (strcmp(findData.cFileName, ".") != 0) && /* ignore initial [current] path */
-           (strcmp(findData.cFileName, "..") != 0) ) /* and ignore parent path */
+      if (findData.cFileName[0] != '.') { /* ignore '.' and '..' */
         hasSubdirs++;      /* subdir of initial path found, so increment counter */
+      }
+    }
   } while(FindNextFile(hnd, &findData) != 0);
   /* prevent resource leaks, close the handle. */
   FindClose(hnd);
        corresponding to mount points) may not have a current (.) and
        parent (..) entry.  So we can't get attributes for initial
        path in above loop from the FindFile call as it may not show up
        (no . entry).  So instead we explicitly get them here.
     */
-    if ((ddata->dwDirAttributes = GetFileAttributes(path)) == (DWORD)-1)
+    if (GetFileAttributes(&(ddata->attrib), path) != 0) {
-    {
       //printf("ERROR: unable to get file attr, %i\n", GetLastError());
-      ddata->dwDirAttributes = 0;
+      ddata->attrib = 0;
+    }
     /* a curiosity, for showing sum of directories process */
     ddata->subdirCnt = hasSubdirs;
+  }
+  }
   /* optional display data */
   if (dspAttr)  /* attributes */
     pprintf("[%c%c%c%c%c] ",
-      (ddata->dwDirAttributes & FILE_ATTRIBUTE_DIRECTORY)?'D':' ',  /* keep this one? its always true */
+      (ddata->attrib & FILE_A_DIR)?'D':' ',  /* keep this one? its always true */
-      (ddata->dwDirAttributes & FILE_ATTRIBUTE_ARCHIVE)?'A':' ',
+      (ddata->attrib & FILE_A_ARCH)?'A':' ',
-      (ddata->dwDirAttributes & FILE_ATTRIBUTE_SYSTEM)?'S':' ',
+      (ddata->attrib & FILE_A_SYSTEM)?'S':' ',
-      (ddata->dwDirAttributes & FILE_ATTRIBUTE_HIDDEN)?'H':' ',
+      (ddata->attrib & FILE_A_HIDDEN)?'H':' ',
-      (ddata->dwDirAttributes & FILE_ATTRIBUTE_READONLY)?'R':' '
+      (ddata->attrib & FILE_A_READONLY)?'R':' '
     );
   /* display directory name */
   pprintf("%s\n", currentpath);
+}
  * Path must end in slash \ or /
  * Returns -1 on error,
  *          0 if no files, but no errors either,
  *      or  1 if files displayed, no errors.
  */
-static int displayFiles(char *path, char *padding, int hasMoreSubdirs, DIRDATA *ddata) {
+static int displayFiles(const char *path, char *padding, int hasMoreSubdirs, DIRDATA *ddata) {
   static char buffer[MAXBUF];
   struct WIN32_FIND_DATA entry; /* current directory entry info    */
   struct FFDTA *dir;         /* Current directory entry working with      */
   unsigned long filesShown = 0;
   /* cycle through directory printing out files. */
   do
+  {
     /* print padding followed by filename */
-    if ( ((entry.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) &&
+    if ( ((entry.attrib & FILE_A_DIR) == 0) &&
-         ( ((entry.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN |
-         FILE_ATTRIBUTE_SYSTEM)) == 0)  || dspAll) )
+         ( ((entry.attrib & (FILE_A_HIDDEN | FILE_A_SYSTEM)) == 0)  || dspAll) )
+    {
       /* print lead padding */
       pprintf("%s", padding);
       /* optional display data */
       if (dspAttr)  /* file attributes */
         pprintf("[%c%c%c%c] ",
-          (entry.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)?'A':' ',
+          (entry.attrib & FILE_A_ARCH)?'A':' ',
-          (entry.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)?'S':' ',
+          (entry.attrib & FILE_A_SYSTEM)?'S':' ',
-          (entry.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)?'H':' ',
+          (entry.attrib & FILE_A_HIDDEN)?'H':' ',
-          (entry.dwFileAttributes & FILE_ATTRIBUTE_READONLY)?'R':' '
+          (entry.attrib & FILE_A_READONLY)?'R':' '
         );
       if (dspSize)  /* file size */
+      {
         if (entry.nFileSizeHigh)
 static struct FFDTA *cycleFindResults(struct FFDTA *findnexthnd, struct WIN32_FIND_DATA *entry, char *subdir, char *dsubdir) {
   /* cycle through directory until 1st non . or .. directory is found. */
   do
+  {
     /* skip files & hidden or system directories */
-    if ((((entry->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) ||
+    if ((((entry->attrib & FILE_A_DIR) == 0) ||
-         ((entry->dwFileAttributes &
+         ((entry->attrib &
-          (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0  && !dspAll) ) ||
+          (FILE_A_HIDDEN | FILE_A_SYSTEM)) != 0  && !dspAll) ) ||
-        ((strcmp(entry->cFileName, ".") == 0) ||
-         (strcmp(entry->cFileName, "..") == 0)) )
+        (entry->cFileName[0] == '.')) {
-    {
       if (FindNextFile(findnexthnd, entry) == 0)
+      {
         FindClose(findnexthnd);      // prevent resource leaks
         return INVALID_HANDLE_VALUE; // no subdirs found
+      }

Subversion Repositories SvarDOS

(root)/tree/trunk/tree.c – Rev 2046 → 2047