Changeset 843 for trunk/dll/init.c

Timestamp:

Sep 24, 2007, 12:46:47 AM (18 years ago)

Author:

Steven Levine

Message:

Revert to standard APIs where large file support not required by ticket #41

File:

• trunk/dll/init.c (modified) (7 diffs)

trunk/dll/init.c

@@ -82 +82 @@
   CHAR *pp;
   FILE *fp;
-  FILEFINDBUF3L ffb;
+  FILEFINDBUF3 ffb;
   ULONG nm;
   ULONG size = sizeof(SwapperDat);
@@ -93 +93 @@
   if (*SwapperDat) {
     nm = 1;
-    rc = xDosFindFirst(SwapperDat,
-                       &hdir,
-                       FILE_NORMAL | FILE_ARCHIVED |
-                       FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
-                       &ffb, sizeof(ffb), &nm, FIL_STANDARDL);
+    rc = DosFindFirst(SwapperDat,
+                      &hdir,
+                      FILE_NORMAL | FILE_ARCHIVED |
+                      FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
+                      &ffb, sizeof(ffb), &nm, FIL_STANDARD);
     if (!rc) {
       DosFindClose(hdir);
@@ -154 +154 @@
               hdir = HDIR_CREATE;
               nm = 1;
-              if (!xDosFindFirst(SwapperDat,
-                                 &hdir,
-                                 FILE_NORMAL | FILE_ARCHIVED |
-                                 FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
-                                 &ffb, sizeof(ffb), &nm, FIL_STANDARDL)) {
+              if (!DosFindFirst(SwapperDat,
+                                &hdir,
+                                FILE_NORMAL | FILE_ARCHIVED |
+                                FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
+                                &ffb, sizeof(ffb), &nm, FIL_STANDARD)) {
                 DosFindClose(hdir);
                 PrfWriteProfileString(fmprof,
@@ -410 +410 @@
   HDIR search_handle;
   ULONG num_matches;
-  static FILEFINDBUF3L f;
+  FILEFINDBUF3 ffb;
 
   StopTimer();
@@ -445 +445 @@
     search_handle = HDIR_CREATE;
     num_matches = 1L;
-    if (!xDosFindFirst(s,
-                       &search_handle,
-                       FILE_NORMAL | FILE_DIRECTORY |
-                       FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
-                       FILE_ARCHIVED,
-                       &f, sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) {
+    if (!DosFindFirst(s,
+                      &search_handle,
+                      FILE_NORMAL | FILE_DIRECTORY |
+                      FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
+                      FILE_ARCHIVED,
+                      &ffb, sizeof(ffb), &num_matches, FIL_STANDARD)) {
       do {
-        strcpy(enddir, f.achName);
-        if (f.attrFile & FILE_DIRECTORY) {
+        strcpy(enddir, ffb.achName);
+        if (ffb.attrFile & FILE_DIRECTORY) {
           wipeallf("%s\\*", s);
           DosDeleteDir(s);
@@ -460 +460 @@
           unlinkf("%s", s);
       }
-      while (!xDosFindNext(search_handle,
-                           &f, sizeof(FILEFINDBUF3L), &num_matches));
+      while (!DosFindNext(search_handle,
+                          &ffb, sizeof(ffb), &num_matches));
       DosFindClose(search_handle);
     }
@@ -474 +474 @@
   search_handle = HDIR_CREATE;
   num_matches = 1;
-  if (!xDosFindFirst(s,
-                     &search_handle,
-                     FILE_NORMAL | FILE_DIRECTORY |
-                     FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
-                     FILE_ARCHIVED,
-                     &f, sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) {
+  if (!DosFindFirst(s,
+                    &search_handle,
+                    FILE_NORMAL | FILE_DIRECTORY |
+                    FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
+                    FILE_ARCHIVED,
+                    &ffb, sizeof(ffb), &num_matches, FIL_STANDARD)) {
     do {
-      if (!(f.attrFile & FILE_DIRECTORY)) {
-        strcpy(enddir, f.achName);
+      if (!(ffb.attrFile & FILE_DIRECTORY)) {
+        strcpy(enddir, ffb.achName);
         unlinkf("%s", s);
       }
     }
-    while (!xDosFindNext(search_handle,
-                         &f, sizeof(FILEFINDBUF3L), &num_matches));
+    while (!DosFindNext(search_handle,
+                        &ffb, sizeof(ffb), &num_matches));
     DosFindClose(search_handle);
   }