changed debian/source/format to native
This commit is contained in:
parent
b2b0ef2f26
commit
f3e1d14758
|
@ -1,45 +0,0 @@
|
|||
From: Thorsten Alteholz <debian@alteholz.de>
|
||||
Date: Mon, 16 May 2022 15:10:15 +0800
|
||||
Subject: err-in-string
|
||||
|
||||
This is a small patch to avoid an endless loop. In case of an error
|
||||
textwrap() adds <ERR> at the end of the string and returns with the
|
||||
string that was built up to that error.
|
||||
---
|
||||
textwrap.3 | 3 +++
|
||||
textwrap.c | 8 ++++++++
|
||||
2 files changed, 11 insertions(+)
|
||||
|
||||
diff --git a/textwrap.3 b/textwrap.3
|
||||
index 4bac77b..67f1f84 100644
|
||||
--- a/textwrap.3
|
||||
+++ b/textwrap.3
|
||||
@@ -78,6 +78,9 @@ proper number of space code (0x20) by \fBtextwrap\fR.
|
||||
.SH RETURN VALUE
|
||||
\fBtextwrap()\fR returns the line-folded text.
|
||||
You can free(3) the given value.
|
||||
+
|
||||
+In case of any error while processing the string, the text <ERR> will be
|
||||
+appended to the output and processing will be aborted.
|
||||
.\" ********************************************************************
|
||||
.SH EXAMPLE
|
||||
.nf
|
||||
diff --git a/textwrap.c b/textwrap.c
|
||||
index 5753ec9..5c14781 100644
|
||||
--- a/textwrap.c
|
||||
+++ b/textwrap.c
|
||||
@@ -300,6 +300,14 @@ textwrap(const textwrap_t *prop, const char *text)
|
||||
|
||||
now = p; /* current character */
|
||||
ml = mblen(p, MB_CUR_MAX);
|
||||
+ if (ml<0) {
|
||||
+ /*
|
||||
+ * stringt_addstr will take care about enough
|
||||
+ * memory for out
|
||||
+ */
|
||||
+ stringt_addstr(out, " <ERR>");
|
||||
+ return stringt_destroy_extract(out);
|
||||
+ }
|
||||
w = mbwidth(p, ml);
|
||||
b = breakable(p, ml, encoding_type);
|
||||
p += ml;
|
|
@ -1,20 +0,0 @@
|
|||
From: Adrian Bunk <bunk@debian.org>
|
||||
Date: Mon, 16 May 2022 15:10:15 +0800
|
||||
Subject: Fix a dependency bug in Makefile.am
|
||||
|
||||
Old bug exposed by automake 1.16.
|
||||
Bug-Debian: https://bugs.debian.org/905472
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 80acb10..bd7e5e8 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -8,4 +8,4 @@ man_MANS = textwrap.3 dotextwrap.1
|
||||
|
||||
bin_PROGRAMS = dotextwrap
|
||||
dotextwrap_SOURCES = dotextwrap.c
|
||||
-dotextwrap_LDADD = -ltextwrap
|
||||
+dotextwrap_LDADD = libtextwrap.la
|
|
@ -1,2 +0,0 @@
|
|||
01-237630-err-in-string.patch
|
||||
02-makefile-dependencies.patch
|
|
@ -1 +1 @@
|
|||
3.0 (quilt)
|
||||
3.0 (native)
|
||||
|
|
Loading…
Reference in New Issue