Mon Aug 24 08:14:37 2009 UTC ()
Fix build on systems with POSIX getline().
(wiz)
diff -r1.9 -r1.10 pkgsrc/comms/minicom/distinfo
diff -r0 -r1.1 pkgsrc/comms/minicom/patches/patch-aj
--- pkgsrc/comms/minicom/distinfo 2007/06/19 21:46:40 1.9
+++ pkgsrc/comms/minicom/distinfo 2009/08/24 08:14:36 1.10
| @@ -1,14 +1,15 @@ | | | @@ -1,14 +1,15 @@ |
1 | $NetBSD: distinfo,v 1.9 2007/06/19 21:46:40 jlam Exp $ | | 1 | $NetBSD: distinfo,v 1.10 2009/08/24 08:14:36 wiz Exp $ |
2 | | | 2 | |
3 | SHA1 (minicom-2.1.tar.gz) = 720273f6ee8db5fb2da4379ac610a520a31aba70 | | 3 | SHA1 (minicom-2.1.tar.gz) = 720273f6ee8db5fb2da4379ac610a520a31aba70 |
4 | RMD160 (minicom-2.1.tar.gz) = 58121cf29991a92914acee855d6e86486c6d370d | | 4 | RMD160 (minicom-2.1.tar.gz) = 58121cf29991a92914acee855d6e86486c6d370d |
5 | Size (minicom-2.1.tar.gz) = 607939 bytes | | 5 | Size (minicom-2.1.tar.gz) = 607939 bytes |
6 | SHA1 (patch-aa) = a7c85609f9384ec7c0e5e950d6244f527b0876d1 | | 6 | SHA1 (patch-aa) = a7c85609f9384ec7c0e5e950d6244f527b0876d1 |
7 | SHA1 (patch-ab) = 4cfb8bc389f4052c08551651aa86f98d0e751028 | | 7 | SHA1 (patch-ab) = 4cfb8bc389f4052c08551651aa86f98d0e751028 |
8 | SHA1 (patch-ac) = 91a2acce80d7d1815a29843b1de5e1acc172024a | | 8 | SHA1 (patch-ac) = 91a2acce80d7d1815a29843b1de5e1acc172024a |
9 | SHA1 (patch-ad) = 31e09b2df1bb93e3ccbd9f400f6fb127726f6070 | | 9 | SHA1 (patch-ad) = 31e09b2df1bb93e3ccbd9f400f6fb127726f6070 |
10 | SHA1 (patch-ae) = b037623c4e3ee4cbc8c73c4b04c6b7f77c689d38 | | 10 | SHA1 (patch-ae) = b037623c4e3ee4cbc8c73c4b04c6b7f77c689d38 |
11 | SHA1 (patch-af) = 38905432b60a796742d43be1aed84ee2774bb222 | | 11 | SHA1 (patch-af) = 38905432b60a796742d43be1aed84ee2774bb222 |
12 | SHA1 (patch-ag) = c8947fb6693d2508d7caa79916142af346e27cdd | | 12 | SHA1 (patch-ag) = c8947fb6693d2508d7caa79916142af346e27cdd |
13 | SHA1 (patch-ah) = da65045ad1d02a7c005aba863a106472d05f5c1c | | 13 | SHA1 (patch-ah) = da65045ad1d02a7c005aba863a106472d05f5c1c |
14 | SHA1 (patch-ai) = 5a1ecdea3287dc4d0b1c71bb88656fb729522081 | | 14 | SHA1 (patch-ai) = 5a1ecdea3287dc4d0b1c71bb88656fb729522081 |
| | | 15 | SHA1 (patch-aj) = 56c537b245aa32f9b71c96d527bc83c88ec66005 |
$NetBSD: patch-aj,v 1.1 2009/08/24 08:14:37 wiz Exp $
--- src/minicom.c.orig 2003-05-16 20:33:19.000000000 +0000
+++ src/minicom.c
@@ -153,7 +153,7 @@ int dummy;
#if _HISTORY
/* Get a line from either window or scroll back buffer. */
-static ELM *getline(w, no)
+static ELM *get_line(w, no)
WIN *w;
int no;
{
@@ -194,7 +194,7 @@ int r;
w->direct = 0;
for(f = 0; f < w->ys; f++)
- wdrawelm(w, f, getline(w, y++));
+ wdrawelm(w, f, get_line(w, y++));
if (r) wredraw(w, 1);
w->direct = 1;
}
@@ -222,7 +222,7 @@ int case_matters;
w->direct = 0;
for (f = 0; f < w->ys; f++)
{
- tmp_e = getline(w, y++);
+ tmp_e = get_line(w, y++);
/* First we "accumulate" the line into a variable */
wdrawelm_var(w, tmp_e, tmp_line);
@@ -321,7 +321,7 @@ int case_matters; /* guess... */
for (next_line = hit_line; next_line <= all_lines; next_line++)
{
/* we do 'something' here... :-) */
- tmp_e = getline(w_hist, next_line);
+ tmp_e = get_line(w_hist, next_line);
/*
* First we "accumulate" the line into a variable.
@@ -390,9 +390,9 @@ int start;
int end;
{
if (y+citey >= start && y+citey <= end)
- wdrawelm_inverse(w, y, getline(w, y+citey));
+ wdrawelm_inverse(w, y, get_line(w, y+citey));
else
- wdrawelm(w, y, getline(w, y+citey));
+ wdrawelm(w, y, get_line(w, y+citey));
}
static void drawcite_whole(w, y, start, end)
@@ -416,7 +416,7 @@ int start,end;
for (y=start; y<=end; y++) {
vt_send('>');
vt_send(' ');
- tmp_e = getline(w, y);
+ tmp_e = get_line(w, y);
wdrawelm_var(w, tmp_e, tmp_line);
tmp_line[w->xs]=0;
for (x=w->xs-1; x>=0; x--){
@@ -599,7 +599,7 @@ static void scrollback()
inverse =
(y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
} else {
- tmp_e = getline(b_us, y);
+ tmp_e = get_line(b_us, y);
if (strlen(look_for) > 1)
{
/* quick scan for pattern match */
@@ -618,8 +618,8 @@ static void scrollback()
inverse = 0;
}
#endif /*_SEARCH_HISTORY*/
- if (inverse) wdrawelm_inverse(b_us, 0, getline(b_us, y));
- else wdrawelm(b_us, 0, getline(b_us, y));
+ if (inverse) wdrawelm_inverse(b_us, 0, get_line(b_us, y));
+ else wdrawelm(b_us, 0, get_line(b_us, y));
if (citemode) wlocate(b_us, 0, cite_y);
wflush();
break;
@@ -652,7 +652,7 @@ static void scrollback()
inverse =
(y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
} else {
- tmp_e = getline(b_us, y + b_us->ys - 1);
+ tmp_e = get_line(b_us, y + b_us->ys - 1);
if (strlen(look_for) > 1)
{
/* quick scan for pattern match */
@@ -673,10 +673,10 @@ static void scrollback()
#endif /*_SEARCH_HISTORY*/
if (inverse)
wdrawelm_inverse(b_us, b_us->ys - 1,
- getline(b_us, y + b_us->ys - 1));
+ get_line(b_us, y + b_us->ys - 1));
else
wdrawelm(b_us, b_us->ys - 1,
- getline(b_us, y + b_us->ys - 1));
+ get_line(b_us, y + b_us->ys - 1));
if (citemode) wlocate(b_us, 0, cite_y);
wflush();
break;
@@ -760,7 +760,7 @@ static void scrollback()
wlocate(b_st, 0, 0);
wprintf(b_st, hline);
wredraw(b_st, 1);
- wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart));
+ wdrawelm_inverse(b_us, cite_y, get_line(b_us, cite_ystart));
wlocate(b_us, 0, cite_y);
break;
case K_ESC: