Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by seth (08a9e064f03b57863e501e9dcac6e3d8f0e4b6fd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: seth <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by seth (08a9e064f03b57863e501e9dcac6e3d8f0e4b6fd)
  • Date: Sun, 31 May 2009 00:59:31 -0500

GIT changes to master grimoire by seth <seth AT mail.swoolley.org>:

net/minicom/PRE_BUILD | 4 +
net/minicom/minicom.patch | 111
++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 115 insertions(+)

New commits:
commit 08a9e064f03b57863e501e9dcac6e3d8f0e4b6fd
Author: seth <seth AT mail.swoolley.org>
Commit: seth <seth AT mail.swoolley.org>

change getline static func references to getaline to not collide with
stdio's getline.

diff --git a/net/minicom/PRE_BUILD b/net/minicom/PRE_BUILD
new file mode 100755
index 0000000..320cd67
--- /dev/null
+++ b/net/minicom/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch src/minicom.c < $SCRIPT_DIRECTORY/minicom.patch
+
diff --git a/net/minicom/minicom.patch b/net/minicom/minicom.patch
new file mode 100644
index 0000000..07b950d
--- /dev/null
+++ b/net/minicom/minicom.patch
@@ -0,0 +1,111 @@
+--- minicom-2.3/src/minicom.c 2008-02-02 22:49:53.000000000 +0000
++++ minicom.c 2009-05-31 13:31:27.000000000 +0000
+@@ -167,7 +167,7 @@
+ #endif /*SIGTSTP*/
+
+ /* Get a line from either window or scroll back buffer. */
+-static ELM *getline(WIN *w, int no)
++static ELM *getaline(WIN *w, int no)
+ {
+ int i;
+ static ELM outofrange[MAXCOLS] = {{0,0,0}};
+@@ -205,7 +205,7 @@
+
+ w->direct = 0;
+ for (f = 0; f < w->ys; f++)
+- mc_wdrawelm(w, f, getline(w, y++));
++ mc_wdrawelm(w, f, getaline(w, y++));
+ if (r)
+ mc_wredraw(w, 1);
+ w->direct = 1;
+@@ -227,7 +227,7 @@
+ tmp_line[0]='\0';
+ w->direct = 0;
+ for (f = 0; f < w->ys; f++) {
+- tmp_e = getline(w, y++);
++ tmp_e = getaline(w, y++);
+
+ /* First we "accumulate" the line into a variable */
+ mc_wdrawelm_var(w, tmp_e, tmp_line);
+@@ -324,7 +324,7 @@
+
+ for (next_line = hit_line; next_line <= all_lines; next_line++) {
+ /* we do 'something' here... :-) */
+- tmp_e = getline(w_hist, next_line);
++ tmp_e = getaline(w_hist, next_line);
+
+ /*
+ * First we "accumulate" the line into a variable.
+@@ -379,9 +379,9 @@
+ 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, getaline(w, y+citey));
+ else
+- mc_wdrawelm(w, y, getline(w, y+citey));
++ mc_wdrawelm(w, y, getaline(w, y+citey));
+ }
+
+ static void drawcite_whole(WIN *w, int y, int start, int end)
+@@ -400,7 +400,7 @@
+ for (y=start; y<=end; y++) {
+ vt_send('>');
+ vt_send(' ');
+- tmp_e = getline(w, y);
++ tmp_e = getaline(w, y);
+ mc_wdrawelm_var(w, tmp_e, tmp_line);
+ tmp_line[w->xs] = 0;
+ for (x = w->xs-1; x >= 0; x--) {
+@@ -600,7 +600,7 @@
+ if (citemode) {
+ inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
+ } else {
+- tmp_e = getline(b_us, y);
++ tmp_e = getaline(b_us, y);
+ if (wcslen(look_for) > 1) {
+ /* quick scan for pattern match */
+ mc_wdrawelm_var(b_us, tmp_e, tmp_line);
+@@ -611,9 +611,9 @@
+ }
+
+ if (inverse)
+- mc_wdrawelm_inverse(b_us, 0, getline(b_us, y));
++ mc_wdrawelm_inverse(b_us, 0, getaline(b_us, y));
+ else
+- mc_wdrawelm(b_us, 0, getline(b_us, y));
++ mc_wdrawelm(b_us, 0, getaline(b_us, y));
+ if (citemode)
+ mc_wlocate(b_us, 0, cite_y);
+ mc_wflush();
+@@ -648,7 +648,7 @@
+ 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 = getaline(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);
+@@ -660,10 +660,10 @@
+
+ if (inverse)
+ mc_wdrawelm_inverse(b_us, b_us->ys - 1,
+- getline(b_us, y + b_us->ys - 1));
++ getaline(b_us, y + b_us->ys - 1));
+ else
+ mc_wdrawelm(b_us, b_us->ys - 1,
+- getline(b_us, y + b_us->ys - 1));
++ getaline(b_us, y + b_us->ys - 1));
+ if (citemode)
+ mc_wlocate(b_us, 0, cite_y);
+ mc_wflush();
+@@ -753,7 +753,7 @@
+ 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, getaline(b_us, cite_ystart));
+ mc_wlocate(b_us, 0, cite_y);
+ break;
+ case K_ESC:



  • [SM-Commit] GIT changes to master grimoire by seth (08a9e064f03b57863e501e9dcac6e3d8f0e4b6fd), seth, 05/31/2009

Archive powered by MHonArc 2.6.24.

Top of Page