API tools faq
paste
uaa

jvim2.0r+onew2.2.10-canna/onew2.2.10 diff

uaa
Nov 18th, 2023
433
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.23 KB | None | 0 0
raw download clone embed print report
  1. Index: patches/patch-interface_oui_c
  2. ===================================================================
  3. RCS file: /cvs/ports/japanese/onew/patches/patch-interface_oui_c,v
  4. diff -u -p -r1.2 patch-interface_oui_c
  5. --- patches/patch-interface_oui_c 11 Mar 2022 19:24:45 -0000 1.2
  6. +++ patches/patch-interface_oui_c 18 Nov 2023 08:21:28 -0000
  7. @@ -1,15 +1,39 @@
  8. -Index: interface/oui.c
  9. ---- interface/oui.c.orig
  10. -+++ interface/oui.c
  11. -@@ -8,9 +8,10 @@ char *getenv();
  12. +--- interface/oui.c.orig.port Thu Jun 22 11:30:49 1995
  13. ++++ interface/oui.c Sat Nov 18 15:33:56 2023
  14. +@@ -3,15 +3,16 @@
  15. + ************************************************************************/
  16. +
  17. + #include <stdio.h>
  18. ++#include <stdarg.h>
  19. + char *getenv();
  20. +
  21. static FILE *ouiFp;
  22. static int uin;
  23. static int uilev;
  24. -+void
  25. - ouiTrace(prim,fmt,a,b,c,d,e,f,g)
  26. - char *fmt;
  27. +-ouiTrace(prim,fmt,a,b,c,d,e,f,g)
  28. +- char *fmt;
  29. - FILE *prim;
  30. -+ char *prim;
  31. ++void
  32. ++ouiTrace(char *prim,char *fmt,...)
  33. { char *logf;
  34. ++ va_list ap;
  35.  
  36. if( ouiFp == NULL ){
  37. + if( logf = getenv("ONEW_UIFLOG") )
  38. +@@ -23,10 +24,14 @@ ouiTrace(prim,fmt,a,b,c,d,e,f,g)
  39. + return;
  40. + fprintf(ouiFp,"%4d ",++uin);
  41. + fprintf(ouiFp,"%-16s ",prim);
  42. +- if(fmt) fprintf(ouiFp,fmt,a,b,c,d,e,f,g);
  43. ++ if(fmt){
  44. ++ va_start(ap,fmt);
  45. ++ vfprintf(ouiFp,fmt,ap);
  46. ++ va_end(ap);
  47. ++ }
  48. + fprintf(ouiFp,"\n");
  49. + }
  50. +-Onew_ouiTrace(prim,fmt,a,b,c,d,e,f,g){ ouiTrace(prim,fmt,a,b,c,d,e,f,g); }
  51. ++#define Onew_ouiTrace(prim,fmt,...) ouiTrace(prim,fmt,__VA_ARGS__)
  52. +
  53. + ouiGETCHAR()
  54. + { int ch;
  55. Index: patches/patch-interface_ouimessage_c
  56. ===================================================================
  57. RCS file: /cvs/ports/japanese/onew/patches/patch-interface_ouimessage_c,v
  58. diff -u -p -r1.3 patch-interface_ouimessage_c
  59. --- patches/patch-interface_ouimessage_c 11 Mar 2022 19:24:45 -0000 1.3
  60. +++ patches/patch-interface_ouimessage_c 18 Nov 2023 08:21:28 -0000
  61. @@ -1,6 +1,5 @@
  62. -Index: interface/ouimessage.c
  63. ---- interface/ouimessage.c.orig
  64. -+++ interface/ouimessage.c
  65. +--- interface/ouimessage.c.orig.port Sat Jun 4 19:37:36 1994
  66. ++++ interface/ouimessage.c Sat Nov 18 15:42:41 2023
  67. @@ -1,6 +1,8 @@
  68. /*
  69. * MESSAGE OUTPUT TO APPLICATION USER INTERFACE
  70. @@ -18,3 +17,12 @@ Index: interface/ouimessage.c
  71. Onew_putmode(mode,help)
  72. char *mode,*help;
  73. { int modeflags,xmodef;
  74. +@@ -62,7 +65,7 @@ Onew_putmsg_retain(so,fmt,a,b,c,d,e,f,g)
  75. + }
  76. +
  77. + Onew_putmodef(mode,fmt,a,b,c,d,e,f,g)
  78. +- char *fmt,*a,*b,*c,*d,*e,*f,*g;
  79. ++ char *mode,*fmt,*a,*b,*c,*d,*e,*f,*g;
  80. + { char help[1024];
  81. +
  82. + sprintf(help,fmt,a,b,c,d,e,f,g);
  83. Index: patches/patch-onew_c
  84. ===================================================================
  85. RCS file: /cvs/ports/japanese/onew/patches/patch-onew_c,v
  86. diff -u -p -r1.4 patch-onew_c
  87. --- patches/patch-onew_c 11 Mar 2022 19:24:45 -0000 1.4
  88. +++ patches/patch-onew_c 18 Nov 2023 08:21:28 -0000
  89. @@ -1,17 +1,17 @@
  90. -Index: onew.c
  91. ---- onew.c.orig
  92. -+++ onew.c
  93. -@@ -26,7 +26,8 @@ History:
  94. +--- onew.c.orig.port Thu Jun 29 16:47:04 1995
  95. ++++ onew.c Sat Nov 18 17:15:13 2023
  96. +@@ -26,7 +26,9 @@ History:
  97. #include <signal.h>
  98. #include <ctype.h>
  99. #include <stdio.h>
  100. -extern char *getenv();
  101. +#include <stdlib.h>
  102. +#include <string.h>
  103. ++#include <stdarg.h>
  104. #include "onew.h"
  105.  
  106. int on_via;
  107. -@@ -35,7 +36,7 @@ int onew_client_version = 1;
  108. +@@ -35,7 +37,7 @@ int onew_client_version = 1;
  109. #define VER1 (onew_client_version == 1)
  110. #define VER2 (onew_client_version == 2)
  111.  
  112. @@ -20,7 +20,54 @@ Index: onew.c
  113.  
  114. static Linebuff onew_buf;
  115. static Mssgbuff onew_out;
  116. -@@ -492,6 +493,7 @@ ONEW_BEEP(nsec){
  117. +@@ -49,7 +51,7 @@ static int is_tty;
  118. + static int is_sock;
  119. + static FILE *logfp;
  120. +
  121. +-static put_client();
  122. ++static put_client(char *command,char *form,...);
  123. +
  124. +
  125. + /*######################################################################*
  126. +@@ -217,12 +219,12 @@ ONEW_GETCHAR()
  127. + return ch;
  128. + }
  129. +
  130. +-static put_client(command,form,a,b,c,d,e,f)
  131. +- char *command,*form;
  132. ++static put_client(char *command,char *form,...)
  133. + { Linebuff out,tmp;
  134. + char *op;
  135. + int ci,ch1,ch2;
  136. + static int nmsg = 0;
  137. ++ va_list ap;
  138. +
  139. + if( nmsg++ == 1 )
  140. + put_client(S_MESSAGE,":[ROMKAN & KANAKAN FILTEDR] %s",
  141. +@@ -232,7 +234,9 @@ static put_client(command,form,a,b,c,d,e,f)
  142. + sprintf(op,"%c%s",0xFF,command);
  143. + op += strlen(op);
  144. +
  145. +- sprintf(op,form,a,b,c,d,e,f);
  146. ++ va_start(ap,form);
  147. ++ vsprintf(op,form,ap);
  148. ++ va_end(ap);
  149. + if( strcmp(command,S_INPUT) == 0 )
  150. + if( VER1 )
  151. + /* AND 1bytes character is INHIBITED */
  152. +@@ -245,7 +249,10 @@ static put_client(command,form,a,b,c,d,e,f)
  153. + sprintf(op,"%c",0xFF);
  154. +
  155. + if( ONEW_DEBUG ){
  156. +- fprintf(stderr,"%s: %-10s %8x %8x ",command,form,a,b,c,d,e,f);
  157. ++ fprintf(stderr,"%s: %-10s ",command,form);
  158. ++ va_start(ap,form);
  159. ++ vfprintf(stderr,"%8x %8x ",ap);
  160. ++ va_end(ap);
  161. + for( ci = 0; ch1 = out[ci]; ci++ ){
  162. + ch2 = out[ci+1];
  163. + if( ch1 & 0x80 && ch2 & 0x80 ){
  164. +@@ -492,6 +499,7 @@ ONEW_BEEP(nsec){
  165. fflush(stdout);
  166. }
  167. static int prev_modef;
  168. Index: patches/patch-onewclient_c
  169. ===================================================================
  170. RCS file: /cvs/ports/japanese/onew/patches/patch-onewclient_c,v
  171. diff -u -p -r1.3 patch-onewclient_c
  172. --- patches/patch-onewclient_c 11 Mar 2022 19:24:45 -0000 1.3
  173. +++ patches/patch-onewclient_c 18 Nov 2023 08:21:28 -0000
  174. @@ -1,18 +1,25 @@
  175. -Index: onewclient.c
  176. ---- onewclient.c.orig
  177. -+++ onewclient.c
  178. -@@ -21,6 +21,8 @@ History:
  179. +--- onewclient.c.orig.port Sat Jul 1 18:59:23 1995
  180. ++++ onewclient.c Sat Nov 18 16:20:28 2023
  181. +@@ -21,6 +21,9 @@ History:
  182. ///////////////////////////////////////////////////////////////////////*/
  183.  
  184. #include <signal.h>
  185. +#include <unistd.h>
  186. +#include <stdio.h>
  187. ++#include <stdarg.h>
  188. #include "onew.h"
  189.  
  190. static int onew_DBG = 1;
  191. -@@ -43,7 +45,7 @@ static dbg_printf(form,a,b,c,d,e,f,g){
  192. - Onew_message(form,a,b,c,d,e,f,g);
  193. +@@ -38,12 +41,10 @@ onew_pipe(pipe)
  194. + return onew_pid;
  195. }
  196. +
  197. +-static dbg_printf(form,a,b,c,d,e,f,g){
  198. +- if( onew_DBG )
  199. +- Onew_message(form,a,b,c,d,e,f,g);
  200. +-}
  201. ++#define dbg_printf(...) \
  202. ++ { if( onew_DBG ) Onew_message(__VA_ARGS__); }
  203.  
  204. -static open_onew(){
  205. +static void open_onew(){
  206. Index: patches/patch-onewlib_c
  207. ===================================================================
  208. RCS file: /cvs/ports/japanese/onew/patches/patch-onewlib_c,v
  209. diff -u -p -r1.2 patch-onewlib_c
  210. --- patches/patch-onewlib_c 11 Mar 2022 19:24:45 -0000 1.2
  211. +++ patches/patch-onewlib_c 18 Nov 2023 08:21:28 -0000
  212. @@ -1,5 +1,5 @@
  213. ---- onewlib.c.orig Sun Jul 2 09:55:41 1995
  214. -+++ onewlib.c Wed May 19 15:54:13 2010
  215. +--- onewlib.c.orig.port Sun Jul 2 16:55:41 1995
  216. ++++ onewlib.c Sat Nov 18 15:48:59 2023
  217. @@ -19,6 +19,7 @@
  218. #define STATIC static
  219.  
  220. @@ -64,3 +64,22 @@
  221.  
  222. if( !Onew_RK_init() ){
  223. kc = OnewGetchar();
  224. +@@ -551,7 +553,7 @@ char *romkan_help(){
  225. + Onew_kanakan(com,str,start,leng)
  226. + char *str;
  227. + {
  228. +- return Onew_kana_to_kanji(com,str,start,leng);
  229. ++ return Onew_kana_to_kanji(com,str);
  230. + }
  231. +
  232. + char ONEW_CurrentYomi[256];
  233. +@@ -740,7 +742,8 @@ kana_init(){
  234. + return Onew_RK_init();
  235. + }
  236. + kana_to_kanji(str,start,leng)
  237. ++ char *str;
  238. + {
  239. +- return Onew_kana_to_kanji(0,str,start,leng);
  240. ++ return Onew_kana_to_kanji(0,str);
  241. + }
  242. +
  243.  
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!