diff mbox series

[FFmpeg-devel,1/2] lavf/avio_internal: add ffio_write_lines for line ending normalization

Message ID 20240128223830.57736-1-rcombs@rcombs.me
State Accepted
Commit 98eeef44aad8e5bd09c4765db852d6155e790d72
Headers show
Series [FFmpeg-devel,1/2] lavf/avio_internal: add ffio_write_lines for line ending normalization | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

rcombs Jan. 28, 2024, 10:38 p.m. UTC 
---
 libavformat/avio_internal.h | 11 +++++++++++
 libavformat/aviobuf.c       | 31 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
diff mbox series

Patch

diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h
index f2e4ff30cb..16cf6ce016 100644
--- a/libavformat/avio_internal.h
+++ b/libavformat/avio_internal.h
@@ -156,6 +156,17 @@  unsigned int ffio_read_leb(AVIOContext *s);
 
 void ffio_write_leb(AVIOContext *s, unsigned val);
 
+/**
+ * Write a sequence of text lines, converting line endings.
+ * All input line endings (LF, CRLF, CR) are converted to the configured line ending.
+ * @param s The AVIOContext to write to
+ * @param buf The buffer to write
+ * @param size The size of the buffer, or <0 to use the full length of a null-terminated string
+ * @param ending The line ending sequence to convert to, or NULL for \n
+ */
+void ffio_write_lines(AVIOContext *s, const unsigned char *buf, int size,
+                      const unsigned char *ending);
+
 /**
  * Read size bytes from AVIOContext into buf.
  * Check that exactly size bytes have been read.
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 5a329ce465..76780bc852 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -1004,6 +1004,37 @@  void ffio_write_leb(AVIOContext *s, unsigned val)
     }
 }
 
+void ffio_write_lines(AVIOContext *s, const unsigned char *buf, int size,
+                      const unsigned char *ending)
+{
+    int ending_len = ending ? strlen(ending) : 1;
+    if (!ending)
+        ending = "\n";
+    if (size < 0)
+        size = strlen(buf);
+
+    while (size > 0) {
+        size_t len = 0;
+        char last = 0;
+        for (; len < size; len++) {
+            last = buf[len];
+            if (last == '\r' || last == '\n')
+                break;
+        }
+
+        avio_write(s, buf, len);
+        avio_write(s, ending, ending_len);
+
+        buf += len + 1;
+        size -= len + 1;
+
+        if (size > 0 && last == '\r' && buf[0] == '\n') {
+            buf++;
+            size--;
+        }
+    }
+}
+
 int ffio_fdopen(AVIOContext **s, URLContext *h)
 {
     uint8_t *buffer = NULL;