diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-05-11 19:34:33 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-05-11 19:34:33 +0000 |
commit | 16fe055bf14c8fcf6d091293f0894f32bbb33294 (patch) | |
tree | 2c24ee014291a1578036eb69a3049e43f9ff1879 /mail | |
parent | Update to 3.8.1 (diff) |
Prevent collision with getline(3)
Notes
Notes:
svn path=/head/; revision=415016
Diffstat (limited to 'mail')
-rw-r--r-- | mail/qconfirm/files/patch-src_getline.c | 11 | ||||
-rw-r--r-- | mail/qconfirm/files/patch-src_getline.h | 5 | ||||
-rw-r--r-- | mail/qconfirm/files/patch-src_qconfirm-notice.c | 11 |
3 files changed, 27 insertions, 0 deletions
diff --git a/mail/qconfirm/files/patch-src_getline.c b/mail/qconfirm/files/patch-src_getline.c new file mode 100644 index 000000000000..7cacfe0d9923 --- /dev/null +++ b/mail/qconfirm/files/patch-src_getline.c @@ -0,0 +1,11 @@ +--- src/getline.c.orig 2004-12-12 16:57:17 UTC ++++ src/getline.c +@@ -2,7 +2,7 @@ + #include "stralloc.h" + #include "byte.h" + +-int getline(buffer *b, stralloc *line) { ++int get_line(buffer *b, stralloc *line) { + int r, i; + char *x; + diff --git a/mail/qconfirm/files/patch-src_getline.h b/mail/qconfirm/files/patch-src_getline.h new file mode 100644 index 000000000000..38f763e86abd --- /dev/null +++ b/mail/qconfirm/files/patch-src_getline.h @@ -0,0 +1,5 @@ +--- src/getline.h.orig 2004-12-12 16:57:17 UTC ++++ src/getline.h +@@ -1 +1 @@ +-extern int getline(); ++extern int get_line(); diff --git a/mail/qconfirm/files/patch-src_qconfirm-notice.c b/mail/qconfirm/files/patch-src_qconfirm-notice.c new file mode 100644 index 000000000000..2478812757c2 --- /dev/null +++ b/mail/qconfirm/files/patch-src_qconfirm-notice.c @@ -0,0 +1,11 @@ +--- src/qconfirm-notice.c.orig 2004-12-12 16:57:17 UTC ++++ src/qconfirm-notice.c +@@ -386,7 +386,7 @@ int main(int argc, const char **argv) { + } + + /* check for confirmation request message */ +- while ((i =getline(buffer_0, &sa)) > 0) { ++ while ((i =get_line(buffer_0, &sa)) > 0) { + if ((i == 1) && (sa.s[0] == '\n')) break; /* end of headers */ + if (request && reply_to.s) break; + for (i =0; i < sa.len; ++i) { |