Fri Jul 17 08:19:29 2009 UTC ()
Avoid conflit with system getline.
Fixes PR pkg/41746, thanks to Tom Stejskal.
(roy)
diff -r1.12 -r1.13 pkgsrc/textproc/ispell-base/distinfo
diff -r0 -r1.1 pkgsrc/textproc/ispell-base/patches/patch-as
--- pkgsrc/textproc/ispell-base/Attic/distinfo 2009/02/14 16:20:54 1.12
+++ pkgsrc/textproc/ispell-base/Attic/distinfo 2009/07/17 08:19:29 1.13
| @@ -1,14 +1,15 @@ | | | @@ -1,14 +1,15 @@ |
| 1 | $NetBSD: distinfo,v 1.12 2009/02/14 16:20:54 joerg Exp $ | | 1 | $NetBSD: distinfo,v 1.13 2009/07/17 08:19:29 roy Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (ispell-3.3.02.tar.gz) = c0d98e1af3afb8e0b642717c03439ff8881e3d60 | | 3 | SHA1 (ispell-3.3.02.tar.gz) = c0d98e1af3afb8e0b642717c03439ff8881e3d60 |
| 4 | RMD160 (ispell-3.3.02.tar.gz) = 12edc94ebb7c1f4040bd8f5b0dbb8f40326aa781 | | 4 | RMD160 (ispell-3.3.02.tar.gz) = 12edc94ebb7c1f4040bd8f5b0dbb8f40326aa781 |
| 5 | Size (ispell-3.3.02.tar.gz) = 619813 bytes | | 5 | Size (ispell-3.3.02.tar.gz) = 619813 bytes |
| 6 | SHA1 (patch-aa) = cf8e0863e62103526d75ba5f0f25c760d4ee8e32 | | 6 | SHA1 (patch-aa) = cf8e0863e62103526d75ba5f0f25c760d4ee8e32 |
| 7 | SHA1 (patch-ab) = 0a0569521b73761e969794e64d8ba8822c705720 | | 7 | SHA1 (patch-ab) = 0a0569521b73761e969794e64d8ba8822c705720 |
| 8 | SHA1 (patch-ac) = 02b94c918164c19ec7cba5c9b88b7168a6f37925 | | 8 | SHA1 (patch-ac) = 02b94c918164c19ec7cba5c9b88b7168a6f37925 |
| 9 | SHA1 (patch-ad) = 86bcb4c4b34a970b5f3eba6d406a8b8204fccf39 | | 9 | SHA1 (patch-ad) = 86bcb4c4b34a970b5f3eba6d406a8b8204fccf39 |
| 10 | SHA1 (patch-ae) = 0b19b5f4f2a0faf74ce130b7414bdf85b7588954 | | 10 | SHA1 (patch-ae) = 0b19b5f4f2a0faf74ce130b7414bdf85b7588954 |
| 11 | SHA1 (patch-ai) = 210d80ca55fc1d4fb5aa308205d8630a7f4bfb67 | | 11 | SHA1 (patch-ai) = 210d80ca55fc1d4fb5aa308205d8630a7f4bfb67 |
| 12 | SHA1 (patch-ak) = aed34699d30d05a61bc2bd4d2ebf88e170ccd65c | | 12 | SHA1 (patch-ak) = aed34699d30d05a61bc2bd4d2ebf88e170ccd65c |
| 13 | SHA1 (patch-al) = 27d87b52dc5507e9dbab73bb9643fa490920216d | | 13 | SHA1 (patch-al) = 27d87b52dc5507e9dbab73bb9643fa490920216d |
| 14 | SHA1 (patch-ar) = 872cfc47e3652716afab9561fcf4a1bda2cee61a | | 14 | SHA1 (patch-ar) = 872cfc47e3652716afab9561fcf4a1bda2cee61a |
| | | 15 | SHA1 (patch-as) = fd3b2ec1788a7ffc4c871f5564742aad41fadda9 |
$NetBSD: patch-as,v 1.1 2009/07/17 08:19:29 roy Exp $
Avoid conflit with system getline.
Fixes PR pkg/41746, thanks to Tom Stejskal.
--- correct.c.orig 2009-07-17 09:14:29.000000000 +0100
+++ correct.c 2009-07-17 09:14:46.000000000 +0100
@@ -245,7 +245,7 @@
struct flagent * sufent,
ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN],
int * nsaved));
-static char * getline P ((char * buf, int bufsize));
+static char * get_line P ((char * buf, int bufsize));
void askmode P ((void));
void copyout P ((unsigned char ** cc, int cnt));
static void lookharder P ((unsigned char * string));
@@ -571,7 +571,7 @@
imove (li - 1, 0);
(void) putchar ('!');
- if (getline ((char *) buf, sizeof buf) == NULL)
+ if (get_line ((char *) buf, sizeof buf) == NULL)
{
(void) putchar (7);
ierase ();
@@ -596,7 +596,7 @@
(void) printf ("%s ", CORR_C_READONLY);
}
(void) printf (CORR_C_REPLACE_WITH);
- if (getline ((char *) ctok, ctokl) == NULL)
+ if (get_line ((char *) ctok, ctokl) == NULL)
{
(void) putchar (7);
/* Put it back */
@@ -664,7 +664,7 @@
unsigned char buf[100];
imove (li - 1, 0);
(void) printf (CORR_C_LOOKUP_PROMPT);
- if (getline ((char *) buf, sizeof buf) == NULL)
+ if (get_line ((char *) buf, sizeof buf) == NULL)
{
(void) putchar (7);
ierase ();
@@ -1583,7 +1583,7 @@
return;
}
-static char * getline (s, len)
+static char * get_line (s, len)
register char * s;
register int len;
{