| 1 |
diff -up magicpoint-1.11b/image/path.c~ magicpoint-1.11b/image/path.c
|
| 2 |
--- magicpoint-1.11b/image/path.c~ 2008-03-30 22:02:58.000000000 +0200
|
| 3 |
+++ magicpoint-1.11b/image/path.c 2008-03-30 22:02:58.000000000 +0200
|
| 4 |
@@ -20,9 +20,7 @@
|
| 5 |
#if 1 /* SYSV */
|
| 6 |
#include <unistd.h>
|
| 7 |
#endif
|
| 8 |
-#ifdef __APPLE__
|
| 9 |
#include <stdlib.h>
|
| 10 |
-#endif
|
| 11 |
|
| 12 |
/* SUPPRESS 530 */
|
| 13 |
/* SUPPRESS 560 */
|
| 14 |
diff -up magicpoint-1.11b/image/window.c~ magicpoint-1.11b/image/window.c
|
| 15 |
--- magicpoint-1.11b/image/window.c~ 2008-03-30 22:04:06.000000000 +0200
|
| 16 |
+++ magicpoint-1.11b/image/window.c 2008-03-30 22:05:22.000000000 +0200
|
| 17 |
@@ -16,7 +16,7 @@
|
| 18 |
#include <signal.h>
|
| 19 |
#include <errno.h>
|
| 20 |
#include <sys/types.h>
|
| 21 |
-#ifdef SYSV
|
| 22 |
+#if 1 /* SYSV */
|
| 23 |
#include <unistd.h>
|
| 24 |
#endif
|
| 25 |
#if TIME_WITH_SYS_TIME
|
| 26 |
diff -up magicpoint-1.11b/image/misc.c~ magicpoint-1.11b/image/misc.c
|
| 27 |
--- magicpoint-1.11b/image/misc.c~ 2008-03-30 22:01:28.000000000 +0200
|
| 28 |
+++ magicpoint-1.11b/image/misc.c 2008-03-30 22:01:28.000000000 +0200
|
| 29 |
@@ -12,9 +12,7 @@
|
| 30 |
#include "xloadimage.h"
|
| 31 |
#include "patchlevel"
|
| 32 |
#include <signal.h>
|
| 33 |
-#ifdef __APPLE__
|
| 34 |
#include <stdlib.h>
|
| 35 |
-#endif
|
| 36 |
|
| 37 |
extern int _Xdebug;
|
| 38 |
extern Display *display;
|
| 39 |
diff -up magicpoint-1.11b/draw.c~ magicpoint-1.11b/draw.c
|
| 40 |
--- magicpoint-1.11b/draw.c~ 2008-03-30 21:50:02.000000000 +0200
|
| 41 |
+++ magicpoint-1.11b/draw.c 2008-03-30 21:50:02.000000000 +0200
|
| 42 |
@@ -2660,7 +2660,7 @@ x_setfont(xfont, csize, registry, truesc
|
| 43 |
fprintf(stderr, "using best [%d] <%s>\n",
|
| 44 |
best, fontlist[best]);
|
| 45 |
}
|
| 46 |
- strlcpy(fontstring, fontlist[best], sizeof(fontstring));
|
| 47 |
+ snprintf(fontstring, sizeof(fontstring), "%s", fontlist[best]);
|
| 48 |
} else if (scalable >= 0 || tscalable >= 0) {
|
| 49 |
x_fontname(fontstring, sizeof(fontstring), xfont, csize,
|
| 50 |
registry);
|
| 51 |
@@ -4911,23 +4911,23 @@ xft_setfont(xfontarg, csize, registry)
|
| 52 |
*/
|
| 53 |
if ((p = strchr(xfont, '-')) != NULL) {
|
| 54 |
*p++ = 0;
|
| 55 |
- strlcpy(font, xfont, sizeof(font));
|
| 56 |
+ snprintf(font, sizeof(font), "%s", xfont);
|
| 57 |
if (strncmp(p, "bold-i", 6) == 0)
|
| 58 |
- strlcpy(style, "Bold Italic", sizeof(style));
|
| 59 |
+ snprintf(style, sizeof(style), "%s", "Bold Italic");
|
| 60 |
else if (strncmp(p, "bold-", 5) == 0)
|
| 61 |
- strlcpy(style, "Bold", sizeof(style));
|
| 62 |
+ snprintf(style, sizeof(style), "%s", "Bold");
|
| 63 |
else if ((p = strchr(p, '-')) != NULL && p[1] == 'i')
|
| 64 |
- strlcpy(style, "Italic", sizeof(style));
|
| 65 |
+ snprintf(style, sizeof(style), "%s", "Italic");
|
| 66 |
} else if ((p = strchr(xfont, ':')) == NULL)
|
| 67 |
- strlcpy(font, xfont, sizeof(font));
|
| 68 |
+ snprintf(font, sizeof(font), "%s", xfont);
|
| 69 |
else {
|
| 70 |
p2 = p +1;
|
| 71 |
/* allow to use ":style=" syntax */
|
| 72 |
if ((strstr(p2, "style=") != NULL) || (strstr(p2, "STYLE=") != NULL))
|
| 73 |
p2 += 6;
|
| 74 |
*p = '\0';
|
| 75 |
- strlcpy(font, xfont, sizeof(font));
|
| 76 |
- strlcpy(style, p2, sizeof(style));
|
| 77 |
+ snprintf(font, sizeof(font), "%s", xfont);
|
| 78 |
+ snprintf(style, sizeof(style), "%s", p2);
|
| 79 |
}
|
| 80 |
if (style[0]) {
|
| 81 |
xftfont = XftFontOpen(display, screen,
|
| 82 |
diff -up magicpoint-1.11b/contrib/xwintoppm/dsimple.c~ magicpoint-1.11b/contrib/xwintoppm/dsimple.c
|
| 83 |
--- magicpoint-1.11b/contrib/xwintoppm/dsimple.c~ 2008-03-30 22:13:20.000000000 +0200
|
| 84 |
+++ magicpoint-1.11b/contrib/xwintoppm/dsimple.c 2008-03-30 22:13:20.000000000 +0200
|
| 85 |
@@ -57,6 +57,7 @@ void blip();
|
| 86 |
Window Window_With_Name();
|
| 87 |
void Fatal_Error();
|
| 88 |
void outl(char *msg, ...);
|
| 89 |
+int usage(void);
|
| 90 |
|
| 91 |
/*
|
| 92 |
* Just_display: A group of routines designed to make the writting of simple
|
| 93 |
diff -up magicpoint-1.11b/contrib/xwintoppm/xwintoppm.c~ magicpoint-1.11b/contrib/xwintoppm/xwintoppm.c
|
| 94 |
--- magicpoint-1.11b/contrib/xwintoppm/xwintoppm.c~ 2008-03-30 22:11:46.000000000 +0200
|
| 95 |
+++ magicpoint-1.11b/contrib/xwintoppm/xwintoppm.c 2008-03-30 22:13:40.000000000 +0200
|
| 96 |
@@ -96,6 +96,7 @@ in this Software without prior written a
|
| 97 |
%*/
|
| 98 |
|
| 99 |
#include <stdio.h>
|
| 100 |
+#include <stdarg.h>
|
| 101 |
#include <errno.h>
|
| 102 |
#include <X11/Xos.h>
|
| 103 |
|
| 104 |
@@ -125,6 +126,12 @@ typedef unsigned long Pixel;
|
| 105 |
#include <X11/extensions/XKBbells.h>
|
| 106 |
#endif
|
| 107 |
|
| 108 |
+int usage(void);
|
| 109 |
+int Error(char *);
|
| 110 |
+void outl(char *msg, ...);
|
| 111 |
+int Image_Size(XImage *image);
|
| 112 |
+int Get_XColors(XWindowAttributes *win_info, XColor **colors);
|
| 113 |
+
|
| 114 |
/* Setable Options */
|
| 115 |
|
| 116 |
int format = ZPixmap;
|
| 117 |
diff -up magicpoint-1.11b/mgp.h~ magicpoint-1.11b/mgp.h
|
| 118 |
--- magicpoint-1.11b/mgp.h~ 2008-03-30 21:59:13.000000000 +0200
|
| 119 |
+++ magicpoint-1.11b/mgp.h 2008-03-30 21:59:13.000000000 +0200
|
| 120 |
@@ -799,6 +799,7 @@ extern XImage *tfc_image __P((struct tfo
|
| 121 |
|
| 122 |
/* unimap.c */
|
| 123 |
extern void latin_unicode_map_init();
|
| 124 |
+extern void unicode_map_init();
|
| 125 |
|
| 126 |
/* embed.c */
|
| 127 |
extern char *embed_fname __P((char *));
|
| 128 |
diff -up magicpoint-1.11b/mgp.c~ magicpoint-1.11b/mgp.c
|
| 129 |
--- magicpoint-1.11b/mgp.c~ 2008-03-30 21:45:20.000000000 +0200
|
| 130 |
+++ magicpoint-1.11b/mgp.c 2008-03-30 21:45:20.000000000 +0200
|
| 131 |
@@ -441,7 +441,7 @@ main(argc, argv)
|
| 132 |
}
|
| 133 |
|
| 134 |
init_win1(xgeometry);
|
| 135 |
- strlcpy(buf, mgp_fname, sizeof(buf));
|
| 136 |
+ snprintf(buf, sizeof(buf), "%s", mgp_fname);
|
| 137 |
if ((p = rindex(buf, '/'))) {
|
| 138 |
*p = '\0';
|
| 139 |
Paths[NumPaths++]= expandPath(buf);
|
| 140 |
diff -up magicpoint-1.11b/grammar.y~ magicpoint-1.11b/grammar.y
|
| 141 |
--- magicpoint-1.11b/grammar.y~ 2008-03-30 22:17:54.000000000 +0200
|
| 142 |
+++ magicpoint-1.11b/grammar.y 2008-03-30 22:17:54.000000000 +0200
|
| 143 |
@@ -74,6 +74,7 @@ int n_errors = 0;
|
| 144 |
struct ctrl *root;
|
| 145 |
char *yyfilename;
|
| 146 |
int yylineno;
|
| 147 |
+extern int yylex (void);
|
| 148 |
|
| 149 |
#ifdef HAVE_STDARG_H
|
| 150 |
/* GCC complains if we declare this function in traditional style */
|
Parent Directory
| 
Revision Log