[Cvs-cvs] Changes to ccvs/lib/getdelim.c

[Derek Robert Price]

Index: ccvs/lib/getdelim.c
diff -u ccvs/lib/getdelim.c:1.2 ccvs/lib/getdelim.c:1.3
--- ccvs/lib/getdelim.c:1.2     Wed Aug 31 13:19:55 2005
+++ ccvs/lib/getdelim.c Wed Aug 31 13:26:36 2005
@@ -46,7 +46,7 @@
 ssize_t
 getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
 {
-  int result;
+  int result = 0;
   ssize_t cur_len = 0;
   ssize_t len;
 
@@ -76,7 +76,10 @@
 
       i = getc (fp);
       if (i == EOF)
+      {
+       result = -1;
        break;
+      }
 
       /* Make enough space for len+1 (for final NUL) bytes.  */
       if (cur_len + 1 >= *n)
@@ -107,8 +110,8 @@
       if (i == delimiter)
        break;
     }
-  (*lineptr)[cur_len++] = '\0';
-  result = cur_len - 1;
+  (*lineptr)[cur_len] = '\0';
+  result = cur_len ? cur_len : result;
 
  unlock_return:
   funlockfile (fp);