home *** CD-ROM | disk | FTP | other *** search
/ OS/2 Shareware BBS: 35 Internet / 35-Internet.zip / trn36-2.zip / patches.trn < prev    next >
Text File  |  1996-09-11  |  16KB  |  389 lines
  1. diff -cb orig/addng.c ./addng.c
  2. *** orig/addng.c    Wed Sep 04 08:58:04 1996
  3. --- ./addng.c    Wed Sep 11 08:48:06 1996
  4. ***************
  5. *** 164,174 ****
  6.           fprintf(stderr, "Please send email to haen@veces.stgt.sub.org!!\n");
  7.       }
  8.       sprintf(anothername,"%s/rnew.%$",uupc_rc_settings.temp_name);
  9. !     tmpname = filexp(tmpname);
  10. !     free(tmpname);
  11.   /*end of patch*/
  12.   
  13. -     tmpname = filexp(RNEWNAME);
  14.       tmpfp = fos2open(tmpname,"w+");
  15.       if (tmpfp == Nullfp) {
  16.       printf(cantcreate,tmpname) FLUSH;
  17. --- 164,173 ----
  18.           fprintf(stderr, "Please send email to haen@veces.stgt.sub.org!!\n");
  19.       }
  20.       sprintf(anothername,"%s/rnew.%$",uupc_rc_settings.temp_name);
  21. !     tmpname = filexp(anothername);
  22. !     free(anothername);
  23.   /*end of patch*/
  24.   
  25.       tmpfp = fos2open(tmpname,"w+");
  26.       if (tmpfp == Nullfp) {
  27.       printf(cantcreate,tmpname) FLUSH;
  28. diff -cb orig/common.h ./common.h
  29. *** orig/common.h    Tue Jan 24 17:19:10 1995
  30. --- ./common.h    Sat Feb 18 23:20:24 1995
  31. ***************
  32. *** 661,673 ****
  33.   #ifndef NEWSHEADER        /* % */
  34.   #  ifdef USE_NNTP
  35.   #   ifdef CONDSUB
  36. ! #    define NEWSHEADER "From: %L@%H (%N)\n%(%[followup-to]=^$?:X-ORIGINAL-NEWSGROUPS: %n\n)Newsgroups: %(%F=^$?%C:%F)\nSubject: %(%S=^$?%\"\n\nSubject: \":Re: %S)\nSummary: \n%(%R=^$?:References: %R\n)Sender: \nFollowup-To: \n%(%{REPLYTO}=^$?:Reply-To: %{REPLYTO}\n)Distribution: %(%i=^$?%\"Distribution: \":%D)\nOrganization: %o\nX-Newsreader: TRN 1.97 w/NNTP (beta) for OS/2\nKeywords: %[keywords]\nCc: %(%F=poster?%t:%(%F!=@?:%F))\n\n"
  37.   #   else
  38.   #       define NEWSHEADER "Newsgroups: %F\nSubject: Re: %S\nSummary: \nExpires: \nReferences: %R\nSender: \nFollowup-To: \nDistribution: %D\nOrganization: %o\nX-Newsreader: TRN 1.97 w/NNTP (beta) for OS/2\nKeywords: %[keywords]\n\n"
  39.   #   endif
  40.   #  else
  41.   #   ifdef CONDSUB
  42. ! #    define NEWSHEADER "From: %L@%H (%N)\n%(%[followup-to]=^$?:X-ORIGINAL-NEWSGROUPS: %n\n)Newsgroups: %(%F=^$?%C:%F)\nSubject: %(%S=^$?%\"\n\nSubject: \":Re: %S)\nSummary: \n%(%R=^$?:References: %R\n)Sender: \nFollowup-To: \n%(%{REPLYTO}=^$?:Reply-To: %{REPLYTO}\n)Distribution: %(%i=^$?%\"Distribution: \":%D)\nOrganization: %o\nX-Newsreader: TRN 1.97 w/UUPC (beta) for OS/2\nKeywords: %[keywords]\nCc: %(%F=poster?%t:%(%F!=@?:%F))\n\n"
  43.   #   else
  44.   #       define NEWSHEADER "Newsgroups: %F\nSubject: Re: %S\nSummary: \nExpires: \nReferences: %R\nSender: \nFollowup-To: \nDistribution: %D\nOrganization: %o\nX-Newsreader: TRN 1.97 w/UUPC (beta) for OS/2\nKeywords: %[keywords]\n\n"
  45.   #   endif
  46. --- 661,673 ----
  47.   #ifndef NEWSHEADER        /* % */
  48.   #  ifdef USE_NNTP
  49.   #   ifdef CONDSUB
  50. ! #    define NEWSHEADER "From: %L@%H (%N)\n%(%[followup-to]=^$?:X-Original-Newsgroups: %n\n)Newsgroups: %(%F=^$?%C:%F)\nSubject: %(%S=^$?%\"\n\nSubject: \":Re: %S)\nSummary: \n%(%R=^$?:References: %R\n)Sender: \nFollowup-To: \n%(%{REPLYTO}=^$?:Reply-To: %{REPLYTO}\n)Distribution: %(%i=^$?%\"Distribution: \":%D)\nOrganization: %o\nX-Newsreader: TRN 1.97 w/NNTP (beta) for OS/2\nKeywords: %[keywords]\nCc: %(%F=poster?%t:%(%F!=@?:%F))\n\n"
  51.   #   else
  52.   #       define NEWSHEADER "Newsgroups: %F\nSubject: Re: %S\nSummary: \nExpires: \nReferences: %R\nSender: \nFollowup-To: \nDistribution: %D\nOrganization: %o\nX-Newsreader: TRN 1.97 w/NNTP (beta) for OS/2\nKeywords: %[keywords]\n\n"
  53.   #   endif
  54.   #  else
  55.   #   ifdef CONDSUB
  56. ! #    define NEWSHEADER "From: %L@%H (%N)\n%(%[followup-to]=^$?:X-Original-Newsgroups: %n\n)Newsgroups: %(%F=^$?%C:%F)\nSubject: %(%S=^$?%\"\n\nSubject: \":Re: %S)\nSummary: \n%(%R=^$?:References: %R\n)Sender: \nFollowup-To: \n%(%{REPLYTO}=^$?:Reply-To: %{REPLYTO}\n)Distribution: %(%i=^$?%\"Distribution: \":%D)\nOrganization: %o\nX-Newsreader: TRN 1.97 w/UUPC (beta) for OS/2\nKeywords: %[keywords]\nCc: %(%F=poster?%t:%(%F!=@?:%F))\n\n"
  57.   #   else
  58.   #       define NEWSHEADER "Newsgroups: %F\nSubject: Re: %S\nSummary: \nExpires: \nReferences: %R\nSender: \nFollowup-To: \nDistribution: %D\nOrganization: %o\nX-Newsreader: TRN 1.97 w/UUPC (beta) for OS/2\nKeywords: %[keywords]\n\n"
  59.   #   endif
  60. diff -cb orig/config.h ./config.h
  61. *** orig/config.h    Sat Jan 28 22:09:18 1995
  62. --- ./config.h    Sat Feb 18 23:27:08 1995
  63. ***************
  64. *** 437,443 ****
  65.    *    This symbol contains the posting host's name or a file from which
  66.    *    to read its name.
  67.    */
  68. ! #define PHOSTNAME uupc_rc_settings.site        /**/
  69.   
  70.   /* PRIVLIB:
  71.    *    This symbol contains the name of the private library for this package.
  72. --- 437,443 ----
  73.    *    This symbol contains the posting host's name or a file from which
  74.    *    to read its name.
  75.    */
  76. ! #define PHOSTNAME uupc_rc_settings.domain    /**/
  77.   
  78.   /* PRIVLIB:
  79.    *    This symbol contains the name of the private library for this package.
  80. diff -cb orig/Makefile ./Makefile
  81. *** orig/Makefile    Sat Feb 18 23:37:10 1995
  82. --- ./Makefile    Sat Feb 18 23:09:40 1995
  83. ***************
  84. *** 18,30 ****
  85.   #    -DNO_LISTGROUP               avoids attempting to use LISTGROUP
  86.   #    -DREPLYTO_POSTER_CHECKING    makes -p also check Reply-To (slow)
  87.   
  88. ! CC = gcc
  89.   TOUCH = touch
  90.   
  91.   #for NNTP, -O will cause a trap so don't use it if you don't wannadebug it
  92. ! CFLAGS = -DDEBUG -DCOMPILING_TRN -DUSE_NNTP
  93.   #for UUPC
  94. ! #CFLAGS = -O -DDEBUG -DCOMPILING_TRN
  95.   
  96.   LDFLAGS = -Zcrtdll -Zstack 512 -s
  97.   
  98. --- 18,30 ----
  99.   #    -DNO_LISTGROUP               avoids attempting to use LISTGROUP
  100.   #    -DREPLYTO_POSTER_CHECKING    makes -p also check Reply-To (slow)
  101.   
  102. ! CC = gcc -Zomf
  103.   TOUCH = touch
  104.   
  105.   #for NNTP, -O will cause a trap so don't use it if you don't wannadebug it
  106. ! #CFLAGS = -DDEBUG -DCOMPILING_TRN -DUSE_NNTP
  107.   #for UUPC
  108. ! CFLAGS = -O -DDEBUG -DCOMPILING_TRN
  109.   
  110.   LDFLAGS = -Zcrtdll -Zstack 512 -s
  111.   
  112. ***************
  113. *** 34,54 ****
  114.   strftimeo =
  115.   
  116.   #for NNTP
  117. ! nntpsrc = nntp.c nntpinit.c nntplist.c nntpclient.c
  118. ! nntpobj = nntp.o nntpinit.o nntpclient.o
  119.   #for UUPC
  120. ! #nntpsrc =
  121. ! #nntpobj =
  122.   
  123.   #for NNTP
  124. ! libs = -lm -lsocket
  125.   #for UUPC
  126. ! #libs = -lm
  127.   
  128.   #for NNTP
  129. ! public = trn.exe trn-artchk.exe nntplist.exe
  130.   #for UUPC
  131. ! #public = trn.exe trn-artchk.exe
  132.   
  133.   h1 = addng.h art.h artio.h artsrch.h autosub.h backpage.h bits.h cache.h 
  134.   h2 = charsubst.h common.h decode.h final.h hash.h head.h help.h init.h
  135. --- 34,54 ----
  136.   strftimeo =
  137.   
  138.   #for NNTP
  139. ! #nntpsrc = nntp.c nntpinit.c nntplist.c nntpclient.c
  140. ! #nntpobj = nntp.o nntpinit.o nntpclient.o
  141.   #for UUPC
  142. ! nntpsrc =
  143. ! nntpobj =
  144.   
  145.   #for NNTP
  146. ! #libs = -lm -lsocket
  147.   #for UUPC
  148. ! libs = -lm
  149.   
  150.   #for NNTP
  151. ! #public = trn.exe trn-artchk.exe nntplist.exe
  152.   #for UUPC
  153. ! public = trn.exe trn-artchk.exe
  154.   
  155.   h1 = addng.h art.h artio.h artsrch.h autosub.h backpage.h bits.h cache.h 
  156.   h2 = charsubst.h common.h decode.h final.h hash.h head.h help.h init.h
  157. ***************
  158. *** 80,86 ****
  159.   obj = $(obj1) $(obj2) $(obj3) $(obj4) $(obj5) $(obj6) $(obj7)
  160.   
  161.   .c.o:
  162. !     $(CC) -c $(CFLAGS) $<
  163.   
  164.   all: $(public) $(util)
  165.       $(TOUCH) all
  166. --- 80,86 ----
  167.   obj = $(obj1) $(obj2) $(obj3) $(obj4) $(obj5) $(obj6) $(obj7)
  168.   
  169.   .c.o:
  170. !     $(CC) -c $(CFLAGS) -o $@ $<
  171.   
  172.   all: $(public) $(util)
  173.       $(TOUCH) all
  174. ***************
  175. *** 120,126 ****
  176.   # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE
  177.   acttimes.o:    os2patch.h ../common/conf.h 
  178.   addng.o:    extern.h common.h trn.h ngdata.h last.h util.h intrp.h only.h rcstuff.h nntp.h final.h intern.h addng.h 
  179. -     $(CC) -c $(CFLAGS) -o $@ addng.c
  180.   art.o:    extern.h common.h trn.h ngstuff.h ngdata.h cache.h bits.h head.h help.h search.h artio.h ng.h final.h artstate.h rcstuff.h term.h sw.h util.h util2.h nntp.h backpage.h intrp.h rthread.h rt-select.h rt-util.h rt-wumpus.h charsubst.h intern.h art.h 
  181.   artio.o:    extern.h common.h cache.h rthread.h head.h nntp.h art.h bits.h final.h ngdata.h intern.h artio.h 
  182.   artsrch.o:    extern.h common.h search.h term.h util.h intrp.h cache.h bits.h kfile.h head.h final.h nntp.h ng.h ngdata.h ngstuff.h artio.h rthread.h rt-select.h intern.h artsrch.h 
  183. --- 120,125 ----
  184. diff -cb orig/nntpinit.c ./nntpinit.c
  185. *** orig/nntpinit.c    Mon Sep 11 23:15:44 1995
  186. --- ./nntpinit.c    Wed Sep 11 20:02:30 1996
  187. ***************
  188. *** 44,50 ****
  189.   #include <netdnet/dnetdb.h>
  190.   #endif /* DECNET */
  191.   
  192. ! unsigned long inet_addr _((char *x));
  193.   int get_tcp_socket _((char *machine));
  194.   
  195.   int
  196. --- 44,50 ----
  197.   #include <netdnet/dnetdb.h>
  198.   #endif /* DECNET */
  199.   
  200. ! /* unsigned long inet_addr _((char *x)); */
  201.   int get_tcp_socket _((char *machine));
  202.   
  203.   int
  204. diff -cb orig/os2trn.c ./os2trn.c
  205. *** orig/os2trn.c    Sun Jan 08 12:29:08 1995
  206. --- ./os2trn.c    Sat Feb 18 23:13:28 1995
  207. ***************
  208. *** 229,235 ****
  209.                   if (includesig) {
  210.                      printf("\nIncluding Signature...\n");
  211.                      fflush(stdout);
  212. !                    fprintf(header_fp,"\n\n--\n");
  213.                      while(fgets(tmpbuffer,255,signature_fp)) {
  214.                          fprintf(header_fp,"%s",tmpbuffer); }
  215.                   }
  216. --- 229,235 ----
  217.                   if (includesig) {
  218.                      printf("\nIncluding Signature...\n");
  219.                      fflush(stdout);
  220. !                    /* fprintf(header_fp,"\n\n--\n"); */
  221.                      while(fgets(tmpbuffer,255,signature_fp)) {
  222.                          fprintf(header_fp,"%s",tmpbuffer); }
  223.                   }
  224. ***************
  225. *** 247,253 ****
  226.                   printf("\nIncluding Signature...\n");
  227.                   fflush(stdout);
  228.                   fseek(header_fp,0l,SEEK_END);
  229. !                 fprintf(header_fp,"\n\n--\n");
  230.                   while(fgets(tmpbuffer,255,signature_fp))
  231.                       fprintf(header_fp,"%s",tmpbuffer);
  232.                   fclose(header_fp);
  233. --- 247,253 ----
  234.                   printf("\nIncluding Signature...\n");
  235.                   fflush(stdout);
  236.                   fseek(header_fp,0l,SEEK_END);
  237. !                 /* fprintf(header_fp,"\n\n--\n"); */
  238.                   while(fgets(tmpbuffer,255,signature_fp))
  239.                       fprintf(header_fp,"%s",tmpbuffer);
  240.                   fclose(header_fp);
  241. ***************
  242. *** 255,261 ****
  243.               fclose(signature_fp);
  244.           }
  245.           sprintf(tmpbuffer, uupc_rc_settings.editor, headname);
  246. !         printf("Invoking %s\n",tmpbuffer);
  247.           fflush(stdout);
  248.           termlib_reset();
  249.           system(tmpbuffer);
  250. --- 255,261 ----
  251.               fclose(signature_fp);
  252.           }
  253.           sprintf(tmpbuffer, uupc_rc_settings.editor, headname);
  254. !         /* printf("Invoking %s\n",tmpbuffer); */
  255.           fflush(stdout);
  256.           termlib_reset();
  257.           system(tmpbuffer);
  258. ***************
  259. *** 307,319 ****
  260.                                   headname);
  261.           }
  262.                   change_sl2bsl(tmpbuffer);
  263. !                 printf("\nInvoking %s\n",tmpbuffer);
  264.                   fflush(stdout);
  265.                   system(tmpbuffer);
  266.                   if (strlen(uupc_rc_settings.mailsent) > 0) {
  267.                       sprintf(tmpbuffer,"%s/%s",uupc_rc_settings.home,
  268.                                                 uupc_rc_settings.mailsent);
  269. !                     printf("\nSaving mail to %s\n",tmpbuffer);
  270.                       fflush(stdout);
  271.                       if (article_saver(TRUE,headname,tmpbuffer))
  272.                           printf("\nCannot save letter to %s\n",tmpbuffer);
  273. --- 307,319 ----
  274.                                   headname);
  275.           }
  276.                   change_sl2bsl(tmpbuffer);
  277. !                 /* printf("\nInvoking %s\n",tmpbuffer); */
  278.                   fflush(stdout);
  279.                   system(tmpbuffer);
  280.                   if (strlen(uupc_rc_settings.mailsent) > 0) {
  281.                       sprintf(tmpbuffer,"%s/%s",uupc_rc_settings.home,
  282.                                                 uupc_rc_settings.mailsent);
  283. !                     /* printf("\nSaving mail to %s\n",tmpbuffer); */
  284.                       fflush(stdout);
  285.                       if (article_saver(TRUE,headname,tmpbuffer))
  286.                           printf("\nCannot save letter to %s\n",tmpbuffer);
  287. ***************
  288. *** 331,337 ****
  289.                   break;
  290.               case 'e': case 'E':
  291.                   sprintf(tmpbuffer, uupc_rc_settings.editor, headname);
  292. !                 printf("\nInvoking %s\n",tmpbuffer);
  293.                   termlib_reset();
  294.                   fflush(stdout);
  295.                   system(tmpbuffer);
  296. --- 331,337 ----
  297.                   break;
  298.               case 'e': case 'E':
  299.                   sprintf(tmpbuffer, uupc_rc_settings.editor, headname);
  300. !                 /* printf("\nInvoking %s\n",tmpbuffer); */
  301.                   termlib_reset();
  302.                   fflush(stdout);
  303.                   system(tmpbuffer);
  304. ***************
  305. *** 429,435 ****
  306.                   if (includesig) {
  307.                      printf("\nIncluding Signature...\n");
  308.                      fflush(stdout);
  309. !                    fprintf(header_fp,"\n\n--\n");
  310.                      while(fgets(tmpbuffer,255,signature_fp)) {
  311.                          fprintf(header_fp,"%s",tmpbuffer); }
  312.                   }
  313. --- 429,435 ----
  314.                   if (includesig) {
  315.                      printf("\nIncluding Signature...\n");
  316.                      fflush(stdout);
  317. !                    /* fprintf(header_fp,"\n\n--\n"); */
  318.                      while(fgets(tmpbuffer,255,signature_fp)) {
  319.                          fprintf(header_fp,"%s",tmpbuffer); }
  320.                   }
  321. ***************
  322. *** 447,453 ****
  323.                   printf("\nIncluding Signature...\n");
  324.                   fflush(stdout);
  325.                   fseek(header_fp,0l,SEEK_END);
  326. !                 fprintf(header_fp,"\n\n--\n");
  327.                   while(fgets(tmpbuffer,255,signature_fp))
  328.                       fprintf(header_fp,"%s",tmpbuffer);
  329.                   fclose(header_fp);
  330. --- 447,453 ----
  331.                   printf("\nIncluding Signature...\n");
  332.                   fflush(stdout);
  333.                   fseek(header_fp,0l,SEEK_END);
  334. !                 /* fprintf(header_fp,"\n\n--\n"); */
  335.                   while(fgets(tmpbuffer,255,signature_fp))
  336.                       fprintf(header_fp,"%s",tmpbuffer);
  337.                   fclose(header_fp);
  338. ***************
  339. *** 457,463 ****
  340.       /* change / to \ */
  341.       change_sl2bsl(headname);
  342.           sprintf(tmpbuffer, uupc_rc_settings.editor, headname);
  343. !         printf("Invoking %s\n",tmpbuffer);
  344.           termlib_reset();
  345.           fflush(stdout);
  346.           system(tmpbuffer);
  347. --- 457,463 ----
  348.       /* change / to \ */
  349.       change_sl2bsl(headname);
  350.           sprintf(tmpbuffer, uupc_rc_settings.editor, headname);
  351. !         /* printf("Invoking %s\n",tmpbuffer); */
  352.           termlib_reset();
  353.           fflush(stdout);
  354.           system(tmpbuffer);
  355. ***************
  356. *** 495,501 ****
  357.               sizeof tmpbuffer);
  358.   /*            sprintf(tmpbuffer,"inews %s", headname); */
  359.           change_sl2bsl(tmpbuffer);
  360. !         printf("Invoking %s\n",tmpbuffer);
  361.           fflush(stdout);
  362.           system(tmpbuffer);
  363.   #ifndef USE_NNTP
  364. --- 495,501 ----
  365.               sizeof tmpbuffer);
  366.   /*            sprintf(tmpbuffer,"inews %s", headname); */
  367.           change_sl2bsl(tmpbuffer);
  368. !         /* printf("Invoking %s\n",tmpbuffer); */
  369.           fflush(stdout);
  370.           system(tmpbuffer);
  371.   #ifndef USE_NNTP
  372. ***************
  373. *** 524,530 ****
  374.                   break;
  375.               case 'e': case 'E':
  376.                   sprintf(tmpbuffer, uupc_rc_settings.editor, headname);
  377. !                 printf("\nInvoking %s\n",tmpbuffer);
  378.                   termlib_reset();
  379.                   fflush(stdout);
  380.                   system(tmpbuffer);
  381. --- 524,530 ----
  382.                   break;
  383.               case 'e': case 'E':
  384.                   sprintf(tmpbuffer, uupc_rc_settings.editor, headname);
  385. !                 /* printf("\nInvoking %s\n",tmpbuffer); */
  386.                   termlib_reset();
  387.                   fflush(stdout);
  388.                   system(tmpbuffer);
  389.