From 36212b99fc20b0661e77e17f89a95b702f21eace Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Fri, 13 May 2016 19:36:51 +0000 Subject: Prevent collision with getline(3) While here regen patches --- math/xgraph/files/patch-dialog.c | 20 ++++++++++++++++++++ math/xgraph/files/patch-hpgl.c | 4 ++-- math/xgraph/files/patch-ps.c | 6 +++--- math/xgraph/files/patch-xgraph.c | 22 +++++++++++----------- math/xgraph/files/patch-xgraph.h | 10 +++++----- math/xgraph/files/patch-xtb.c | 6 +++--- 6 files changed, 44 insertions(+), 24 deletions(-) create mode 100644 math/xgraph/files/patch-dialog.c (limited to 'math') diff --git a/math/xgraph/files/patch-dialog.c b/math/xgraph/files/patch-dialog.c new file mode 100644 index 000000000000..567707c21dfc --- /dev/null +++ b/math/xgraph/files/patch-dialog.c @@ -0,0 +1,20 @@ +--- dialog.c.orig 2000-08-03 16:40:44 UTC ++++ dialog.c +@@ -702,7 +702,7 @@ xtb_frame *frame; /* Returned frame */ + new_info->lines = (Window *) malloc((unsigned) (sizeof(Window) * E_LINES)); + + lineptr = text; +- while (getline(&lineptr, line)) { ++ while (get_line(&lineptr, line)) { + if (new_info->num_lines >= new_info->alloc_lines) { + new_info->alloc_lines *= 2; + new_info->lines = (Window *) realloc((char *) new_info->lines, +@@ -800,7 +800,7 @@ char *err_text; + + + +-int getline(tptr, lptr) ++int get_line(tptr, lptr) + char **tptr; + char *lptr; + /* diff --git a/math/xgraph/files/patch-hpgl.c b/math/xgraph/files/patch-hpgl.c index 7744f6898d87..3fb8f90bed3d 100644 --- a/math/xgraph/files/patch-hpgl.c +++ b/math/xgraph/files/patch-hpgl.c @@ -1,5 +1,5 @@ ---- hpgl.c.orig Thu Aug 3 03:31:56 2000 -+++ hpgl.c Sun Aug 6 23:45:06 2000 +--- hpgl.c.orig 2000-08-02 18:31:56 UTC ++++ hpgl.c @@ -13,9 +13,8 @@ #include "xgout.h" #include "plotter.h" diff --git a/math/xgraph/files/patch-ps.c b/math/xgraph/files/patch-ps.c index a6f6313886be..258a6144fa27 100644 --- a/math/xgraph/files/patch-ps.c +++ b/math/xgraph/files/patch-ps.c @@ -1,6 +1,6 @@ ---- ps.c.orig Thu Jul 17 03:40:40 1997 -+++ ps.c Fri Dec 10 03:11:36 1999 -@@ -57,7 +57,6 @@ +--- ps.c.orig 2000-08-02 21:17:34 UTC ++++ ps.c +@@ -59,7 +59,6 @@ #define PS(str) OUT(psFile, str) #define PSU(str) OUT(ui->psFile, str) #define IY(val) (ui->height_devs - val) diff --git a/math/xgraph/files/patch-xgraph.c b/math/xgraph/files/patch-xgraph.c index 5e029d2e214b..9a6e89787a7b 100644 --- a/math/xgraph/files/patch-xgraph.c +++ b/math/xgraph/files/patch-xgraph.c @@ -1,6 +1,6 @@ ---- xgraph.c 2000-09-10 07:05:47.000000000 -0700 -+++ xgraph.c 2014-12-15 22:32:58.000000000 -0800 -@@ -74,8 +74,6 @@ +--- xgraph.c.orig 2000-09-10 14:05:47 UTC ++++ xgraph.c +@@ -74,8 +74,6 @@ #define BTNPAD 1 #define BTNINTER 3 @@ -9,7 +9,7 @@ #define ABS(x) ((x) < 0 ? -(x) : (x)) #define ZERO_THRES 1.0E-07 -@@ -333,6 +331,7 @@ +@@ -333,6 +331,7 @@ char *argv[]; if (!strm) { (void) fprintf(stderr, "Warning: cannot open file `%s'\n", inFileNames[idx]); @@ -17,7 +17,7 @@ } else { if ((maxitems = ReadData(strm, inFileNames[idx])) < 0) { errs++; -@@ -403,6 +402,7 @@ +@@ -403,6 +402,7 @@ char *argv[]; fg_color = PM_COLOR("Foreground"); bg_color = PM_COLOR("Background"); XRecolorCursor(disp, zoomCursor, &fg_color, &bg_color); @@ -25,7 +25,7 @@ Num_Windows = 1; while (Num_Windows > 0) { -@@ -415,6 +415,12 @@ +@@ -415,6 +415,12 @@ char *argv[]; continue; } switch (theEvent.type) { @@ -38,7 +38,7 @@ case Expose: if (theEvent.xexpose.count <= 0) { XWindowAttributes win_attr; -@@ -422,7 +428,7 @@ +@@ -422,7 +428,7 @@ char *argv[]; XGetWindowAttributes(disp, theEvent.xany.window, &win_attr); win_info->dev_info.area_w = win_attr.width; win_info->dev_info.area_h = win_attr.height; @@ -47,7 +47,7 @@ DrawWindow(win_info); } break; -@@ -715,7 +721,7 @@ +@@ -715,7 +721,7 @@ int primary; /* Is this the primary wi if (sizehints.x<0) sizehints.x = 0; sizehints.y += 25; } @@ -56,7 +56,7 @@ /* Aspect ratio computation */ if (asp < 1.0) { -@@ -723,6 +729,7 @@ +@@ -723,6 +729,7 @@ int primary; /* Is this the primary wi } else { height = ((int) (((double) NORMSIZE) / asp)); } @@ -64,7 +64,7 @@ height = MAX(MINDIM, height); width = MAX(MINDIM, width); -@@ -789,7 +796,7 @@ +@@ -789,7 +796,7 @@ int primary; /* Is this the primary wi new_info->flags = 0; XSelectInput(disp, new_window, @@ -73,7 +73,7 @@ if (!theCursor) { theCursor = XCreateFontCursor(disp, XC_top_left_arrow); fg_color = PM_COLOR("Foreground"); -@@ -1478,6 +1485,8 @@ +@@ -1478,6 +1485,8 @@ LineInfo *result; /* Returned result */ while (*line && (*line != '\n') && (*line != '"')) line++; if (*line) *line = '\0'; } else { diff --git a/math/xgraph/files/patch-xgraph.h b/math/xgraph/files/patch-xgraph.h index a89aaf4b1730..06f16e5c72b1 100644 --- a/math/xgraph/files/patch-xgraph.h +++ b/math/xgraph/files/patch-xgraph.h @@ -1,5 +1,5 @@ ---- xgraph.h.orig Thu Jul 17 03:40:41 1997 -+++ xgraph.h Fri Dec 10 03:10:48 1999 +--- xgraph.h.orig 1997-07-16 18:40:41 UTC ++++ xgraph.h @@ -5,7 +5,12 @@ #ifndef _XGRAPH_H_ #define _XGRAPH_H_ @@ -13,7 +13,7 @@ #include #include #include -@@ -33,20 +38,9 @@ +@@ -33,20 +38,9 @@ extern void do_hardcopy(); /* Carries ou extern void ho_dialog(); /* Hardcopy dialog */ extern void set_X(); /* Initializes X device */ @@ -33,7 +33,7 @@ +#define MAX(a,b) ((a) > (b) ? (a) : (b)) +#define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif -- --extern void abort(); +-extern void abort(); +- #endif /* _XGRAPH_H_ */ diff --git a/math/xgraph/files/patch-xtb.c b/math/xgraph/files/patch-xtb.c index 41fe9c2d3005..f6486b81813b 100644 --- a/math/xgraph/files/patch-xtb.c +++ b/math/xgraph/files/patch-xtb.c @@ -1,6 +1,6 @@ ---- xtb.c.orig Thu Jul 17 04:26:41 1997 -+++ xtb.c Fri Dec 10 03:06:26 1999 -@@ -196,7 +196,7 @@ +--- xtb.c.orig 2000-08-02 18:33:01 UTC ++++ xtb.c +@@ -198,7 +198,7 @@ Window win; { xtb_data data; -- cgit v1.2.3