mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00
Code Issues Releases Activity

Prevent collision with getline(3)

Browse Source
This commit is contained in:
Baptiste Daroussin 2016-05-13 19:24:51 +00:00
parent 969acbbca1
commit f41f6957d4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=415138
39 changed files with 505 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
japanese/dvi2tty/Makefile
View File

@ -22,6 +22,9 @@ PLIST_FILES= bin/jdvi2tty \
bin/jdisdvi \
man/man1/jdvi2tty.1.gz
post-patch:
${REINPLACE_CMD} -e "s/getline/get_line/g" ${WRKSRC}/dvistuff.c
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/jdvi2tty ${STAGEDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/disdvi ${STAGEDIR}${PREFIX}/bin/jdisdvi

56
japanese/epwutil/files/patch-catdump.c Normal file
View File

@ -0,0 +1,56 @@
--- catdump.c.orig 2016-05-13 19:10:22 UTC
+++ catdump.c
@@ -201,7 +201,7 @@ void outhex();
void outstr();
void outjstr();
int undump();
-uchr *getline();
+uchr *get_line();
uchr *getvalue();
int gethex();
int hexdigit();
@@ -561,7 +561,7 @@ char *txtfile, *catalog;
err = 0;
line = 0;
- if (getline(buf, fp) == NULL ||
+ if (get_line(buf, fp) == NULL ||
strncmp(buf, CAT_ENTRY, strlen(CAT_ENTRY))) {
fprintf(stderr, "ERR: 項目 %s がありません\n", CAT_ENTRY);
fclose(fp);
@@ -571,7 +571,7 @@ char *txtfile, *catalog;
st = 0;
hdr = (HDR_T *)catbuf;
mask = 0L;
- while (getline(buf, fp) != NULL && *buf != '[') {
+ while (get_line(buf, fp) != NULL && *buf != '[') {
if ((p = getvalue(buf)) == NULL) {
fprintf(stderr, "ERR: line %d: 構文に誤りがあります\n", line);
err++;
@@ -666,7 +666,7 @@ char *txtfile, *catalog;
if (strncmp(buf, BOOK_ENTRY, strlen(BOOK_ENTRY))) {
fprintf(stderr, "ERR: line %d: 不明な項目です(%s)\n", line, buf);
err++;
- while (getline(buf, fp) != NULL && *buf != '[')
+ while (get_line(buf, fp) != NULL && *buf != '[')
;
if (*buf == '\0')
break;
@@ -680,7 +680,7 @@ char *txtfile, *catalog;
break;
}
mask = 0;
- while (getline(buf, fp) != NULL && *buf != '[') {
+ while (get_line(buf, fp) != NULL && *buf != '[') {
if ((p = getvalue(buf)) == NULL) {
fprintf(stderr, "ERR: line %d: 構文に誤りがあります\n", line);
err++;
@@ -917,7 +917,7 @@ char *txtfile, *catalog;
}
uchr *
-getline(buf, fp)
+get_line(buf, fp)
uchr *buf;
FILE *fp;
{

4
japanese/epwutil/files/patch-makefile.unx
View File

@ -1,5 +1,5 @@
--- makefile.unx.orig Wed Oct 22 16:55:42 2003
+++ makefile.unx Wed Oct 22 16:55:57 2003
--- makefile.unx.orig 1999-01-12 20:22:02 UTC
+++ makefile.unx
@@ -1,7 +1,8 @@
# EPWUTIL Makefile for UNIX/gcc

8
japanese/kdrill/files/patch-Imakefile
View File

@ -1,6 +1,6 @@
--- Imakefile.orig Sat Jan 8 06:59:13 2005
+++ Imakefile Fri Aug 5 16:16:00 2005
@@ -32,9 +32,9 @@
--- Imakefile.orig 2006-03-05 22:05:00 UTC
+++ Imakefile
@@ -32,9 +32,9 @@ UNCOMPRESSEXT = .gz
/* You can change these here, and KDrill.ad will
* get created with the matching values. Yaaay!
*/
@ -13,7 +13,7 @@
# If for some reason, the user prefs stuff isn't working for you,
# and you can't compile, uncomment this
@@ -46,7 +46,10 @@
@@ -46,7 +46,10 @@ RADLOCATION= /usr/local/lib/radkfile
# The system should pick some default for you.
# If you dont like it, uncomment this and use it as you like.
# This isn't compiled in anywhere, it's just a convenience thing.

11
japanese/kdrill/files/patch-externs.h Normal file
View File

@ -0,0 +1,11 @@
--- externs.h.orig 2002-10-01 06:52:38 UTC
+++ externs.h
@@ -35,7 +35,7 @@ extern void ClearCheat();
/* other "usefull" general functions */
extern int xtoi(char *);
-extern int getline(FILE *, unsigned char *);
+extern int get_line(FILE *, unsigned char *);
extern void setstatus(char *);
extern int FindIndex(char *);

4
japanese/kdrill/files/patch-makedic-Makefile
View File

@ -1,5 +1,5 @@
--- makedic/Makefile.orig Sun Nov 12 16:18:27 2000
+++ makedic/Makefile Sun Nov 12 16:19:21 2000
--- makedic/Makefile.orig 2000-08-02 21:18:48 UTC
+++ makedic/Makefile
@@ -5,13 +5,13 @@
all: makeedict makedic

43
japanese/kdrill/files/patch-readfile.c Normal file
View File

@ -0,0 +1,43 @@
--- readfile.c.orig 2004-02-07 17:58:44 UTC
+++ readfile.c
@@ -31,7 +31,7 @@ int numberofkanji=0, highestkanji=0, low
static char *dictname=NULL;
static char *edictname=NULL;
-/* getline:
+/* get_line:
* reads a line (from dictionary).
* Deals with 8-bit char reads (or attempts to)
* Also attempts to deal with the problem of variable line length.
@@ -46,11 +46,11 @@ static char *edictname=NULL;
*
* Used in "readstructs()", below. Also "readedict()"
*
- * Note that this expects static global getline_inptr to be NULL
+ * Note that this expects static global get_line_inptr to be NULL
* if we have just started reading a stream;
*/
-int getline(FILE *fp,unsigned char *s)
+int get_line(FILE *fp,unsigned char *s)
{
char * val;
char *endparse;
@@ -464,7 +464,7 @@ void readedict()
lowestkanji = nextindex;
}
- while(getline(fp, instring) != 0)
+ while(get_line(fp, instring) != 0)
{
int instrlen;
@@ -668,7 +668,7 @@ void readstructs(){
exit(-1);
}
- while (getline(fp,instring) != 0) {
+ while (get_line(fp,instring) != 0) {
int Kanji;
int freq,grade,N,U,H,Q,SKIP;
unsigned char *parse;

5
japanese/kinput2/files/patch-cmd_Kinput2.ad
View File

@ -3,9 +3,8 @@ Index: cmd/Kinput2.ad
RCS file: /home/cvs/private/hrs/kinput2/cmd/Kinput2.ad,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -p -r1.1.1.1 -r1.2
--- cmd/Kinput2.ad 7 Dec 2009 06:36:04 -0000 1.1.1.1
+++ cmd/Kinput2.ad 7 Dec 2009 06:44:56 -0000 1.2
--- cmd/Kinput2.ad.orig 2002-10-03 09:35:26 UTC
+++ cmd/Kinput2.ad
@@ -32,9 +32,12 @@ Kinput2.height: 1
!!
!! Wnn setup

5
japanese/kinput2/files/patch-lib_CcWnn.c
View File

@ -3,9 +3,8 @@ Index: lib/CcWnn.c
RCS file: /home/cvs/private/hrs/kinput2/lib/CcWnn.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -p -r1.1.1.1 -r1.2
--- lib/CcWnn.c 7 Dec 2009 06:36:04 -0000 1.1.1.1
+++ lib/CcWnn.c 7 Dec 2009 06:44:58 -0000 1.2
--- lib/CcWnn.c.orig 2002-10-03 09:35:27 UTC
+++ lib/CcWnn.c
@@ -18,6 +18,8 @@ static char *rcsid = "$Id: CcWnn.c,v 1.5
* Author: Makoto Ishisone, Software Research Associates, Inc., Japan
*/

5
japanese/kinput2/files/patch-lib_IMProto.c
View File

@ -3,9 +3,8 @@ Index: lib/IMProto.c
RCS file: /home/cvs/private/hrs/kinput2/lib/IMProto.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -p -r1.1.1.1 -r1.2
--- lib/IMProto.c 7 Dec 2009 06:36:04 -0000 1.1.1.1
+++ lib/IMProto.c 7 Dec 2009 06:44:58 -0000 1.2
--- lib/IMProto.c.orig 2002-10-03 09:35:28 UTC
+++ lib/IMProto.c
@@ -259,7 +259,7 @@ Cardinal *num_args;
#ifdef IM_TCP_TRANSPORT
if (ipw->imp.use_tcp_transport) {

41
japanese/kinput2/files/patch-lib_cconv.c
View File

@ -3,9 +3,8 @@ Index: lib/cconv.c
RCS file: /home/cvs/private/hrs/kinput2/lib/cconv.c,v
retrieving revision 1.1.1.1
retrieving revision 1.3
diff -u -p -r1.1.1.1 -r1.3
--- lib/cconv.c 7 Dec 2009 06:36:04 -0000 1.1.1.1
+++ lib/cconv.c 7 Dec 2009 06:50:44 -0000 1.3
--- lib/cconv.c.orig 2002-10-03 09:35:28 UTC
+++ lib/cconv.c
@@ -604,6 +604,7 @@ static char *rcsid = "$Id: cconv.c,v 10.
#endif
@ -85,7 +84,15 @@ diff -u -p -r1.1.1.1 -r1.3
#define FUNCSIZE 20
#define MOREFUNCSIZE 20
typedef struct {
@@ -797,7 +793,7 @@ static int newMode(ccRule, Files *, _str
@@ -790,14 +786,14 @@ static wchar *promptsave(wchar *);
static int parseLine(uchar *, uchar **, int);
static FILE *openfile(char *);
static int doinclude(uchar *, Files *, void (*)());
-static uchar *getline(uchar *, int, Files *, void (*)());
+static uchar *get_line(uchar *, int, Files *, void (*)());
static int readRuleFile(ccRule, char *);
static int registMode(ccRule, int, uchar **);
static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *,
_funcnameRec *, int, uchar **);
static int getDesc(ccRule, uchar *, _funcbufRec *, _funcnameRec *,
ulong *, int *, wchar *, wchar *, int *);
@ -119,15 +126,29 @@ diff -u -p -r1.1.1.1 -r1.3
static int funcalloc();
static void funcadjust();
static int funcsearch();
@@ -1098,7 +1090,7 @@ char *file;
@@ -1035,8 +1027,8 @@ void (*efunc)();
return 0;
}
-/* getline -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
-static uchar *getline(line, linesize, files, efunc)
+/* get_line -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
+static uchar *get_line(line, linesize, files, efunc)
uchar *line;
int linesize;
Files *files;
@@ -1098,9 +1090,9 @@ char *file;
fnrec.funcnamebuf = NULL;
rule->nmode = 0;
- rule->initialmode = -1;
+ rule->initialmode = NULL;
while (getline(line, sizeof(line), &files, efunc)) {
- while (getline(line, sizeof(line), &files, efunc)) {
+ while (get_line(line, sizeof(line), &files, efunc)) {
(void)Strcpy(tmp, line);
if ((argc = parseLine(tmp, argv, 20)) == 0)
continue;
@@ -1191,33 +1183,42 @@ int ac;
uchar **av;
{
@ -182,7 +203,7 @@ diff -u -p -r1.1.1.1 -r1.3
return 0;
}
@@ -1238,35 +1239,39 @@ uchar **av;
@@ -1238,38 +1239,42 @@ uchar **av;
wchar prompt[30], context[100], result[100];
int func;
int ndesc = 0;
@ -231,7 +252,11 @@ diff -u -p -r1.1.1.1 -r1.3
+ cdp = cd_head;
/* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */
while (getline(line, sizeof(line), files, efunc)) {
- while (getline(line, sizeof(line), files, efunc)) {
+ while (get_line(line, sizeof(line), files, efunc)) {
/* '#' $B$G;O$^$k9T$O%3%a%s%H(B */
if (*line == '\0' || *line == '\n' || *line == '#')
continue;
@@ -1277,9 +1282,11 @@ uchar **av;
break;
if (getDesc(rule, line, frec, fnrec, &inkey, &modmask,

5
japanese/kinput2/files/patch-lib_imlib_imconv.c
View File

@ -3,9 +3,8 @@ Index: lib/imlib/imconv.c
RCS file: /home/cvs/private/hrs/kinput2/lib/imlib/imconv.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -p -r1.1.1.1 -r1.2
--- lib/imlib/imconv.c 7 Dec 2009 06:36:04 -0000 1.1.1.1
+++ lib/imlib/imconv.c 7 Dec 2009 06:44:58 -0000 1.2
--- lib/imlib/imconv.c.orig 2002-10-03 09:35:30 UTC
+++ lib/imlib/imconv.c
@@ -591,6 +591,9 @@ OCCPreeditDrawArg *data;
}
}

5
japanese/kinput2/files/patch-lib_imlib_imfuncs.h
View File

@ -3,9 +3,8 @@ Index: lib/imlib/imfuncs.h
RCS file: /home/cvs/private/hrs/kinput2/lib/imlib/imfuncs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -p -r1.1.1.1 -r1.2
--- lib/imlib/imfuncs.h 7 Dec 2009 06:36:04 -0000 1.1.1.1
+++ lib/imlib/imfuncs.h 7 Dec 2009 06:44:58 -0000 1.2
--- lib/imlib/imfuncs.h.orig 2002-10-03 09:35:30 UTC
+++ lib/imlib/imfuncs.h
@@ -60,7 +60,7 @@ extern void IMSendBadLength _Pt_((IMConn
/*
* Transport layer functions (defined in imxport.c)

5
japanese/kinput2/files/patch-lib_imlib_imxport.c
View File

@ -3,9 +3,8 @@ Index: lib/imlib/imxport.c
RCS file: /home/cvs/private/hrs/kinput2/lib/imlib/imxport.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -p -r1.1.1.1 -r1.2
--- lib/imlib/imxport.c 7 Dec 2009 06:36:04 -0000 1.1.1.1
+++ lib/imlib/imxport.c 7 Dec 2009 06:44:58 -0000 1.2
--- lib/imlib/imxport.c.orig 2002-10-03 09:35:31 UTC
+++ lib/imlib/imxport.c
@@ -31,10 +31,12 @@ static char *rcsid = "$Id: imxport.c,v 1
#ifdef IM_UNIX_TRANSPORT

6
japanese/mh/files/patch-conf__makefiles__uip
View File

@ -1,6 +1,6 @@
--- conf/makefiles/uip.orig 2001-05-30 23:57:47.000000000 +0900
+++ conf/makefiles/uip 2014-10-13 17:55:46.000000000 +0900
@@ -995,10 +995,6 @@
--- conf/makefiles/uip.orig 2001-05-30 14:57:47 UTC
+++ conf/makefiles/uip
@@ -995,10 +995,6 @@ $(ETCDIR)/rcvtty: xrcvtty
-chmod g-s zrcvtty
$(CP) xrcvtty $@
-@chmod $(PGMPROT) $@

11
japanese/mh/files/patch-configure
View File

@ -1,6 +1,6 @@
--- configure.orig 2001-06-15 01:41:51.000000000 +0900
+++ configure 2014-10-08 22:52:42.000000000 +0900
@@ -1397,14 +1397,8 @@
--- configure.orig 2001-06-14 16:41:51 UTC
+++ configure
@@ -1397,14 +1397,8 @@ case "$host_os" in
if test "$use_sharedlib" != no
then
sharedlib=fbsd
@ -9,13 +9,14 @@
- if test x`/usr/bin/objformat` = xelf
- then
sharedlib=gnuelf
make_mhconfig='CFLAGS="-O -DMHSLIB_NOMINVER"'
- make_mhconfig='CFLAGS="-O -DMHSLIB_NOMINVER"'
- fi
- fi
+ make_mhconfig='CFLAGS="-O2 -pipe -Wno-return-type -fstack-protector -fno-strict-aliasing -DMHSLIB_NOMINVER"'
echo __ELF__ | $CC -E - | grep -q __ELF__ || sharedlib=gnuelf
slflags="-fpic"
slibdir=$libdir
@@ -1748,34 +1742,6 @@
@@ -1748,34 +1742,6 @@ test -n "$pager" || pager="/usr/ucb/more
pagerpath="$ac_cv_path_pager"
fi

7
japanese/mh/files/patch-h:mh.h → japanese/mh/files/patch-h_mh.h
View File

@ -1,8 +1,7 @@
Index: h/mh.h
diff -u h/mh.h.orig h/mh.h
--- h/mh.h.orig Wed Dec 2 02:05:00 1998
+++ h/mh.h Fri Jul 18 16:47:28 2003
@@ -253,7 +253,7 @@
--- h/mh.h.orig 1998-12-01 17:05:00 UTC
+++ h/mh.h
@@ -253,7 +253,7 @@ void ambigsw ();
int atooi ();
char **brkstring ();
void closefds ();

4
japanese/mh/files/patch-sbr:concat.c → japanese/mh/files/patch-sbr_concat.c
View File

@ -1,5 +1,5 @@
--- sbr/concat.c.orig 1993-12-01 13:01:21.000000000 +0900
+++ sbr/concat.c 2008-04-27 00:14:56.000000000 +0900
--- sbr/concat.c.orig 1993-12-01 04:01:21 UTC
+++ sbr/concat.c
@@ -2,34 +2,40 @@
#include "../h/mh.h"

29
japanese/mh/files/patch-support_pop_popser.c Normal file
View File

@ -0,0 +1,29 @@
--- support/pop/popser.c.orig 1999-02-09 11:30:00 UTC
+++ support/pop/popser.c
@@ -259,7 +259,7 @@ static p_cmatch(), p_isdate(), p_ishead
extern int mbx_read ();
static int setup(), setupaux(), read_map(), read_file(), pmbx_size();
-static int quitaux(), quitfile(), respond(), getline();
+static int quitaux(), quitfile(), respond(), get_line();
static m_gMsgs(), multiline(), multiend(), putline();
/* */
@@ -410,7 +410,7 @@ char *rhost;
(void) respond (OK, "%s ready %s", server, timestamp);
for (mystate = auth1; mystate != halt && mystate != error;)
- switch (getline (buffer, sizeof buffer, input)) {
+ switch (get_line (buffer, sizeof buffer, input)) {
case OK:
if ((v = getvector (buffer, vec)) == NULL)
continue;
@@ -1850,7 +1850,7 @@ static multiend () {
/* */
-static int getline (s, n, iop)
+static int get_line (s, n, iop)
register char *s;
register int n;
register FILE *iop;

4
japanese/mh/files/patch-uip_msh.c
View File

@ -1,6 +1,6 @@
--- uip/msh.c
--- uip/msh.c.orig 2001-06-14 16:41:30 UTC
+++ uip/msh.c
@@ -17,14 +17,7 @@
@@ -17,14 +17,7 @@ static char ident[] = "@(#)$Id: msh.c,v
#include <ctype.h>
#include <sys/types.h>
#include <sys/stat.h>

47
japanese/mh/files/patch-uip_popsbr.c Normal file
View File

@ -0,0 +1,47 @@
--- uip/popsbr.c.orig 2001-04-02 10:50:01 UTC
+++ uip/popsbr.c
@@ -63,7 +63,7 @@ int command(), multiline();
static int command(), multiline();
#endif
-static int getline();
+static int get_line();
static putline();
#ifdef NNTP
@@ -176,7 +176,7 @@ int snoop;
(void) signal (SIGPIPE, SIG_IGN);
- switch (getline (response, sizeof response, input)) {
+ switch (get_line (response, sizeof response, input)) {
case OK:
if (poprint)
fprintf (stderr, "<--- %s\n", response);
@@ -619,7 +619,7 @@ char *fmt,
if (putline (buffer, output) == NOTOK)
return NOTOK;
- switch (getline (response, sizeof response, input)) {
+ switch (get_line (response, sizeof response, input)) {
case OK:
if (poprint)
fprintf (stderr, "<--- %s\n", response);
@@ -645,7 +645,7 @@ static int multiline () {
#endif
char buffer[BUFSIZ + TRMLEN];
- if (getline (buffer, sizeof buffer, input) != OK)
+ if (get_line (buffer, sizeof buffer, input) != OK)
return NOTOK;
#ifdef DEBUG
if (poprint)
@@ -665,7 +665,7 @@ static int multiline () {
/* */
-static int getline (s, n, iop)
+static int get_line (s, n, iop)
char *s;
int n;
FILE * iop;

17
japanese/mh/files/patch-uip_prompter.c
View File

@ -1,6 +1,6 @@
--- uip/prompter.c
--- uip/prompter.c.orig 1998-04-23 21:02:00 UTC
+++ uip/prompter.c
@@ -6,15 +6,7 @@
@@ -6,15 +6,7 @@ static char ident[] = "@(#)$Id: prompter
#include "../h/mh.h"
#include <stdio.h>
#include <errno.h>
@ -17,7 +17,7 @@
#if defined(BSD42) || defined(SVR4)
#include <setjmp.h>
#endif /* BSD42 || SVR4 */
@@ -71,19 +63,10 @@
@@ -71,19 +63,10 @@ static struct swit switches[] = {
extern int errno;
@ -38,7 +38,7 @@
static TYPESIG intrser ();
@@ -209,29 +192,14 @@
@@ -209,29 +192,14 @@ char *argv[];
(void) chmod (tmpfil, 0600);
if (killp || erasep) {
@ -49,15 +49,14 @@
- char serase,
- skill;
-#endif /* SYS5 */
-
+ cc_t serase, skill;
-#ifndef SYS5
- (void) ioctl (0, TIOCGETP, (char *) &sg);
- (void) ioctl (0, TIOCGETC, (char *) &tc);
-#else /* SYS5 */
- (void) ioctl(0, TCGETA, &sg);
-#endif /* SYS5 */
+ cc_t serase, skill;
+
+ (void) tcgetattr(0, &sg);
skill = KILL;
serase = ERASE;
@ -72,7 +71,7 @@
chrdsp ("erase", ERASE);
chrdsp (", kill", KILL);
@@ -273,11 +241,7 @@
@@ -273,11 +241,7 @@ char *argv[];
if (i == -1) {
abort: ;
if (killp || erasep)
@ -85,7 +84,7 @@
(void) unlink (tmpfil);
done (1);
}
@@ -365,11 +329,7 @@
@@ -365,11 +329,7 @@ no_body: ;
/* */
if (killp || erasep)

47
japanese/mh/files/patch-uip_pshsbr.c Normal file
View File

@ -0,0 +1,47 @@
--- uip/pshsbr.c.orig 2001-04-02 10:50:24 UTC
+++ uip/pshsbr.c
@@ -63,7 +63,7 @@ int command(), multiline();
static int command(), multiline();
#endif
-static int getline();
+static int get_line();
static putline();
#ifdef NNTP
@@ -176,7 +176,7 @@ int snoop;
(void) signal (SIGPIPE, SIG_IGN);
- switch (getline (response, sizeof response, input)) {
+ switch (get_line (response, sizeof response, input)) {
case OK:
if (poprint)
fprintf (stderr, "<--- %s\n", response);
@@ -619,7 +619,7 @@ char *fmt,
if (putline (buffer, output) == NOTOK)
return NOTOK;
- switch (getline (response, sizeof response, input)) {
+ switch (get_line (response, sizeof response, input)) {
case OK:
if (poprint)
fprintf (stderr, "<--- %s\n", response);
@@ -645,7 +645,7 @@ static int multiline () {
#endif
char buffer[BUFSIZ + TRMLEN];
- if (getline (buffer, sizeof buffer, input) != OK)
+ if (get_line (buffer, sizeof buffer, input) != OK)
return NOTOK;
#ifdef DEBUG
if (poprint)
@@ -665,7 +665,7 @@ static int multiline () {
/* */
-static int getline (s, n, iop)
+static int get_line (s, n, iop)
char *s;
int n;
FILE * iop;

14
japanese/mh/files/patch-uip:rcvtty.c → japanese/mh/files/patch-uip_rcvtty.c
View File

@ -1,6 +1,6 @@
--- uip/rcvtty.c.orig 2001-04-05 01:05:17.000000000 +0900
+++ uip/rcvtty.c 2014-10-13 17:46:24.000000000 +0900
@@ -8,11 +8,16 @@
--- uip/rcvtty.c.orig 2001-04-04 16:05:17 UTC
+++ uip/rcvtty.c
@@ -8,11 +8,16 @@ static char ident[] = "@(#)$Id: rcvtty.c
#endif
#include "../h/mh.h"
#include "../h/rcvmail.h"
@ -17,7 +17,7 @@
#include <utmp.h>
#ifndef UTMP_FILENAME
#ifdef UTMP_FILE
@@ -25,6 +30,7 @@
@@ -25,6 +30,7 @@ static char ident[] = "@(#)$Id: rcvtty.c
#endif
#endif
#endif /* UTMP_FILENAME */
@ -25,7 +25,7 @@
#endif /* not TTYD */
#ifdef LOCALE
#include <locale.h>
@@ -110,8 +116,12 @@
@@ -110,8 +116,12 @@ char **argv;
*vec[MAXARGS];
#ifndef TTYD
char tty[BUFSIZ];
@ -38,7 +38,7 @@
#endif /* not TTYD */
#ifdef BSD43
@@ -200,6 +210,13 @@
@@ -200,6 +210,13 @@ char **argv;
user = getusr ();
#ifndef TTYD
@ -52,7 +52,7 @@
if ((uf = fopen (UTMP_FILENAME, "r")) == NULL)
exit (RCV_MBX);
while (fread ((char *) &ut, sizeof ut, 1, uf) == 1)
@@ -212,6 +229,7 @@
@@ -212,6 +229,7 @@ char **argv;
alert (tty, md);
}
(void) fclose (uf);

6
japanese/mh/files/patch-ao → japanese/mh/files/patch-uip_replsbr.c
View File

@ -1,6 +1,6 @@
--- uip/replsbr.c.orig Thu Apr 5 01:05:17 2001
+++ uip/replsbr.c Tue Jan 14 18:05:42 2003
@@ -195,11 +195,12 @@
--- uip/replsbr.c.orig 2001-04-04 16:05:17 UTC
+++ uip/replsbr.c
@@ -195,11 +195,12 @@ replout (inb, msg, drft, mp)
}
} while (cptr = cptr->c_next);

12
japanese/mh/files/patch-uip:slocal.c → japanese/mh/files/patch-uip_slocal.c
View File

@ -1,6 +1,6 @@
--- uip/slocal.c.orig 2000-12-04 21:09:38.000000000 +0900
+++ uip/slocal.c 2010-04-12 17:10:12.000000000 +0900
@@ -36,6 +36,10 @@
--- uip/slocal.c.orig 2000-12-04 12:09:38 UTC
+++ uip/slocal.c
@@ -36,6 +36,10 @@ static char ident[] = "@(#)$Id: slocal.c
#endif /* NOIOCTLH */
#endif /* not V7 */
#include <sys/stat.h>
@ -11,7 +11,7 @@
#include <utmp.h>
#ifndef UTMP_FILENAME
#ifdef UTMP_FILE
@@ -48,6 +52,7 @@
@@ -48,6 +52,7 @@ static char ident[] = "@(#)$Id: slocal.c
#endif
#endif
#endif /* UTMP_FILENAME */
@ -19,7 +19,7 @@
#ifdef LOCALE
#include <locale.h>
#endif
@@ -938,6 +943,24 @@
@@ -938,6 +943,24 @@ register char *key;
/* */
@ -44,7 +44,7 @@
static int logged_in () {
struct utmp ut;
register FILE *uf;
@@ -963,6 +986,7 @@
@@ -963,6 +986,7 @@ static int logged_in () {
(void) fclose (uf);
return (utmped = NOTOK);
}

8
japanese/mh/files/patch-uip_trmsbr.c
View File

@ -1,6 +1,6 @@
--- uip/trmsbr.c
--- uip/trmsbr.c.orig 1993-12-01 04:01:39 UTC
+++ uip/trmsbr.c
@@ -5,19 +5,8 @@
@@ -5,19 +5,8 @@ static char ident[] = "@(#)$Id: trmsbr.c
#include "../h/mh.h"
#include <stdio.h>
@ -21,7 +21,7 @@
#if BUFSIZ<2048
@@ -58,11 +47,7 @@
@@ -58,11 +47,7 @@ static read_termcap () {
*term;
char *cp,
myterm[TXTSIZ];
@ -34,7 +34,7 @@
static int inited = 0;
if (inited++)
@@ -71,13 +56,7 @@
@@ -71,13 +56,7 @@ static read_termcap () {
if ((term = getenv ("TERM")) == NULL || tgetent (myterm, term) <= OK)
return;

6
japanese/mh/files/patch-uip:vmh.c → japanese/mh/files/patch-uip_vmh.c
View File

@ -1,6 +1,6 @@
--- uip/vmh.c.orig 2001-04-21 20:16:49 +0900
+++ uip/vmh.c 2007-10-19 12:51:52 +0900
@@ -116,6 +116,13 @@
--- uip/vmh.c.orig 2001-04-21 11:16:49 UTC
+++ uip/vmh.c
@@ -116,6 +116,13 @@ void __cputchar __P((int));
#define XYZ /* XXX */

133
japanese/prn/files/patch-Makefile
View File

@ -1,82 +1,51 @@
*** Makefile.orig Wed May 11 17:00:58 1994
--- Makefile Tue Jul 1 17:44:49 1997
***************
*** 25,35 ****
# @(#)Makefile 2.3 (Y.Tonooka) 5/11/94
#-
! BINPATH = /usr/local/bin
! LIBPATH = /usr/local/lib
! MANPATH = /usr/local/man
! JMANDIR = japanese
! CFLAGS = -O
# CFLAGS = -g -DDEBUG
ARFLAGS = rcv
--- 25,39 ----
# @(#)Makefile 2.3 (Y.Tonooka) 5/11/94
#-
! PREFIX?=/usr/local
! BINPATH = ${PREFIX}/bin
! LIBPATH = ${PREFIX}/share/prn
! MANPATH = ${PREFIX}/man
! JMANDIR = ja
! CFLAGS += \
! -DKCCPATH=\"${PREFIX}/bin/kcc\" \
! -DCMTPATH=\"${PREFIX}/bin/cmt\" \
! -DPSPATH=\"${PREFIX}/bin/psconv\"
# CFLAGS = -g -DDEBUG
ARFLAGS = rcv
***************
*** 39,47 ****
AR = ar
RANLIB = ranlib
LINT = lint
! INSTALL = install
CP = cp
! LN = ln
RM = rm -f
TAGS = ctags
ETAGS = etags
--- 43,51 ----
AR = ar
RANLIB = ranlib
LINT = lint
! INSTALL = install -c
CP = cp
! LN = ln -fs
RM = rm -f
TAGS = ctags
ETAGS = etags
***************
*** 91,103 ****
$(BINPATH)/cprn: $(BINPATH)/prn
if [ $@ ]; then $(RM) $@; fi
! $(LN) $(BINPATH)/prn $@
$(BINPATH)/cmt: cmt.c defs.c euc.c reg.y
$(MAKE) cmt
$(INSTALL) -s cmt $(BINPATH)
$(LIBPATH)/cmtdefs: cmtdefs
$(CP) cmtdefs $@; chmod 644 $@
$(BINPATH)/psconv: psconv.c
--- 95,108 ----
$(BINPATH)/cprn: $(BINPATH)/prn
if [ $@ ]; then $(RM) $@; fi
! $(LN) prn $@
$(BINPATH)/cmt: cmt.c defs.c euc.c reg.y
$(MAKE) cmt
$(INSTALL) -s cmt $(BINPATH)
$(LIBPATH)/cmtdefs: cmtdefs
+ mkdir -p $(LIBPATH)
$(CP) cmtdefs $@; chmod 644 $@
$(BINPATH)/psconv: psconv.c
--- Makefile.orig 1994-05-11 08:00:58 UTC
+++ Makefile
@@ -25,11 +25,15 @@
# @(#)Makefile 2.3 (Y.Tonooka) 5/11/94
#-
- BINPATH = /usr/local/bin
- LIBPATH = /usr/local/lib
- MANPATH = /usr/local/man
- JMANDIR = japanese
- CFLAGS = -O
+ PREFIX?=/usr/local
+ BINPATH = ${PREFIX}/bin
+ LIBPATH = ${PREFIX}/share/prn
+ MANPATH = ${PREFIX}/man
+ JMANDIR = ja
+ CFLAGS += \
+ -DKCCPATH=\"${PREFIX}/bin/kcc\" \
+ -DCMTPATH=\"${PREFIX}/bin/cmt\" \
+ -DPSPATH=\"${PREFIX}/bin/psconv\"
# CFLAGS = -g -DDEBUG
ARFLAGS = rcv
@@ -39,9 +43,9 @@
AR = ar
RANLIB = ranlib
LINT = lint
- INSTALL = install
+ INSTALL = install -c
CP = cp
- LN = ln
+ LN = ln -fs
RM = rm -f
TAGS = ctags
ETAGS = etags
@@ -91,13 +95,14 @@ $(BINPATH)/prn: prn.c euc.c
$(BINPATH)/cprn: $(BINPATH)/prn
if [ $@ ]; then $(RM) $@; fi
- $(LN) $(BINPATH)/prn $@
+ $(LN) prn $@
$(BINPATH)/cmt: cmt.c defs.c euc.c reg.y
$(MAKE) cmt
$(INSTALL) -s cmt $(BINPATH)
$(LIBPATH)/cmtdefs: cmtdefs
+ mkdir -p $(LIBPATH)
$(CP) cmtdefs $@; chmod 644 $@
$(BINPATH)/psconv: psconv.c

8
japanese/prn/files/patch-cmt.c
View File

@ -1,6 +1,6 @@
--- cmt.c.orig Mon Apr 25 16:26:57 1994
+++ cmt.c Fri Feb 6 00:18:46 2004
@@ -27,7 +27,9 @@
--- cmt.c.orig 1994-04-25 07:26:57 UTC
+++ cmt.c
@@ -27,7 +27,9 @@ static char *sccsid = "@(#)cmt.c 2.2 (Y.
#endif
#include <stdio.h>
@ -10,7 +10,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "cmt.h"
@@ -352,16 +354,15 @@
@@ -352,16 +354,15 @@ static char_t *readkeyword(filename)
error(format, arg1, arg2, ...)
char *format;
---------------------------------------------------------------------*/

6
japanese/prn/files/patch-cmt.h
View File

@ -1,6 +1,6 @@
--- cmt.h.orig Fri Feb 6 00:13:05 2004
+++ cmt.h Fri Feb 6 00:13:18 2004
@@ -32,4 +32,4 @@
--- cmt.h.orig 1993-11-29 10:00:33 UTC
+++ cmt.h
@@ -32,4 +32,4 @@ typedef int bool;
/*
* Error handling function.
*/

30
japanese/prn/files/patch-cmt.jman
View File

@ -1,19 +1,11 @@
*** cmt.jman.orig Mon Jun 9 14:19:17 1997
--- cmt.jman Mon Jun 9 14:19:40 1997
***************
*** 91,97 ****
るときの名称を示します。
.LP
.RS
! .ta +19n; +12n; +20n;
ファイル名 言語 指定名称
.ie n .br
.el .sp .4
--- 91,97 ----
るときの名称を示します。
.LP
.RS
! .ta +19n +12n +20n
ファイル名 言語 指定名称
.ie n .br
.el .sp .4
--- cmt.jman.orig 1994-03-28 11:06:39 UTC
+++ cmt.jman
@@ -91,7 +91,7 @@ cmt \- コメントと予約語の処理
るときの名称を示します。
.LP
.RS
-.ta +19n; +12n; +20n;
+.ta +19n +12n +20n
ファイル名 言語 指定名称
.ie n .br
.el .sp .4

4
japanese/prn/files/patch-defs.c
View File

@ -1,6 +1,6 @@
--- defs.c.orig
--- defs.c.orig 1994-04-25 07:26:57 UTC
+++ defs.c
@@ -26,6 +26,7 @@
@@ -26,6 +26,7 @@ static char sccsid[] = "@(#)defs.c 2.2 (
#endif
#include <stdio.h>

4
japanese/prn/files/patch-euc.c
View File

@ -1,6 +1,6 @@
--- euc.c.orig
--- euc.c.orig 1994-03-28 10:21:54 UTC
+++ euc.c
@@ -26,6 +26,9 @@
@@ -26,6 +26,9 @@ static char *sccsid = "@(#)euc.c 2.2 (Y.
#endif
#include <stdio.h>

12
japanese/prn/files/patch-prn.c
View File

@ -1,6 +1,6 @@
--- prn.c.orig Thu May 26 11:37:45 1994
+++ prn.c Fri Feb 6 00:18:11 2004
@@ -26,16 +26,24 @@
--- prn.c.orig 1994-05-26 02:37:45 UTC
+++ prn.c
@@ -26,16 +26,24 @@ static char sccsid[] = "@(#)prn.c 2.3 (Y
#endif
#include <stdio.h>
@ -26,7 +26,7 @@
#define LPRPATH "/usr/bin/lpr"
#else
#define LPRPATH "/usr/ucb/lpr"
@@ -48,8 +56,12 @@
@@ -48,8 +56,12 @@ static char sccsid[] = "@(#)prn.c 2.3 (Y
#else
@ -39,7 +39,7 @@
#endif
@@ -96,7 +108,7 @@
@@ -96,7 +108,7 @@ static char *rangestr = NULL;
static char *filename; /* name of the file being processed */
static char *modtime; /* the last modification time */
@ -48,7 +48,7 @@
static char *basename();
static bool formatopt();
static bool rangeopt();
@@ -498,16 +510,15 @@
@@ -498,16 +510,15 @@ int main(c, v)
error(format, arg1, arg2, ...)
char *format;
---------------------------------------------------------------------*/

82
japanese/prn/files/patch-prn.jman
View File

@ -1,53 +1,29 @@
*** prn.jman.orig Mon Mar 28 20:06:40 1994
--- prn.jman Mon Jun 9 14:49:03 1997
***************
*** 129,135 ****
とにファイル名によって区別します。その規則は以下の表に示すとおりです。
.LP
.RS
! .ta +19n; +12n; +20n;
ファイル名 言語 \fB\-l\fR オプションでの名称
.ie n .br
.el .sp .4
--- 129,135 ----
とにファイル名によって区別します。その規則は以下の表に示すとおりです。
.LP
.RS
! .ta +18n +11n +20n
ファイル名 言語 \fB\-l\fR オプションでの名称
.ie n .br
.el .sp .4
***************
*** 210,216 ****
です。
.PD
.RS
! .ta +16;
.ie n .TP 15
.el .TP 10
.B \-V
--- 210,216 ----
です。
.PD
.RS
! .ta +16
.ie n .TP 15
.el .TP 10
.B \-V
***************
*** 242,248 ****
.IP
書式は任意に指定することもできます。
.RS
! .ta +16;
.ie n .TP 15
.el .TP 10
.B \-V\fIwid\fB\-\fIlen
--- 242,248 ----
.IP
書式は任意に指定することもできます。
.RS
! .ta +16
.ie n .TP 15
.el .TP 10
.B \-V\fIwid\fB\-\fIlen
--- prn.jman.orig 1994-03-28 11:06:40 UTC
+++ prn.jman
@@ -129,7 +129,7 @@ prn, cprn \- テキストファイルを清書印刷<E58DB0>
とにファイル名によって区別します。その規則は以下の表に示すとおりです。
.LP
.RS
-.ta +19n; +12n; +20n;
+.ta +18n +11n +20n
ファイル名 言語 \fB\-l\fR オプションでの名称
.ie n .br
.el .sp .4
@@ -210,7 +210,7 @@ prn, cprn \- テキストファイルを清書印刷<E58DB0>
です。
.PD
.RS
-.ta +16;
+.ta +16
.ie n .TP 15
.el .TP 10
.B \-V
@@ -242,7 +242,7 @@ prn, cprn \- テキストファイルを清書印刷<E58DB0>
.IP
書式は任意に指定することもできます。
.RS
-.ta +16;
+.ta +16
.ie n .TP 15
.el .TP 10
.B \-V\fIwid\fB\-\fIlen

30
japanese/prn/files/patch-psconv.c
View File

@ -1,6 +1,6 @@
--- psconv.c.orig
--- psconv.c.orig 1994-05-11 08:00:59 UTC
+++ psconv.c
@@ -64,9 +64,11 @@
@@ -64,9 +64,11 @@ static char *sccsid = "@(#)psconv.c 1.7
*/
#include <stdio.h>
@ -12,3 +12,29 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -591,7 +593,7 @@ void convert(fp)
dostart = 1;
done = 0;
- while ((end = getline(fp)) > 0) {
+ while ((end = get_line(fp)) > 0) {
for (i = 0; i < end; i++) {
intmask = 1;
/*
@@ -647,14 +649,14 @@ void convert(fp)
/*-==(spec:\\:":":\(:\):\[:\]::::psconv)==-----------------------------
NAME
- getline
+ get_line
DESCRIPTION
Reads characters onto cbuf[] upto NEWLINE, FORMFEED, escape
sequence or EOF.
An attribute of each character is set onto abuf[].
No checking on buffer overflow.
---------------------------------------------------------------------*/
-int getline(fp)
+int get_line(fp)
FILE *fp;
{
register int c;

82
japanese/prn/files/patch-psconv.jman
View File

@ -1,53 +1,29 @@
*** psconv.jman.orig Mon Jun 9 14:16:33 1997
--- psconv.jman Mon Jun 9 14:18:21 1997
***************
*** 104,110 ****
です。
.PD
.RS
! .ta +16;
.ie n .TP 15
.el .TP 10
.B \-V
--- 104,110 ----
です。
.PD
.RS
! .ta +16
.ie n .TP 15
.el .TP 10
.B \-V
***************
*** 136,142 ****
.IP
書式は任意に指定することもできます。
.RS
! .ta +16;
.ie n .TP 15
.el .TP 10
.B \-V\fIwid\fB\-\fIlen
--- 136,142 ----
.IP
書式は任意に指定することもできます。
.RS
! .ta +16
.ie n .TP 15
.el .TP 10
.B \-V\fIwid\fB\-\fIlen
***************
*** 181,187 ****
指示できる要素には以下の 4 種類があります。
.LP
.RS 10
! .ta +5n;
\fBR\fR 標準
.br
\fBB\fR 太字（bold）
--- 181,187 ----
指示できる要素には以下の 4 種類があります。
.LP
.RS 10
! .ta +5n
\fBR\fR 標準
.br
\fBB\fR 太字（bold）
--- psconv.jman.orig 1994-03-22 07:04:56 UTC
+++ psconv.jman
@@ -104,7 +104,7 @@ _\^_\^_\^_\fB^M\fR\fIcccc\fR\fB^M\fR\fIc
です。
.PD
.RS
-.ta +16;
+.ta +16
.ie n .TP 15
.el .TP 10
.B \-V
@@ -136,7 +136,7 @@ _\^_\^_\^_\fB^M\fR\fIcccc\fR\fB^M\fR\fIc
.IP
書式は任意に指定することもできます。
.RS
-.ta +16;
+.ta +16
.ie n .TP 15
.el .TP 10
.B \-V\fIwid\fB\-\fIlen
@@ -181,7 +181,7 @@ 半角かなに対してカタカナの代わりにひらが
指示できる要素には以下の 4 種類があります。
.LP
.RS 10
-.ta +5n;
+.ta +5n
\fBR\fR 標準
.br
\fBB\fR 太字（bold）

8
japanese/prn/files/patch-reg.y
View File

@ -1,6 +1,6 @@
--- reg.y.org Mon Nov 29 18:43:56 1993
+++ reg.y Thu Jan 20 12:29:44 2005
@@ -20,6 +20,7 @@
--- reg.y.orig 1993-11-29 09:43:56 UTC
+++ reg.y
@@ -20,6 +20,7 @@ static char *sccsid = "@(#)reg.y 2.1 (Y.
#endif
#include <stdio.h>
@ -8,7 +8,7 @@
#include <ctype.h>
#include "cmt.h"
#include "euc.h"
@@ -286,7 +287,7 @@
@@ -286,7 +287,7 @@ yyerror(s)
* Node Creation Functions *
* *
**********************************************************************/