Changeset 3102

Timestamp:

Aug 11, 2018, 9:58:20 PM (7 years ago)

Author:

Andreas Schnellbacher

Message:

• Added FileInTree and NepmdSearchTree( Filename, Directory).

Location:

trunk/src/gui

Files:

• common/file.c (modified) (1 diff)
• common/file.h (modified) (1 diff)
• nepmdlib/macros/searchtree.e (added)
• nepmdlib/nepmdlib.c (modified) (2 diffs)
• nepmdlib/nepmdlib.def (modified) (1 diff)
• nepmdlib/nepmdlib.e (modified) (1 diff)

trunk/src/gui/common/file.c ¶

@@ -306 +306 @@
 // -----------------------------------------------------------------------------
 
+APIRET FileInTree( PSZ pszFile, PSZ pszPath, PSZ pszBuffer, ULONG ulBuflen)
+{
+         APIRET         rc = NO_ERROR;
+         APIRET         rcx = ERROR_FILE_NOT_FOUND;
+
+         ULONG          ulFilecount;
+         HDIR           hdir;
+         CHAR           szTmp[ _MAX_PATH];
+
+         FILEFINDBUF3   ffb3;
+         FILESTATUS3    fs3;
+
+do
+   {
+   // check parameters
+   if ((!pszFile) || (!*pszFile))
+      {
+      rc = ERROR_INVALID_PARAMETER;
+      break;
+      }
+   if ((!pszPath) || (!*pszPath))
+      {
+      rc = ERROR_INVALID_PARAMETER;
+      break;
+      }
+   if (!pszBuffer)
+      {
+      rc = ERROR_INVALID_PARAMETER;
+      break;
+      }
+
+   // does path exist?
+   rc = DosQueryPathInfo( pszPath, FIL_QUERYFULLNAME, szTmp, sizeof( szTmp));
+   if (rc != NO_ERROR)
+      break;
+
+// DPRINTF(( "%s -> : %s\n", __FUNCTION__, pszPath));
+
+   // determine filename
+   strcpy( szTmp, pszPath);
+   if (*(pszPath + strlen( pszPath) - 1) != '\\')
+      strcat( szTmp, "\\");
+   strcat( szTmp, pszFile);
+
+   // find filename in specified dir
+   if (FileExists( szTmp))
+      {
+      // file found in specified dir
+
+      // does buffer fit?
+      if ((strlen( szTmp) + 1) > ulBuflen)
+      {
+      rc = ERROR_BUFFER_OVERFLOW;
+      break;
+      }
+
+      // hand over result
+      strcpy( pszBuffer, szTmp);
+
+      break;
+      }
+
+   // search all subdirectories
+
+   // determine dirmask
+   strcpy( szTmp, pszPath);
+   if (*(pszPath + strlen( pszPath) - 1) != '\\')
+      strcat( szTmp, "\\");
+   strcat( szTmp, "*");
+
+   ulFilecount = 1;
+   hdir        = HDIR_CREATE;
+   rc = DosFindFirst( szTmp,
+                      &hdir,
+                      MUST_HAVE_DIRECTORY | FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN | FILE_READONLY,
+                      &ffb3,
+                      sizeof( ffb3),
+                      &ulFilecount,
+                      FIL_STANDARD);
+   if (rc != NO_ERROR)
+      break;
+
+   while (rc == NO_ERROR)
+      {
+      // handle subdirectories
+      if (strcmp( ffb3.achName, ".") && strcmp( ffb3.achName, ".."))
+         {
+         // determine filename
+         strcpy( szTmp, pszPath);
+         if (*(pszPath + strlen( pszPath) - 1) != '\\')
+            strcat( szTmp, "\\");
+         strcat( szTmp, ffb3.achName);
+
+         // recursive call to subdirectory
+         rcx = FileInTree( pszFile, szTmp, pszBuffer, ulBuflen);
+         if (rcx == NO_ERROR)
+            {
+            // file found in subdir
+            break;
+            }
+         }
+
+      // search next subdir
+      rc = DosFindNext( hdir,
+                        &ffb3,
+                        sizeof( ffb3),
+                        &ulFilecount);
+      }
+   DosFindClose( hdir);
+
+   if (rcx == NO_ERROR)
+      // file found in subdir
+      break;
+
+   } while (FALSE);
+
+return rc;
+}
+
+// -----------------------------------------------------------------------------
+
 APIRET GetNextFile( PSZ pszFileMask, PHDIR phdir, PSZ pszNextFile, ULONG ulBuflen)
 {

trunk/src/gui/common/file.h ¶

@@ -35 +35 @@
 
 APIRET FileInPath( PSZ pszEnvName, PSZ pszFilename, PSZ pszBuffer, ULONG ulBuflen);
+APIRET FileInTree( PSZ pszFile, PSZ pszPath, PSZ pszBuffer, ULONG ulBuflen);
 
 APIRET GetNextFile( PSZ pszFileMask, PHDIR phdir,

trunk/src/gui/nepmdlib/nepmdlib.c ¶

@@ -2048 +2048 @@
       pszEnvVarName = "PATH";
 
-   // search !
+   // search
    strupr( pszEnvVarName);
    rc = DosSearchPath( SEARCH_IGNORENETERRS |
@@ -2065 +2065 @@
 // ------------------------------------------------------------------------------
 
+APIRET EXPENTRY NepmdSearchTree( PSZ pszFile, PSZ pszPath, PSZ pszBuffer, ULONG ulBuflen)
+{
+
+         APIRET         rc = NO_ERROR;
+
+FUNCENTER;
+
+do
+   {
+   // init return value first
+   if (pszBuffer)
+      memset( pszBuffer, 0, ulBuflen);
+
+   // check parms
+   if ((!pszFile) || (!pszPath) || (!pszBuffer))
+      {
+      rc = ERROR_INVALID_PARAMETER;
+      break;
+      }
+
+   // search
+   rc = FileInTree( pszFile, pszPath, pszBuffer, ulBuflen);
+
+   } while (FALSE);
+
+FUNCEXITRC;
+return _getRexxError( rc, pszBuffer, ulBuflen);
+}
+
+// ------------------------------------------------------------------------------
+
 APIRET EXPENTRY NepmdSetFrameWindowPos(  HWND hwndFrame, ULONG x, ULONG y, ULONG cx, ULONG cy, ULONG flags)
 {

trunk/src/gui/nepmdlib/nepmdlib.def ¶

@@ -67 +67 @@
  NepmdScanEnv
  NepmdSearchPath
+ NepmdSearchTree
  NepmdSetFrameWindowPos
  NepmdWriteConfigValue

trunk/src/gui/nepmdlib/nepmdlib.e ¶

@@ -186 +186 @@
 include 'scanenv.e'
 include 'searchpath.e'
+include 'searchtree.e'
 include 'setframewindowpos.e'
 include 'writeconfigvalue.e'