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

  * On error (invalid path) displays message and returns -1L.
  * Stores additional directory data in ddata if non-NULL
  * and path is valid.
  */
 static long hasSubdirectories(char *path, DIRDATA *ddata) {
-  static struct FFDTA findData;
+  struct FFDTA findData;
-  struct FFDTA *hnd;
-  static char buffer[PATH_MAX + 2];
+  char buffer[PATH_MAX + 2];
   int hasSubdirs = 0;
   /* get the handle to start with (using wildcard spec) */
   strcpy(buffer, path);
   strcat(buffer, "*");
   /* Use FindFirstFileEx when available (falls back to FindFirstFile).
    * Allows us to limit returned results to just directories
    * if supported by underlying filesystem.
    */
-  hnd = FindFirstFile(buffer, &findData);
+  if (FindFirstFile(buffer, &findData) == NULL) {
-  if (hnd == NULL) {
     showInvalidPath(path); /* Display error message */
     return(-1);
+  }
   /*  cycle through entries counting directories found until no more entries */
          (FILE_A_HIDDEN | FILE_A_SYSTEM)) == 0 || dspAll) ) {
       if (findData.ff_name[0] != '.') { /* ignore '.' and '..' */
         hasSubdirs++;      /* subdir of initial path found, so increment counter */
+      }
+    }
-  } while(FindNextFile(hnd, &findData) != 0);
+  } while(FindNextFile(&findData) != 0);
   /* prevent resource leaks, close the handle. */
-  FindClose(hnd);
+  FindClose(&findData);
   if (ddata != NULL)  // don't bother if user doesn't want them
+  {
     /* The root directory of a volume (including non root paths
        corresponding to mount points) may not have a current (.) and
  *      or  1 if files displayed, no errors.
  */
 static int displayFiles(const char *path, char *padding, int hasMoreSubdirs, DIRDATA *ddata) {
   char buffer[PATH_MAX + 2];
   struct FFDTA entry;   /* current directory entry info    */
-  struct FFDTA *dir;    /* Current directory entry working with      */
   unsigned long filesShown = 0;
   /* get handle for files in current directory (using wildcard spec) */
   strcpy(buffer, path);
   strcat(buffer, "*");
-  dir = FindFirstFile(buffer, &entry);
+  if (FindFirstFile(buffer, &entry) == NULL) return(-1);
-  if (dir == NULL) return(-1);
   addPadding(padding, hasMoreSubdirs);
   /* cycle through directory printing out files. */
   do
       /* print filename */
       pprintf("%s\n", entry.ff_name);
       filesShown++;
+    }
-  } while(FindNextFile(dir, &entry) != 0);
+  } while(FindNextFile(&entry) != 0);
   if (filesShown)
+  {
     pprintf("%s\n", padding);
+  }
-  /* cleanup directory search */
-  FindClose(dir);
-  /* dir = NULL; */
   removePadding(padding);
   /* store for summary display */
   if (ddata != NULL) ddata->fileCnt = filesShown;
  * was found, and if so copies appropriate data into subdir and dsubdir.
  * It will repeat until a valid subdirectory is found or no more
  * are found, at which point it closes the FindFile search handle and
  * return NULL.  If successful, returns FindFile handle.
  */
-static struct FFDTA *cycleFindResults(struct FFDTA *findnexthnd, struct FFDTA *entry, char *subdir, char *dsubdir) {
+static struct FFDTA *cycleFindResults(struct FFDTA *entry, char *subdir, char *dsubdir) {
   /* cycle through directory until 1st non . or .. directory is found. */
-  do
+  for (;;) {
-  {
     /* skip files & hidden or system directories */
     if ((((entry->ff_attr & FILE_A_DIR) == 0) ||
          ((entry->ff_attr &
           (FILE_A_HIDDEN | FILE_A_SYSTEM)) != 0  && !dspAll) ) ||
         (entry->ff_name[0] == '.')) {
-      if (FindNextFile(findnexthnd, entry) == 0) {
+      if (FindNextFile(entry) == 0) {
-        FindClose(findnexthnd);      // prevent resource leaks
+        FindClose(entry);      // prevent resource leaks
         return(NULL); // no subdirs found
+      }
     } else {
       /* set display name */
       strcpy(dsubdir, entry->ff_name);
       strcpy(subdir, entry->ff_name);
       strcat(subdir, "\\");
+      return(entry);
+    }
-  } while (!*subdir); // while (subdir is still blank)
+  }
-  return findnexthnd;
+  return entry;
+}
-/* FindFile buffer used by findFirstSubdir and findNextSubdir only */
-static struct FFDTA findSubdir_entry; /* current directory entry info    */
 /**
  * Given the current path, find the 1st subdirectory.
  * The subdirectory found is stored in subdir.
  * subdir is cleared on error or no subdirectories.
  * Returns the findfirst search HANDLE, which should be passed to
  */
 static struct FFDTA *findFirstSubdir(char *currentpath, char *subdir, char *dsubdir) {
   char buffer[PATH_MAX];
   struct FFDTA *dir;         /* Current directory entry working with      */
+  dir = malloc(sizeof(struct FFDTA));
+  if (dir == NULL) return(NULL);
   /* get handle for files in current directory (using wildcard spec) */
   strcpy(buffer, currentpath);
   strcat(buffer, "*");
-  dir = FindFirstFile(buffer, &findSubdir_entry);
+  if (FindFirstFile(buffer, dir) == NULL) {
-  if (dir == NULL) {
     showInvalidPath(currentpath);
     return(NULL);
+  }
   /* clear result path */
   strcpy(subdir, "");
-  return cycleFindResults(dir, &findSubdir_entry, subdir, dsubdir);
+  return cycleFindResults(dir, subdir, dsubdir);
+}
 /**
  * Given a search HANDLE, will find the next subdirectory,
  * setting subdir to the found directory name.
  * If a subdirectory is found, returns 0, otherwise returns 1
  * (either error or no more files).
  */
 static int findNextSubdir(struct FFDTA *findnexthnd, char *subdir, char *dsubdir) {
   /* clear result path */
-  strcpy(subdir, "");
+  subdir[0] = 0;
-  if (FindNextFile(findnexthnd, &findSubdir_entry) == 0) return 1; // no subdirs found
+  if (FindNextFile(findnexthnd) == 0) return 1; // no subdirs found
-  if (cycleFindResults(findnexthnd, &findSubdir_entry, subdir, dsubdir) == NULL) {
+  if (cycleFindResults(findnexthnd, subdir, dsubdir) == NULL) {
     return 1;
+  }
   return 0;
+}

Subversion Repositories SvarDOS

(root)/tree/trunk/tree.c – Rev 2056 → 2057