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

Timestamp:

Dec 5, 2001, 9:37:33 PM (24 years ago)

Author:

umoeller

Message:

Misc changes.

File:

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

trunk/src/helpers/dosh.c

@@ -1677 +1677 @@
  +      +-------------------------+------+-----------+-----------+
  *
+ *      In addition, you can specify the XOPEN_BINARY flag:
+ *
+ *      --  If XOPEN_BINARY is set, no conversion is performed
+ *          on read and write.
+ *
+ *      --  If XOPEN_BINARY is _not_ set, all \n chars are
+ *          converted to \r\n on write.
+ *
  *      *ppFile receives a new XFILE structure describing
  *      the open file, if NO_ERROR is returned.
@@ -1684 +1692 @@
 
 APIRET doshOpen(PCSZ pcszFilename,   // in: filename to open
-                ULONG ulOpenMode,       // in: XOPEN_* mode
+                ULONG flOpenMode,       // in: XOPEN_* mode
                 PULONG pcbFile,         // in: new file size (if new file is created)
                                         // out: file size
@@ -1696 +1704 @@
                           | OPEN_FLAGS_NOINHERIT;
 
-    switch (ulOpenMode)
+    switch (flOpenMode & XOPEN_ACCESS_MASK)
     {
         case XOPEN_READ_EXISTING:
@@ -1703 +1711 @@
             fsOpenMode |=   OPEN_SHARE_DENYWRITE
                           | OPEN_ACCESS_READONLY;
+            // _Pmpf((__FUNCTION__ ": opening XOPEN_READ_EXISTING"));
         break;
 
@@ -1710 +1719 @@
             fsOpenMode |=   OPEN_SHARE_DENYREADWRITE
                           | OPEN_ACCESS_READWRITE;
+            // _Pmpf((__FUNCTION__ ": opening XOPEN_READWRITE_APPEND"));
         break;
 
@@ -1717 +1727 @@
             fsOpenMode |=   OPEN_SHARE_DENYREADWRITE
                           | OPEN_ACCESS_READWRITE;
+            // _Pmpf((__FUNCTION__ ": opening XOPEN_READWRITE_NEW"));
         break;
-    }
-
-    if (pcszFilename && fsOpenFlags && pcbFile && ppFile)
+
+        default:
+            arc = ERROR_INVALID_PARAMETER;
+    }
+
+    if ((!arc) && pcszFilename && fsOpenFlags && pcbFile && ppFile)
     {
         PXFILE pFile;
@@ -1728 +1742 @@
 
             ZERO(pFile);
+
+            // copy open flags
+            pFile->flOpenMode = flOpenMode;
 
             if (!(arc = DosOpen((PSZ)pcszFilename,
@@ -1741 +1758 @@
 
                 if (    (ulAction == FILE_EXISTED)
-                     && (ulOpenMode == XOPEN_READWRITE_APPEND)
+                     && ((flOpenMode & XOPEN_ACCESS_MASK) == XOPEN_READWRITE_APPEND)
                    )
                     // get its size and set ptr to end for append
@@ -1814 +1831 @@
  *      to find out the length.
  *
+ *      If the file is not in binary mode, all
+ *      \n chars are converted to \r\n before
+ *      writing.
+ *
  *@@added V0.9.16 (2001-10-19) [umoeller]
+ *@@changed V0.9.16 (2001-12-02) [umoeller]: added XOPEN_BINARY \r\n support
  */
 
@@ -1821 +1843 @@
                  ULONG cb)
 {
-    APIRET arc;
+    APIRET arc = NO_ERROR;
     if (!pcsz)
         arc = ERROR_INVALID_PARAMETER;
@@ -1832 +1854 @@
             arc = ERROR_INVALID_PARAMETER;
         else
-            if (!(arc = doshLockFile(pFile)))   // this checks for pFile
+        {
+            PSZ pszNew = NULL;
+
+            if (!(pFile->flOpenMode & XOPEN_BINARY))
             {
-                ULONG cbWritten;
-                if (!(arc = DosWrite(pFile->hf,
-                                     (PSZ)pcsz,
-                                     cb,
-                                     &cbWritten)))
-                    pFile->cbCurrent += cbWritten;
-
-                doshUnlockFile(pFile);
+                // convert all \n to \r\n:
+                // V0.9.16 (2001-12-02) [umoeller]
+
+                // count all \n first
+                ULONG cNewLines = 0;
+                PCSZ pSource = pcsz;
+                ULONG ul;
+                for (ul = 0;
+                     ul < cb;
+                     ul++)
+                {
+                    if (*pSource++ == '\n')
+                        cNewLines++;
+                }
+
+                if (cNewLines)
+                {
+                    // we have '\n' chars:
+                    // then we need just as many \r chars inserted
+                    ULONG cbNew = cb + cNewLines;
+                    if (!(pszNew = (PSZ)malloc(cbNew)))
+                        arc = ERROR_NOT_ENOUGH_MEMORY;
+                    else
+                    {
+                        PSZ pTarget = pszNew;
+                        pSource = pcsz;
+                        for (ul = 0;
+                             ul < cb;
+                             ul++)
+                        {
+                            CHAR c = *pSource++;
+                            if (c == '\n')
+                                *pTarget++ = '\r';
+                            *pTarget++ = c;
+                        }
+
+                        cb = cbNew;
+                    }
+                }
             }
+
+            if (!arc)
+                if (!(arc = doshLockFile(pFile)))   // this checks for pFile
+                {
+                    ULONG cbWritten;
+                    if (!(arc = DosWrite(pFile->hf,
+                                         (pszNew)
+                                                ? pszNew
+                                                : (PSZ)pcsz,
+                                         cb,
+                                         &cbWritten)))
+                        pFile->cbCurrent += cbWritten;
+
+                    doshUnlockFile(pFile);
+                }
+
+            if (pszNew)
+                free(pszNew);
+        }
     }
 
@@ -1854 +1929 @@
  *
  *      The internal string buffer is limited to 2000
- *      characters. \n is NOT translated to \r\n before
- *      writing.
+ *      characters. Length checking is _not_ performed.
  */
 
@@ -1883 +1957 @@
             va_end(arg_ptr);
 
-            szTemp[ulLength++] = '\r';
+            if (pFile->flOpenMode & XOPEN_BINARY)
+                // if we're in binary mode, we need to add \r too
+                szTemp[ulLength++] = '\r';
             szTemp[ulLength++] = '\n';