Changeset 41504 in vbox for trunk/src/VBox/Runtime

Timestamp:

May 30, 2012 6:40:48 PM (13 years ago)

Author:

vboxsync

Message:

RTStrmGetLine: Deal with correctly with \r\n, current handling is stupid as it returns two lines.

File:

• trunk/src/VBox/Runtime/r3/stream.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/stream.cpp

@@ -922 +922 @@
 
 
-/**
- * Reads a line from a file stream.
- * A line ends with a '\\n', '\\0' or the end of the file.
- *
- * @returns iprt status code.
- * @returns VINF_BUFFER_OVERFLOW if the buffer wasn't big enough to read an entire line.
- * @param   pStream         The stream.
- * @param   pszString       Where to store the line.
- *                          The line will *NOT* contain any '\\n'.
- * @param   cchString       The size of the string buffer.
- */
-RTR3DECL(int) RTStrmGetLine(PRTSTREAM pStream, char *pszString, size_t cchString)
+RTR3DECL(int) RTStrmGetLine(PRTSTREAM pStream, char *pszString, size_t cbString)
 {
     AssertReturn(RT_VALID_PTR(pStream) && pStream->u32Magic == RTSTREAM_MAGIC, VERR_INVALID_PARAMETER);
     int rc;
-    if (pszString && cchString > 1)
+    if (pszString && cbString > 1)
     {
         rc = pStream->i32Error;
         if (RT_SUCCESS(rc))
         {
-            cchString--;            /* save space for the terminator. */
+            cbString--;            /* save space for the terminator. */
             rtStrmLock(pStream);
             for (;;)
@@ -951 +940 @@
                 int ch = fgetc(pStream->pFile);
 #endif
+
+                /* Deal with \r\n sequences here. We'll return lone CR, but
+                   treat CRLF as LF. */
+                if (ch == '\r')
+                {
+#ifdef HAVE_FWRITE_UNLOCKED /** @todo darwin + freebsd(?) has fgetc_unlocked but not fwrite_unlocked, optimize... */
+                    ch = fgetc_unlocked(pStream->pFile);
+#else
+                    ch = fgetc(pStream->pFile);
+#endif
+                    if (ch == '\n')
+                        break;
+
+                    *pszString++ = '\r';
+                    if (--cbString <= 0)
+                    {
+                        /* yeah, this is an error, we dropped a character. */
+                        rc = VERR_BUFFER_OVERFLOW;
+                        break;
+                    }
+                }
+
+                /* Deal with end of file. */
                 if (ch == EOF)
                 {
@@ -975 +987 @@
                     break;
                 }
-                if (ch == '\0' || ch == '\n' || ch == '\r')
+
+                /* Deal with null terminator and (lone) new line. */
+                if (ch == '\0' || ch == '\n')
                     break;
+
+                /* No special character, append it to the return string. */
                 *pszString++ = ch;
-                if (--cchString <= 0)
+                if (--cbString <= 0)
                 {
                     rc = VINF_BUFFER_OVERFLOW;