string: Add discard feature for for_each_line().

[paraslash.git] / string.c

diff --git a/string.c b/string.c
index c0a1951d83fd934c019413dc985e3d70247b3566..ba744bff2da640eed755fe14775e4f72b849766f 100644 (file)
--- a/string.c
+++ b/string.c
@@ -399,20 +399,21 @@ int for_each_line(unsigned flags, char *buf, size_t size,
                } else
                        end = next_cr;
                num_lines++;
                } else
                        end = next_cr;
                num_lines++;

-               if (flags & FELF_READ_ONLY) {
-                       size_t s = end - start;
-                       char *b = para_malloc(s + 1);
-                       memcpy(b, start, s);
-                       b[s] = '\0';
-//                     PARA_NOTICE_LOG("b: %s, start: %s\n", b, start);
-                       ret = line_handler(b, private_data);
-                       free(b);
-               } else {
-                       *end = '\0';
-                       ret = line_handler(start, private_data);
+               if (!(flags & FELF_DISCARD_FIRST) || start != buf) {
+                       if (flags & FELF_READ_ONLY) {
+                               size_t s = end - start;
+                               char *b = para_malloc(s + 1);
+                               memcpy(b, start, s);
+                               b[s] = '\0';
+                               ret = line_handler(b, private_data);
+                               free(b);
+                       } else {
+                               *end = '\0';
+                               ret = line_handler(start, private_data);
+                       }
+                       if (ret < 0)
+                               return ret;

                }
                }

-               if (ret < 0)
-                       return ret;

                start = ++end;
        }
        i = buf + size - start;
                start = ++end;
        }
        i = buf + size - start;