Fix build on -CURRENT
PR: 34802 Submitted by: maintainer
This commit is contained in:
Patrick Li
parent
e660ce5be0
commit
eaf5dce45e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=54834
10 changed files with 148 additions and 12 deletions
|
|
@ -1,5 +1,5 @@
|
|||
--- b.c.orig Fri Jan 20 00:38:25 1995
|
||||
+++ b.c Sun Dec 3 09:58:21 2000
|
||||
--- b.c.orig Fri Jan 20 02:38:25 1995
|
||||
+++ b.c Sun Feb 10 14:39:03 2002
|
||||
@@ -21,6 +21,9 @@
|
||||
#include <pwd.h>
|
||||
#endif
|
||||
|
|
@ -76,9 +76,12 @@
|
|||
return b;
|
||||
}
|
||||
|
||||
@@ -1990,7 +2022,18 @@
|
||||
@@ -1988,9 +2020,20 @@
|
||||
|
||||
void ttsig(sig)
|
||||
{
|
||||
long tim=time(0);
|
||||
- long tim=time(0);
|
||||
+ time_t tim=time(0);
|
||||
B *b;
|
||||
- FILE *f=fopen("DEADJOE","a");
|
||||
+ FILE *f;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,14 @@
|
|||
--- rc.c.orig Fri Feb 1 16:50:23 2002
|
||||
+++ rc.c Fri Feb 1 16:50:43 2002
|
||||
--- rc.c.orig Fri Jan 20 02:53:42 1995
|
||||
+++ rc.c Sun Feb 10 14:28:42 2002
|
||||
@@ -29,7 +29,7 @@
|
||||
* is created.
|
||||
*/
|
||||
|
||||
-KMAP *getcontext(name)
|
||||
+KMAP *joegetcontext(name)
|
||||
char *name;
|
||||
{
|
||||
struct context *c;
|
||||
@@ -610,7 +610,8 @@
|
||||
FILE *fd; /* rc file */
|
||||
int line=0; /* Line number */
|
||||
|
|
@ -10,3 +19,21 @@
|
|||
#ifdef __MSDOS__
|
||||
fd=fopen(buf,"rt");
|
||||
#else
|
||||
@@ -739,7 +740,7 @@
|
||||
for(buf[x]=c;cwhite(buf[x]);++x);
|
||||
for(c=x;!cwhitef(buf[c]);++c);
|
||||
buf[c]=0;
|
||||
- if(c!=x) kcpy(context,getcontext(buf+x));
|
||||
+ if(c!=x) kcpy(context,joegetcontext(buf+x));
|
||||
else
|
||||
{
|
||||
err=1;
|
||||
@@ -788,7 +789,7 @@
|
||||
err=1;
|
||||
fprintf(stderr,"\n%s %d: No context selected for :delete",name,line);
|
||||
}
|
||||
- else context=getcontext(buf+1);
|
||||
+ else context=joegetcontext(buf+1);
|
||||
else
|
||||
{
|
||||
err=1;
|
||||
|
|
|
|||
11
editors/joe/files/patch-ah
Normal file
11
editors/joe/files/patch-ah
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- w.c.orig Sun Feb 10 14:28:10 2002
|
||||
+++ w.c Sun Feb 10 14:29:15 2002
|
||||
@@ -594,7 +594,7 @@
|
||||
else seth(original,original->h-height);
|
||||
|
||||
/* Create new keyboard handler for window */
|
||||
- if(watom->context) new->kbd=mkkbd(getcontext(watom->context));
|
||||
+ if(watom->context) new->kbd=mkkbd(joegetcontext(watom->context));
|
||||
else new->kbd=0;
|
||||
|
||||
/* Put window on the screen */
|
||||
11
editors/joe/files/patch-ai
Normal file
11
editors/joe/files/patch-ai
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- bw.c.orig Sun Feb 10 14:27:49 2002
|
||||
+++ bw.c Sun Feb 10 14:28:18 2002
|
||||
@@ -734,7 +734,7 @@
|
||||
if(window==window->main)
|
||||
{
|
||||
rmkbd(window->kbd);
|
||||
- window->kbd=mkkbd(getcontext(w->o.context));
|
||||
+ window->kbd=mkkbd(joegetcontext(w->o.context));
|
||||
}
|
||||
w->top->xcol=0; w->cursor->xcol=0;
|
||||
return w;
|
||||
16
editors/joe/files/patch-aj
Normal file
16
editors/joe/files/patch-aj
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
--- rc.h.orig Sun Feb 10 14:28:00 2002
|
||||
+++ rc.h Sun Feb 10 14:28:55 2002
|
||||
@@ -34,11 +34,11 @@
|
||||
extern OPTIONS pdefault;
|
||||
void setopt();
|
||||
|
||||
-/* KMAP *getcontext(char *name);
|
||||
+/* KMAP *joegetcontext(char *name);
|
||||
* Find and return the KMAP for a given context name. If none is found, an
|
||||
* empty kmap is created, bound to the context name, and returned.
|
||||
*/
|
||||
-KMAP *getcontext();
|
||||
+KMAP *joegetcontext();
|
||||
|
||||
/* int procrc(char *name); Process an rc file
|
||||
Returns 0 for success
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
--- b.c.orig Fri Jan 20 00:38:25 1995
|
||||
+++ b.c Sun Dec 3 09:58:21 2000
|
||||
--- b.c.orig Fri Jan 20 02:38:25 1995
|
||||
+++ b.c Sun Feb 10 14:39:03 2002
|
||||
@@ -21,6 +21,9 @@
|
||||
#include <pwd.h>
|
||||
#endif
|
||||
|
|
@ -76,9 +76,12 @@
|
|||
return b;
|
||||
}
|
||||
|
||||
@@ -1990,7 +2022,18 @@
|
||||
@@ -1988,9 +2020,20 @@
|
||||
|
||||
void ttsig(sig)
|
||||
{
|
||||
long tim=time(0);
|
||||
- long tim=time(0);
|
||||
+ time_t tim=time(0);
|
||||
B *b;
|
||||
- FILE *f=fopen("DEADJOE","a");
|
||||
+ FILE *f;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,14 @@
|
|||
--- rc.c.orig Fri Feb 1 16:50:23 2002
|
||||
+++ rc.c Fri Feb 1 16:50:43 2002
|
||||
--- rc.c.orig Fri Jan 20 02:53:42 1995
|
||||
+++ rc.c Sun Feb 10 14:28:42 2002
|
||||
@@ -29,7 +29,7 @@
|
||||
* is created.
|
||||
*/
|
||||
|
||||
-KMAP *getcontext(name)
|
||||
+KMAP *joegetcontext(name)
|
||||
char *name;
|
||||
{
|
||||
struct context *c;
|
||||
@@ -610,7 +610,8 @@
|
||||
FILE *fd; /* rc file */
|
||||
int line=0; /* Line number */
|
||||
|
|
@ -10,3 +19,21 @@
|
|||
#ifdef __MSDOS__
|
||||
fd=fopen(buf,"rt");
|
||||
#else
|
||||
@@ -739,7 +740,7 @@
|
||||
for(buf[x]=c;cwhite(buf[x]);++x);
|
||||
for(c=x;!cwhitef(buf[c]);++c);
|
||||
buf[c]=0;
|
||||
- if(c!=x) kcpy(context,getcontext(buf+x));
|
||||
+ if(c!=x) kcpy(context,joegetcontext(buf+x));
|
||||
else
|
||||
{
|
||||
err=1;
|
||||
@@ -788,7 +789,7 @@
|
||||
err=1;
|
||||
fprintf(stderr,"\n%s %d: No context selected for :delete",name,line);
|
||||
}
|
||||
- else context=getcontext(buf+1);
|
||||
+ else context=joegetcontext(buf+1);
|
||||
else
|
||||
{
|
||||
err=1;
|
||||
|
|
|
|||
11
editors/joe2/files/patch-ah
Normal file
11
editors/joe2/files/patch-ah
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- w.c.orig Sun Feb 10 14:28:10 2002
|
||||
+++ w.c Sun Feb 10 14:29:15 2002
|
||||
@@ -594,7 +594,7 @@
|
||||
else seth(original,original->h-height);
|
||||
|
||||
/* Create new keyboard handler for window */
|
||||
- if(watom->context) new->kbd=mkkbd(getcontext(watom->context));
|
||||
+ if(watom->context) new->kbd=mkkbd(joegetcontext(watom->context));
|
||||
else new->kbd=0;
|
||||
|
||||
/* Put window on the screen */
|
||||
11
editors/joe2/files/patch-ai
Normal file
11
editors/joe2/files/patch-ai
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- bw.c.orig Sun Feb 10 14:27:49 2002
|
||||
+++ bw.c Sun Feb 10 14:28:18 2002
|
||||
@@ -734,7 +734,7 @@
|
||||
if(window==window->main)
|
||||
{
|
||||
rmkbd(window->kbd);
|
||||
- window->kbd=mkkbd(getcontext(w->o.context));
|
||||
+ window->kbd=mkkbd(joegetcontext(w->o.context));
|
||||
}
|
||||
w->top->xcol=0; w->cursor->xcol=0;
|
||||
return w;
|
||||
16
editors/joe2/files/patch-aj
Normal file
16
editors/joe2/files/patch-aj
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
--- rc.h.orig Sun Feb 10 14:28:00 2002
|
||||
+++ rc.h Sun Feb 10 14:28:55 2002
|
||||
@@ -34,11 +34,11 @@
|
||||
extern OPTIONS pdefault;
|
||||
void setopt();
|
||||
|
||||
-/* KMAP *getcontext(char *name);
|
||||
+/* KMAP *joegetcontext(char *name);
|
||||
* Find and return the KMAP for a given context name. If none is found, an
|
||||
* empty kmap is created, bound to the context name, and returned.
|
||||
*/
|
||||
-KMAP *getcontext();
|
||||
+KMAP *joegetcontext();
|
||||
|
||||
/* int procrc(char *name); Process an rc file
|
||||
Returns 0 for success
|
||||
Loading…
Reference in a new issue