Changeset 127 for trunk/src/helpers/dosh.c

Timestamp:

Jan 5, 2002, 8:11:10 PM (24 years ago)

Author:

umoeller

Message:

Tons of updates for turbo folders and replacement icons.

File:

• trunk/src/helpers/dosh.c (modified) (14 diffs)

trunk/src/helpers/dosh.c

@@ -1640 +1640 @@
  */
 
+/*
 APIRET doshOpenExisting(PCSZ pcszFilename,   // in: file name
                         ULONG ulOpenFlags,          // in: open flags
@@ -1654 +1655 @@
                     NULL));     // EAs
 }
-
-/*
- *@@ doshWriteAt:
- *      writes cb bytes (pointed to by pbData) to the
- *      position specified by ulMethod and lOffset into
- *      the file specified by hf.
- *
- *      If ulMethod is FILE_BEGIN, lOffset specifies the
- *      offset from the beginning of the file. With
- *      FILE_CURRENT, lOffset is considered from the
- *      current file pointer, and with FILE_END, it is
- *      considered from the end of the file.
- *
- *@@added V0.9.13 (2001-06-14) [umoeller]
- */
-
-APIRET doshWriteAt(HFILE hf,        // in: OS/2 file handle
-                   LONG lOffset,    // in: offset to write at (depends on ulMethod)
-                   ULONG ulMethod,  // in: one of FILE_BEGIN, FILE_CURRENT, FILE_END
-                   ULONG cb,        // in: bytes to write
-                   PBYTE pbData)    // in: ptr to bytes to write (must be cb bytes)
-{
-    APIRET arc;
-    ULONG ulDummy;
-    if (!(arc = DosSetFilePtr(hf,
-                              lOffset,
-                              ulMethod,
-                              &ulDummy)))
-        arc = DosWrite(hf,
-                       pbData,
-                       cb,
-                       &ulDummy);
-
-    return (arc);
-}
-
-/*
- *@@ doshReadAt:
- *      reads cb bytes from the position specified by
- *      ulMethod and lOffset into the buffer pointed to
- *      by pbData, which should be cb bytes in size.
- *
- *      Use lOffset and ulMethod as with doshWriteAt.
- *
- *@@added V0.9.13 (2001-06-14) [umoeller]
- */
-
-APIRET doshReadAt(HFILE hf,        // in: OS/2 file handle
-                  LONG lOffset,    // in: offset to write at (depends on ulMethod)
-                  ULONG ulMethod,  // in: one of FILE_BEGIN, FILE_CURRENT, FILE_END
-                  PULONG pcb,      // in: bytes to read, out: bytes read
-                  PBYTE pbData)    // out: read buffer (must be cb bytes)
-{
-    APIRET arc;
-    ULONG cb = *pcb;
-    ULONG ulDummy;
-
-    *pcb = 0;
-
-    if (!(arc = DosSetFilePtr(hf,
-                              lOffset,
-                              ulMethod,
-                              &ulDummy)))
-    {
-        if (!(arc = DosRead(hf,
-                            pbData,
-                            cb,
-                            &ulDummy)))
-            *pcb = ulDummy;     // bytes read
-    }
-
-    return (arc);
-}
+*/
 
 /*
@@ -1741 +1670 @@
  +      +-------------------------+------+------------+-----------+
  +      |  XOPEN_READ_EXISTING    | read | opens      | fails     |
+ +      |                         |      | fptr = 0   |           |
+ +      +-------------------------+------+------------+-----------+
+ +      |  XOPEN_READWRITE_EXISTING r/w  | opens      | fails     |
  +      |                         |      | fptr = 0   |           |
  +      +-------------------------+------+------------+-----------+
@@ -1802 +1734 @@
             fsOpenMode |=   OPEN_SHARE_DENYWRITE
                           | OPEN_ACCESS_READONLY;
-            // _Pmpf((__FUNCTION__ ": opening XOPEN_READ_EXISTING"));
 
             // run this first, because if the file doesn't
@@ -1808 +1739 @@
             // which isn't that meaningful
             // V0.9.16 (2001-12-08) [umoeller]
+            arc = doshQueryPathSize(pcszFilename,
+                                    pcbFile);
+        break;
+
+        case XOPEN_READWRITE_EXISTING:
+            fsOpenFlags =   OPEN_ACTION_FAIL_IF_NEW
+                          | OPEN_ACTION_OPEN_IF_EXISTS;
+            fsOpenMode |=   OPEN_SHARE_DENYWRITE
+                          | OPEN_ACCESS_READWRITE;
+
             arc = doshQueryPathSize(pcszFilename,
                                     pcbFile);
@@ -1928 +1869 @@
 
 /*
+ *@@ doshReadAt:
+ *      reads cb bytes from the position specified by
+ *      lOffset into the buffer pointed to by pbData,
+ *      which should be cb bytes in size.
+ *
+ *      Note that lOffset is always considered to
+ *      be from the beginning of the file (FILE_BEGIN
+ *      method).
+ *
+ *@@added V0.9.13 (2001-06-14) [umoeller]
+ *@@changed V0.9.16 (2001-12-18) [umoeller]: now with XFILE, and always using FILE_BEGIN
+ */
+
+APIRET doshReadAt(PXFILE pFile,
+                  ULONG ulOffset,    // in: offset to read from (from beginning of file)
+                  PULONG pcb,      // in: bytes to read, out: bytes read
+                  PBYTE pbData)    // out: read buffer (must be cb bytes)
+{
+    APIRET arc;
+    ULONG cb = *pcb;
+    ULONG ulDummy;
+
+    if (!(arc = doshLockFile(pFile)))   // this checks for pFile
+    {
+        *pcb = 0;
+
+        if (!(arc = DosSetFilePtr(pFile->hf,
+                                  (LONG)ulOffset,
+                                  FILE_BEGIN,
+                                  &ulDummy)))
+        {
+            if (!(arc = DosRead(pFile->hf,
+                                pbData,
+                                cb,
+                                &ulDummy)))
+                *pcb = ulDummy;     // bytes read
+        }
+
+        doshUnlockFile(pFile);
+    }
+
+    return (arc);
+}
+
+/*
  *@@ doshWrite:
  *      writes the specified data to the file.
@@ -1937 +1923 @@
  *      writing.
  *
+ *      Note that this expects that the file
+ *      pointer is at the end of the file, or
+ *      you will get garbage.
+ *
  *@@added V0.9.16 (2001-10-19) [umoeller]
  *@@changed V0.9.16 (2001-12-02) [umoeller]: added XOPEN_BINARY \r\n support
@@ -1943 +1933 @@
 
 APIRET doshWrite(PXFILE pFile,
-                 PCSZ pcsz,
-                 ULONG cb)
+                 ULONG cb,
+                 PCSZ pbData)
 {
     APIRET arc = NO_ERROR;
-    if ((!pFile) || (!pcsz))
+    if ((!pFile) || (!pbData))
         arc = ERROR_INVALID_PARAMETER;
     else
     {
         if (!cb)
-            cb = strlen(pcsz);
+            cb = strlen(pbData);
 
         if (!cb)
@@ -1967 +1957 @@
                 // count all \n first
                 ULONG cNewLines = 0;
-                PCSZ pSource = pcsz;
+                PCSZ pSource = pbData;
                 ULONG ul;
                 for (ul = 0;
@@ -1987 +1977 @@
                     {
                         PSZ pTarget = pszNew;
-                        pSource = pcsz;
+                        pSource = pbData;
                         for (ul = 0;
                              ul < cb;
@@ -2010 +2000 @@
                                          (pszNew)
                                                 ? pszNew
-                                                : (PSZ)pcsz,
+                                                : (PSZ)pbData,
                                          cb,
                                          &cbWritten)))
@@ -2021 +2011 @@
                 free(pszNew);
         }
+    }
+
+    return (arc);
+}
+
+/*
+ *@@ doshWriteAt:
+ *      writes cb bytes (pointed to by pbData) to the
+ *      specified file at the position lOffset (from
+ *      the beginning of the file).
+ *
+ *@@added V0.9.13 (2001-06-14) [umoeller]
+ */
+
+APIRET doshWriteAt(PXFILE pFile,
+                   ULONG ulOffset,    // in: offset to write at
+                   ULONG cb,        // in: bytes to write
+                   PCSZ pbData)     // in: ptr to bytes to write (must be cb bytes)
+{
+    APIRET arc;
+    if (!(arc = doshLockFile(pFile)))   // this checks for pFile
+    {
+        ULONG cbWritten;
+        if (!(arc = DosSetFilePtr(pFile->hf,
+                                  (LONG)ulOffset,
+                                  FILE_BEGIN,
+                                  &cbWritten)))
+        {
+            if (!(arc = DosWrite(pFile->hf,
+                                 (PSZ)pbData,
+                                 cb,
+                                 &cbWritten)))
+            {
+                if (ulOffset + cbWritten > pFile->cbCurrent)
+                    pFile->cbCurrent = ulOffset + cbWritten;
+            }
+        }
+
+        doshUnlockFile(pFile);
     }
 
@@ -2059 +2088 @@
         {
             if (!(arc = doshWrite(pFile,
-                                  szTemp,
-                                  ulLength)))
+                                  ulLength,
+                                  szTemp)))
             {
                 va_list arg_ptr;
@@ -2073 +2102 @@
 
                 arc = doshWrite(pFile,
-                                (PCSZ)szTemp,
-                                ulLength);
+                                ulLength,
+                                szTemp);
             }
         }