rpms/minicom/F-11 minicom-2.3-getline.patch, NONE, 1.1 minicom.spec, 1.34, 1.35
Jan Görig
jgorig at fedoraproject.org
Tue Mar 16 13:17:01 UTC 2010
Author: jgorig
Update of /cvs/pkgs/rpms/minicom/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9679
Modified Files:
minicom.spec
Added Files:
minicom-2.3-getline.patch
Log Message:
- rename getline to avoid conflict with glibc (#511715)
minicom-2.3-getline.patch:
minicom.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
--- NEW FILE minicom-2.3-getline.patch ---
diff -up minicom-2.3/src/minicom.c.getline minicom-2.3/src/minicom.c
--- minicom-2.3/src/minicom.c.getline 2009-07-16 13:17:04.000000000 +0200
+++ minicom-2.3/src/minicom.c 2009-07-16 13:21:55.000000000 +0200
@@ -166,7 +166,7 @@ static void shjump(int sig)
#endif /*SIGTSTP*/
/* Get a line from either window or scroll back buffer. */
-static ELM *getline(WIN *w, int no)
+static ELM *get_line(WIN *w, int no)
{
int i;
static ELM outofrange[MAXCOLS] = {{0,0,0}};
@@ -204,7 +204,7 @@ static void drawhist(WIN *w, int y, int
w->direct = 0;
for (f = 0; f < w->ys; f++)
- mc_wdrawelm(w, f, getline(w, y++));
+ mc_wdrawelm(w, f, get_line(w, y++));
if (r)
mc_wredraw(w, 1);
w->direct = 1;
@@ -226,7 +226,7 @@ void drawhist_look(WIN *w, int y, int r,
tmp_line[0]='\0';
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 */
mc_wdrawelm_var(w, tmp_e, tmp_line);
@@ -323,7 +323,7 @@ int find_next(WIN *w, WIN *w_hist,
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.
@@ -378,9 +378,9 @@ wchar_t *StrStr(wchar_t *str1, wchar_t *
static void drawcite(WIN *w, int y, int citey, int start, int end)
{
if (y+citey >= start && y+citey <= end)
- mc_wdrawelm_inverse(w, y, getline(w, y+citey));
+ mc_wdrawelm_inverse(w, y, get_line(w, y+citey));
else
- mc_wdrawelm(w, y, getline(w, y+citey));
+ mc_wdrawelm(w, y, get_line(w, y+citey));
}
static void drawcite_whole(WIN *w, int y, int start, int end)
@@ -399,7 +399,7 @@ static void do_cite(WIN *w, int start, i
for (y=start; y<=end; y++) {
vt_send('>');
vt_send(' ');
- tmp_e = getline(w, y);
+ tmp_e = get_line(w, y);
mc_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(void)
if (citemode) {
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 (wcslen(look_for) > 1) {
/* quick scan for pattern match */
mc_wdrawelm_var(b_us, tmp_e, tmp_line);
@@ -610,9 +610,9 @@ static void scrollback(void)
}
if (inverse)
- mc_wdrawelm_inverse(b_us, 0, getline(b_us, y));
+ mc_wdrawelm_inverse(b_us, 0, get_line(b_us, y));
else
- mc_wdrawelm(b_us, 0, getline(b_us, y));
+ mc_wdrawelm(b_us, 0, get_line(b_us, y));
if (citemode)
mc_wlocate(b_us, 0, cite_y);
mc_wflush();
@@ -647,7 +647,7 @@ static void scrollback(void)
if (citemode) {
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 (wcslen(look_for) > 1) {
/* quick scan for pattern match */
mc_wdrawelm_var(b_us, tmp_e, tmp_line);
@@ -659,10 +659,10 @@ static void scrollback(void)
if (inverse)
mc_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
mc_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)
mc_wlocate(b_us, 0, cite_y);
mc_wflush();
@@ -752,7 +752,7 @@ static void scrollback(void)
mc_wlocate(b_st, 0, 0);
mc_wprintf(b_st, hline);
mc_wredraw(b_st, 1);
- mc_wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart));
+ mc_wdrawelm_inverse(b_us, cite_y, get_line(b_us, cite_ystart));
mc_wlocate(b_us, 0, cite_y);
break;
case K_ESC:
Index: minicom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/minicom/F-11/minicom.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- minicom.spec 16 Mar 2010 13:03:41 -0000 1.34
+++ minicom.spec 16 Mar 2010 13:17:01 -0000 1.35
@@ -1,7 +1,7 @@
Summary: A text-based modem control and terminal emulation program
Name: minicom
Version: 2.3
-Release: 5%{?dist}
+Release: 6%{?dist}
URL: http://alioth.debian.org/projects/minicom/
License: GPLv2+
Group: Applications/Communications
@@ -22,6 +22,7 @@ Patch8: minicom-2.3-rh.patch
Patch9: minicom-2.3-esc.patch
Patch10: minicom-2.3-staticbuf.patch
Patch11: minicom-2.3-overflow.patch
+Patch12: minicom-2.3-getline.patch
%description
Minicom is a simple text-based modem control and terminal emulation
@@ -41,6 +42,7 @@ language, and other features.
%patch9 -p1 -b .esc
%patch10 -p1 -b .staticbuf
%patch11 -p1 -b .overflow
+%patch12 -p1 -b .getline
%build
%configure
@@ -69,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/*
%changelog
+* Tue Mar 16 2010 Jan Görig <jgorig at redhat.com> 2.3-6
+- rename getline to avoid conflict with glibc (#511715)
+
* Tue Mar 16 2010 Jan Görig <jgorig at redhat.com> 2.3-5
- modify minicom-2.3-rh.patch - wrong doinit checking (#519637)
- backported translation overflow patch (#555283)
More information about the scm-commits
mailing list