fixup! re-add strbuf methods removed by revert

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
microsoft · Oct 12, 2018 · c2bd0e9 · c2bd0e9
1 parent 844d368
commit c2bd0e9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/strbuf.c b/strbuf.c
@@ -120,6 +120,15 @@ void strbuf_trim_trailing_dir_sep(struct strbuf *sb)
 	sb->buf[sb->len] = '\0';
 }
 
+void strbuf_trim_trailing_newline(struct strbuf *sb)
+{
+        if (sb->len > 0 && sb->buf[sb->len - 1] == '\n') {
+                if (--sb->len > 0 && sb->buf[sb->len - 1] == '\r')
+                        --sb->len;
+                sb->buf[sb->len] = '\0';
+        }
+}
+
 void strbuf_ltrim(struct strbuf *sb)
 {
 	char *b = sb->buf;

diff --git a/strbuf.h b/strbuf.h
@@ -190,6 +190,9 @@ extern void strbuf_ltrim(struct strbuf *);
 /* Strip trailing directory separators */
 extern void strbuf_trim_trailing_dir_sep(struct strbuf *);
 
+/* Strip trailing LF or CR/LF */
+extern void strbuf_trim_trailing_newline(struct strbuf *sb);
+
 /**
  * Replace the contents of the strbuf with a reencoded form.  Returns -1
  * on error, 0 on success.