Changeset 2594

Timestamp:

Mar 9, 2006, 7:38:07 PM (19 years ago)

Author:

bird

Message:

#62: Fixed incorrect EOF treatment in getdelim (and in getline since that's just a special case of getdelim).

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/lib/io/getdelim.c (modified) (5 diffs)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -2 +2 @@
 
 TODO: open replace on RAMFS fails with error 32!
+
+2006-03-09: knut st. osmundsen <bird-gccos2-spam@anduin.net>
+    - libc:
+        o #62: Fixed incorrect EOF treatment in getdelim (and in getline since that's just a 
+          special case of getdelim).
 
 2006-03-07: knut st. osmundsen <bird-gccos2-spam@anduin.net>

branches/libc-0.6/src/emx/src/lib/io/getdelim.c

@@ -46 +46 @@
  *
  * @returns number of bytes read.
- * @returns -1 on failure, including EOF.
+ * @returns -1 on failure - this includes EOF when nothing was retrieved.
  * @param   ppszString      Where to buffer pointer is stored. *ppszString can of course be NULL.
  * @param   pcchString      Size of the buffer pointed to by *ppszString.
@@ -81 +81 @@
      */
     STREAM_LOCK(pStream);
-    ssize_t rc = -1;
+    ssize_t rc = 0;
     char *psz = *ppszString;
     char *pszEnd = psz + *pcchString - 1;
@@ -90 +90 @@
         int ch = _getc_inline(pStream);
         if (ch == EOF)
+        {
+            if (psz == *ppszString)
+                rc = -1;
             break;
+        }
         if (psz == pszEnd)
         {
@@ -100 +104 @@
             char *pszNew = (char *)realloc(*ppszString, cch);
             if (!pszNew)
+            {
+                rc = -1;
                 break;
+            }
 
             psz = pszNew + (psz - *ppszString);
@@ -109 +116 @@
         *psz++ = (char)ch;
         if (ch == chDelim)
-        {
-            rc = psz - *ppszString;
             break;
-        }
     }
     STREAM_UNLOCK(pStream);
+
+    if (!rc)
+        rc = psz - *ppszString;
 
     *psz = '\0';