1 |
williamh 11/02/23 23:20:29 |
2 |
|
3 |
Added: edbrowse-3.4.6-fix-off-by-one.patch |
4 |
edbrowse-3.4.6-fix-makefile.patch |
5 |
Log: |
6 |
This is the initial commit for edbrowse, a line editor, web browser and email client that uses the "ed" user interface. |
7 |
I would like to thank Chris Brannon <chris@××××××××××××.com> for the submission. |
8 |
This closes #350183. |
9 |
|
10 |
(Portage version: 2.2.0_alpha25/cvs/Linux i686) |
11 |
|
12 |
Revision Changes Path |
13 |
1.1 app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-off-by-one.patch |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-off-by-one.patch?rev=1.1&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-off-by-one.patch?rev=1.1&content-type=text/plain |
17 |
|
18 |
Index: edbrowse-3.4.6-fix-off-by-one.patch |
19 |
=================================================================== |
20 |
diff --git a/src/buffers.c b/src/buffers.c |
21 |
index fe0d50a..4a37d58 100644 |
22 |
--- a/src/buffers.c |
23 |
+++ b/src/buffers.c |
24 |
@@ -2590,7 +2590,7 @@ substituteText(const char *line) |
25 |
replaceLine[replaceLineLen] = '\n'; |
26 |
if(!linecount) { |
27 |
/* normal substitute */ |
28 |
- char newnum[LNWIDTH]; |
29 |
+ char newnum[LNWIDTH+1]; |
30 |
textLines[textLinesCount] = allocMem(replaceLineLen + 1); |
31 |
memcpy(textLines[textLinesCount], replaceLine, |
32 |
replaceLineLen + 1); |
33 |
|
34 |
|
35 |
|
36 |
1.1 app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-makefile.patch |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-makefile.patch?rev=1.1&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-makefile.patch?rev=1.1&content-type=text/plain |
40 |
|
41 |
Index: edbrowse-3.4.6-fix-makefile.patch |
42 |
=================================================================== |
43 |
diff -Naur edbrowse-3.4.6/src/makefile edbrowse-3.4.6-new/src/makefile |
44 |
--- edbrowse-3.4.6/src/makefile 2011-01-20 10:38:24.000000000 +0000 |
45 |
+++ edbrowse-3.4.6-new/src/makefile 2011-01-26 13:50:10.000000000 +0000 |
46 |
@@ -23,12 +23,15 @@ |
47 |
STRIP=-s |
48 |
endif |
49 |
|
50 |
-CFLAGS = -I/usr/local/js/src -I/usr/local/js/src/Linux_All_DBG.OBJ -DXP_UNIX -DX86_LINUX $(DEBUGFLAGS) |
51 |
+JSFLAGS = -I/usr/include/js -DXP_UNIX |
52 |
+ |
53 |
+%.o: %.c |
54 |
+ $(CC) $(CFLAGS) $(JSFLAGS) -c -o $@ $< |
55 |
|
56 |
# If the smjs library is already installed by your linux distribution, |
57 |
# e.g. Debian, use the following flags. |
58 |
# |
59 |
-#CFLAGS = -I/usr/include/js -DXP_UNIX -DX86_LINUX $(DEBUGFLAGS) |
60 |
+#CFLAGS = -I/usr/include/smjs -DXP_UNIX -DX86_LINUX $(DEBUGFLAGS) |
61 |
|
62 |
# Normal load flags |
63 |
LFLAGS = $(STRIP) |
64 |
@@ -59,11 +62,11 @@ |
65 |
$(EBOBJS) : eb.h eb.p messages.h tcp.h |
66 |
|
67 |
edbrowse: $(EBOBJS) tcp.o dbstubs.o |
68 |
- cc $(LFLAGS) -o edbrowse $(EBOBJS) tcp.o dbstubs.o $(LIBS) |
69 |
+ $(CC) $(LDFLAGS) -o edbrowse $(EBOBJS) tcp.o dbstubs.o $(LIBS) |
70 |
|
71 |
# You probably need to be root to do this. |
72 |
install: |
73 |
- install -Dm755 edbrowse $(bindir)/edbrowse |
74 |
+ install -Dm755 edbrowse $(DESTDIR)$(bindir)/edbrowse |
75 |
|
76 |
# If you had to build the javascript library yourself, |
77 |
# link it into /usr/lib. |
78 |
@@ -87,7 +90,7 @@ |
79 |
|
80 |
# odbc access |
81 |
edbrowseodbc: $(EBOBJS) tcp.o dbops.o dbodbc.o |
82 |
- cc $(LFLAGS) -o edbrowseodbc $(EBOBJS) tcp.o dbops.o dbodbc.o $(LIBS) -lodbc |
83 |
+ $(CC) $(LDFLAGS) -o edbrowseodbc $(EBOBJS) tcp.o dbops.o dbodbc.o $(LIBS) -lodbc |
84 |
|
85 |
# Build function prototypes. |
86 |
# mkproto is my program, not a general unix utility. |