- use our naming scheme for patches

This commit is contained in:
ajacoutot 2007-10-26 22:10:06 +00:00
parent 6f6a7ef275
commit 7ac854d6fb
18 changed files with 339 additions and 526 deletions

View File

@ -0,0 +1,58 @@
$OpenBSD: patch-Makefile,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
--- Makefile.orig Tue Oct 27 00:11:04 1992
+++ Makefile Sat Oct 27 00:02:51 2007
@@ -2,14 +2,14 @@
# Makefile for the minimal build for an archie Prospero client.
#
# Your C compiler:
-#CC=cc
+CC=cc
# For most systems, these OPTIONS will suffice. Exceptions:
#
# * If you're on a Stardent, add -43
# * If you're running EP/IX, you may need to add -systype bsd43
# but try it without it first.
-OPTIONS= -O -I. -I/usr/netinclude -I/usr/ucbinclude
+OPTIONS= -I.
# For this, DEFINES is usually ok as-is. Try it without any of these
# first; if some stuff fails or shows up undefined, then come back and
@@ -30,7 +30,7 @@ OPTIONS= -O -I. -I/usr/netinclude -I/usr/ucbinclude
# * if your system is lacking strspn(), add -DSTRSPN
# * if you're using the unbundled SparcCompiler on a
# Solaris 2 system, add -DSOLARIS2
-DEFINES= -DDEBUG
+DEFINES= -DNOREGEX
# The default Archie server; choose one of:
# archie.ans.net (USA [NY])
@@ -53,7 +53,7 @@ ARCHIE= archie.sura.net
# you defined ARCHIE_HOST as), you need to add `-lresolv'.
#
# * If you need the PW library (e.g. A/UX), add -lPW
-LDFLAGS=
+#LDFLAGS=
# If you're using ISC, use:
#LDFLAGS= -linet
# If you're using Wallongong TCP/IP on an AT&T box, use:
@@ -73,7 +73,7 @@ LDFLAGS=
# Yer' done....make archie.
# =========================
#
-CFLAGS=$(OPTIONS) $(DEFINES) -DARCHIE_HOST=\"$(ARCHIE)\"
+CFLAGS+=$(OPTIONS) $(DEFINES) -DARCHIE_HOST=\"$(ARCHIE)\"
VERSION=1.4.1
VMS_VERSION=`echo $(VERSION) | sed -e 's,\\.,_,g'`
@@ -84,6 +84,10 @@ OBJS= aquery.o archie.o atalloc.o dirsend.o get_pauth.
vlalloc.o vl_comp.o
all: archie
+
+install:
+ ${BSD_INSTALL_PROGRAM} archie ${PREFIX}/bin/
+ ${BSD_INSTALL_MAN} archie.man ${PREFIX}/man/man1/archie.1
archie: $(OBJS)
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)

View File

@ -1,98 +0,0 @@
$OpenBSD: patch-aa,v 1.2 2001/03/12 16:10:52 wilfried Exp $
*** Makefile.orig Tue Oct 27 00:11:04 1992
--- Makefile Mon Mar 12 17:10:17 2001
***************
*** 2,15 ****
# Makefile for the minimal build for an archie Prospero client.
#
# Your C compiler:
! #CC=cc
# For most systems, these OPTIONS will suffice. Exceptions:
#
# * If you're on a Stardent, add -43
# * If you're running EP/IX, you may need to add -systype bsd43
# but try it without it first.
! OPTIONS= -O -I. -I/usr/netinclude -I/usr/ucbinclude
# For this, DEFINES is usually ok as-is. Try it without any of these
# first; if some stuff fails or shows up undefined, then come back and
--- 2,15 ----
# Makefile for the minimal build for an archie Prospero client.
#
# Your C compiler:
! CC=cc
# For most systems, these OPTIONS will suffice. Exceptions:
#
# * If you're on a Stardent, add -43
# * If you're running EP/IX, you may need to add -systype bsd43
# but try it without it first.
! OPTIONS= -I.
# For this, DEFINES is usually ok as-is. Try it without any of these
# first; if some stuff fails or shows up undefined, then come back and
***************
*** 30,36 ****
# * if your system is lacking strspn(), add -DSTRSPN
# * if you're using the unbundled SparcCompiler on a
# Solaris 2 system, add -DSOLARIS2
! DEFINES= -DDEBUG
# The default Archie server; choose one of:
# archie.ans.net (USA [NY])
--- 30,36 ----
# * if your system is lacking strspn(), add -DSTRSPN
# * if you're using the unbundled SparcCompiler on a
# Solaris 2 system, add -DSOLARIS2
! DEFINES= -DNOREGEX
# The default Archie server; choose one of:
# archie.ans.net (USA [NY])
***************
*** 53,59 ****
# you defined ARCHIE_HOST as), you need to add `-lresolv'.
#
# * If you need the PW library (e.g. A/UX), add -lPW
! LDFLAGS=
# If you're using ISC, use:
#LDFLAGS= -linet
# If you're using Wallongong TCP/IP on an AT&T box, use:
--- 53,59 ----
# you defined ARCHIE_HOST as), you need to add `-lresolv'.
#
# * If you need the PW library (e.g. A/UX), add -lPW
! #LDFLAGS=
# If you're using ISC, use:
#LDFLAGS= -linet
# If you're using Wallongong TCP/IP on an AT&T box, use:
***************
*** 73,79 ****
# Yer' done....make archie.
# =========================
#
! CFLAGS=$(OPTIONS) $(DEFINES) -DARCHIE_HOST=\"$(ARCHIE)\"
VERSION=1.4.1
VMS_VERSION=`echo $(VERSION) | sed -e 's,\\.,_,g'`
--- 73,79 ----
# Yer' done....make archie.
# =========================
#
! CFLAGS+=$(OPTIONS) $(DEFINES) -DARCHIE_HOST=\"$(ARCHIE)\"
VERSION=1.4.1
VMS_VERSION=`echo $(VERSION) | sed -e 's,\\.,_,g'`
***************
*** 84,89 ****
--- 84,93 ----
vlalloc.o vl_comp.o
all: archie
+
+ install:
+ ${BSD_INSTALL_PROGRAM} archie ${PREFIX}/bin/
+ ${BSD_INSTALL_MAN} archie.man ${PREFIX}/man/man1/archie.1
archie: $(OBJS)
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)

View File

@ -1,36 +0,0 @@
*** archie.h.orig Fri Oct 21 00:25:42 1994
--- archie.h Fri Oct 21 00:26:59 1994
***************
*** 8,15 ****
/* You can't touch this. */
#ifndef XARCHIE
! # define ARCHIES "archie.ans.net (USA [NY])","archie.rutgers.edu (USA [NJ])","archie.sura.net (USA [MD])","archie.unl.edu (USA [NE])","archie.mcgill.ca (Canada)","archie.funet.fi (Finland/Mainland Europe)","archie.au (Australia)","archie.doc.ic.ac.uk (Great Britain/Ireland)","archie.wide.ad.jp (Japan)","archie.ncu.edu.tw (Taiwan)"
! # define NARCHIES 10
#endif
/*
--- 8,30 ----
/* You can't touch this. */
#ifndef XARCHIE
! /* Dated: March 13th, 1996 */
! # define ARCHIES "archie.au (Australia)","archie.uni-linz.ac.at (Austria)", \
! "archie.univie.ac.at (Austria)","archie.cs.mcgill.ca (Canada)", \
! "archie.uqam.ca (Canada)","archie.funet.fi (Finland)", \
! "archie.univ-rennes1.fr (France","archie.th-darmstadt.de (Germany)", \
! "archie.ac.il (Israel)","archie.unipi.it (Italy)", \
! "archie.wide.ad.jp (Japan)","archie.hana.nm.kr (Korea)", \
! "archie.sogang.ac.kr (Korea)","archie.uninett.no (Norway)", \
! "archie.uct.ac.za (South Africa [CT])", \
! "archie.rediris.es (Spain)","archie.luth.se (Sweden)", \
! "archie.switch.ch (Switzerland)","archie.twnic.net (Taiwan)", \
! "archie.ncu.edu.tw (Taiwan)","archie.doc.ic.ac.uk (United Kingdom)", \
! "archie.hensa.ac.uk (United Kingdom)","archie.unl.edu (USA [NE])", \
! "archie.internic.net (USA [NJ])","archie.rutgers.edu (USA [NJ])", \
! "archie.ans.net (USA [NY])","archie.sura.net (USA [MD])"
! # define NARCHIES 27
!
#endif
/*

View File

@ -1,57 +0,0 @@
*** archie.c.orig Mon Oct 26 14:00:33 1992
--- archie.c Thu Jul 16 10:09:55 1998
***************
*** 73,79 ****
void usage ();
extern char *getenv ();
! void
main (argc, argv)
int argc;
char **argv;
--- 73,79 ----
void usage ();
extern char *getenv ();
! int
main (argc, argv)
int argc;
char **argv;
*** procquery.c.orig Sun Oct 25 17:46:26 1992
--- procquery.c Thu Jul 16 10:07:13 1998
***************
*** 174,180 ****
Query query;
{
VLINK l;
! long now;
/* initialize data structures for this query */
(void)time(&now);
--- 174,180 ----
Query query;
{
VLINK l;
! time_t now;
/* initialize data structures for this query */
(void)time(&now);
*** regex.c.orig Tue Oct 20 16:57:58 1992
--- regex.c Thu Jul 16 10:09:33 1998
***************
*** 447,453 ****
static char *bol;
static char *bopat[MAXTAG];
static char *eopat[MAXTAG];
! char *pmatch();
/*
* re_exec:
--- 447,453 ----
static char *bol;
static char *bopat[MAXTAG];
static char *eopat[MAXTAG];
! static char *pmatch();
/*
* re_exec:

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-archie_c,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
--- archie.c.orig Mon Oct 26 23:00:33 1992
+++ archie.c Sat Oct 27 00:02:51 2007
@@ -73,7 +73,7 @@ extern int rdgram_priority;
void usage ();
extern char *getenv ();
-void
+int
main (argc, argv)
int argc;
char **argv;

View File

@ -0,0 +1,29 @@
$OpenBSD: patch-archie_h,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
--- archie.h.orig Mon Oct 26 23:36:04 1992
+++ archie.h Sat Oct 27 00:02:51 2007
@@ -8,8 +8,23 @@
/* You can't touch this. */
#ifndef XARCHIE
-# define ARCHIES "archie.ans.net (USA [NY])","archie.rutgers.edu (USA [NJ])","archie.sura.net (USA [MD])","archie.unl.edu (USA [NE])","archie.mcgill.ca (Canada)","archie.funet.fi (Finland/Mainland Europe)","archie.au (Australia)","archie.doc.ic.ac.uk (Great Britain/Ireland)","archie.wide.ad.jp (Japan)","archie.ncu.edu.tw (Taiwan)"
-# define NARCHIES 10
+/* Dated: March 13th, 1996 */
+# define ARCHIES "archie.au (Australia)","archie.uni-linz.ac.at (Austria)", \
+ "archie.univie.ac.at (Austria)","archie.cs.mcgill.ca (Canada)", \
+ "archie.uqam.ca (Canada)","archie.funet.fi (Finland)", \
+ "archie.univ-rennes1.fr (France","archie.th-darmstadt.de (Germany)", \
+ "archie.ac.il (Israel)","archie.unipi.it (Italy)", \
+ "archie.wide.ad.jp (Japan)","archie.hana.nm.kr (Korea)", \
+ "archie.sogang.ac.kr (Korea)","archie.uninett.no (Norway)", \
+"archie.uct.ac.za (South Africa [CT])", \
+ "archie.rediris.es (Spain)","archie.luth.se (Sweden)", \
+ "archie.switch.ch (Switzerland)","archie.twnic.net (Taiwan)", \
+ "archie.ncu.edu.tw (Taiwan)","archie.doc.ic.ac.uk (United Kingdom)", \
+ "archie.hensa.ac.uk (United Kingdom)","archie.unl.edu (USA [NE])", \
+ "archie.internic.net (USA [NJ])","archie.rutgers.edu (USA [NJ])", \
+ "archie.ans.net (USA [NY])","archie.sura.net (USA [MD])"
+# define NARCHIES 27
+
#endif
/*

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-procquery_c,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
--- procquery.c.orig Mon Oct 26 02:46:26 1992
+++ procquery.c Sat Oct 27 00:02:51 2007
@@ -174,7 +174,7 @@ int max_hits,offset;
Query query;
{
VLINK l;
- long now;
+ time_t now;
/* initialize data structures for this query */
(void)time(&now);

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-regex_c,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
--- regex.c.orig Wed Oct 21 00:57:58 1992
+++ regex.c Sat Oct 27 00:02:51 2007
@@ -447,7 +447,7 @@ char *pat;
static char *bol;
static char *bopat[MAXTAG];
static char *eopat[MAXTAG];
-char *pmatch();
+static char *pmatch();
/*
* re_exec:

View File

@ -0,0 +1,45 @@
$OpenBSD: patch-Makefile_in,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
--- Makefile.in.orig Fri Sep 9 17:35:20 1994
+++ Makefile.in Sat Oct 27 00:05:07 2007
@@ -10,8 +10,7 @@
# try uncommenting the 'gcc' line and commenting the 'cc' one.
# Tintin++ doesn't *need* an ANSI compiler anymore, but gcc
# is still better than cc on many platforms...
-CC = @CC@ -O
-CFLAGS = @DEFS@
+CFLAGS += @DEFS@
LIBS = @LIBS@
PIPE = @PIPE@
# If you plan on doing debugging (with gdb), it is very helpful to turn all
@@ -22,10 +21,10 @@ PIPE = @PIPE@
# BINDIR is the directory you wish tt++ to be placed if you wish to use
# make install.
-BINDIR = ..
+BINDIR = /usr/local/bin
# DEFAULT_FILE_DIR is the path to tintin files.
-DEFAULT_FILE_DIR = @HOME@
+DEFAULT_FILE_DIR = /usr/local/lib/tintin
#########################################
# You shouldn't need to change anything #
@@ -41,14 +40,15 @@ CFILES = main.c parse.c action.c alias.c substitute.c
variables.c highlight.c antisub.c ivars.c help.c text.c glob.c
OFILES = $(CFILES:.c=.o)
-all: tintin++ install
+all: tintin++
tintin++: $(OFILES) tintin.h
@echo "Linking..."
$(CC) $(CFLAGS) $(FFLAGS) $(LFLAGS) -o tt++ $(OFILES) $(LIBS)
-install: all
- @./install.sh $(BINDIR) $(DEFAULT_FILE_DIR) $(COMPRESSED_HELP)
+install:
+ @mkdir -p $(DEFAULT_FILE_DIR)
+ @./install.sh $(BINDIR) $(DEFAULT_FILE_DIR) Ok
# Autocompile all .c files into .o files using this rule:
.c.o:

View File

@ -1,160 +0,0 @@
*** Makefile.in.orig Fri Sep 9 19:35:20 1994
--- Makefile.in Tue Nov 15 02:07:48 1994
***************
*** 10,17 ****
# try uncommenting the 'gcc' line and commenting the 'cc' one.
# Tintin++ doesn't *need* an ANSI compiler anymore, but gcc
# is still better than cc on many platforms...
! CC = @CC@ -O
! CFLAGS = @DEFS@
LIBS = @LIBS@
PIPE = @PIPE@
# If you plan on doing debugging (with gdb), it is very helpful to turn all
--- 10,16 ----
# try uncommenting the 'gcc' line and commenting the 'cc' one.
# Tintin++ doesn't *need* an ANSI compiler anymore, but gcc
# is still better than cc on many platforms...
! CFLAGS += @DEFS@
LIBS = @LIBS@
PIPE = @PIPE@
# If you plan on doing debugging (with gdb), it is very helpful to turn all
***************
*** 22,31 ****
# BINDIR is the directory you wish tt++ to be placed if you wish to use
# make install.
! BINDIR = ..
# DEFAULT_FILE_DIR is the path to tintin files.
! DEFAULT_FILE_DIR = @HOME@
#########################################
# You shouldn't need to change anything #
--- 21,30 ----
# BINDIR is the directory you wish tt++ to be placed if you wish to use
# make install.
! BINDIR = /usr/local/bin
# DEFAULT_FILE_DIR is the path to tintin files.
! DEFAULT_FILE_DIR = /usr/local/lib/tintin
#########################################
# You shouldn't need to change anything #
***************
*** 41,54 ****
variables.c highlight.c antisub.c ivars.c help.c text.c glob.c
OFILES = $(CFILES:.c=.o)
! all: tintin++ install
tintin++: $(OFILES) tintin.h
@echo "Linking..."
$(CC) $(CFLAGS) $(FFLAGS) $(LFLAGS) -o tt++ $(OFILES) $(LIBS)
! install: all
! @./install.sh $(BINDIR) $(DEFAULT_FILE_DIR) $(COMPRESSED_HELP)
# Autocompile all .c files into .o files using this rule:
.c.o:
--- 40,54 ----
variables.c highlight.c antisub.c ivars.c help.c text.c glob.c
OFILES = $(CFILES:.c=.o)
! all: tintin++
tintin++: $(OFILES) tintin.h
@echo "Linking..."
$(CC) $(CFLAGS) $(FFLAGS) $(LFLAGS) -o tt++ $(OFILES) $(LIBS)
! install:
! @mkdir -p $(DEFAULT_FILE_DIR)
! @./install.sh $(BINDIR) $(DEFAULT_FILE_DIR) Ok
# Autocompile all .c files into .o files using this rule:
.c.o:
*** configure.old Sun Aug 28 14:06:38 1994
--- configure Tue Nov 15 01:42:46 1994
***************
*** 474,489 ****
OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -pipe"
! echo "Do you want the helpfile to be compressed (yes/no)? "
! read YESNO
! if test $YESNO; then
! if echo "$YESNO"|grep -i "no" >/dev/null; then
! DEFS="$DEFS -DCOMPRESSED_HELP=0"
! else
! DEFS="$DEFS -DCOMPRESSED_HELP=1"
! COMPRESSED_HELP="Ok"
! fi
! fi
test -n "$silent" || echo "checking for -pipe"
cat > conftest.${ac_ext} <<EOF
--- 474,492 ----
OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -pipe"
! DEFS="$DEFS -DCOMPRESSED_HELP=1"
! COMPRESSED_HELP="Ok"
!
! #echo "Do you want the helpfile to be compressed (yes/no)? "
! #read YESNO
! #if test $YESNO; then
! # if echo "$YESNO"|grep -i "no" >/dev/null; then
! # DEFS="$DEFS -DCOMPRESSED_HELP=0"
! # else
! # DEFS="$DEFS -DCOMPRESSED_HELP=1"
! # COMPRESSED_HELP="Ok"
! # fi
! #fi
test -n "$silent" || echo "checking for -pipe"
cat > conftest.${ac_ext} <<EOF
***************
*** 854,860 ****
:;
fi
! for ac_func in bcopy
do
ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
test -n "$silent" || echo "checking for ${ac_func}"
--- 857,863 ----
:;
fi
! for ac_func in
do
ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
test -n "$silent" || echo "checking for ${ac_func}"
*** install.sh.old Fri Sep 9 05:43:26 1994
--- install.sh Tue Nov 15 02:05:24 1994
***************
*** 5,16 ****
echo " "
echo "Copying the tintin++ executable to \"$1\"..."
! strip tt++
! cp tt++ "$1"
echo "Copying the tintin++ help file to \"$2\"..."
if [ "$3" ]; then
! cp support/.tt_help.txt.Z "$2/"
else
echo Uncompressing.
uncompress -c support/.tt_help.txt.Z | cat > "$2"/.tt_help.txt
--- 5,15 ----
echo " "
echo "Copying the tintin++ executable to \"$1\"..."
! install -c -s -o bin -g bin -m 555 tt++ "$1"
echo "Copying the tintin++ help file to \"$2\"..."
if [ "$3" ]; then
! install -c -o bin -g bin -m 444 support/.tt_help.txt.Z "$2"
else
echo Uncompressing.
uncompress -c support/.tt_help.txt.Z | cat > "$2"/.tt_help.txt

View File

@ -1,175 +0,0 @@
*** utils.c.old Sun Aug 28 18:12:16 1994
--- utils.c Tue Nov 15 01:58:20 1994
***************
*** 21,26 ****
--- 21,28 ----
#include <unistd.h>
#endif
+ #include <sys/param.h>
+
void syserr();
/*********************************************/
***************
*** 56,62 ****
--- 58,66 ----
char *msg;
{
extern int errno, sys_nerr;
+ #if !defined(BSD) || (BSD < 199306)
extern char *sys_errlist[];
+ #endif
fprintf(stderr,"ERROR: %s (%d",msg, errno);
if(errno>0 && errno<sys_nerr)
*** parse.c.bak Sun Aug 28 18:12:10 1994
--- parse.c Tue Nov 15 02:21:20 1994
***************
*** 670,679 ****
if(ses && !PSEUDO_PROMPT)
write_line_mud("", ses);
else if (!is_split)
! write(1,"> ", 3);
else {
sprintf(strng,"8> 7[%d;%df", input_row, input_col);
! write(1,strng, strlen(strng)+1);
display_col+=2;
}
}
--- 670,679 ----
if(ses && !PSEUDO_PROMPT)
write_line_mud("", ses);
else if (!is_split)
! write(1,"> ", 2);
else {
sprintf(strng,"8> 7[%d;%df", input_row, input_col);
! write(1,strng, strlen(strng));
display_col+=2;
}
}
*** misc.c.bak Sun Aug 28 18:12:08 1994
--- misc.c Tue Nov 15 02:28:26 1994
***************
*** 106,112 ****
char temp[2];
temp[0]=7;
temp[1]=0;
! write(1, temp, 2);
}
--- 106,112 ----
char temp[2];
temp[0]=7;
temp[1]=0;
! write(1, temp, 1);
}
***************
*** 172,178 ****
cleanup_session(sesptr);
ses=NULL;
if (is_split)
! write(1, "c", 3);
tintin_puts2("TINTIN suffers from bloodlack, and the lack of a beating heart...", ses);
tintin_puts2("TINTIN is dead! R.I.P.", ses);
tintin_puts2("Your blood freezes as you hear TINTIN's death cry.", ses);
--- 172,178 ----
cleanup_session(sesptr);
ses=NULL;
if (is_split)
! write(1, "c", 2);
tintin_puts2("TINTIN suffers from bloodlack, and the lack of a beating heart...", ses);
tintin_puts2("TINTIN is dead! R.I.P.", ses);
tintin_puts2("Your blood freezes as you hear TINTIN's death cry.", ses);
*** main.c.bak Sun Aug 28 18:12:06 1994
--- main.c Tue Nov 15 02:33:37 1994
***************
*** 562,568 ****
if(ses->logfile) {
if (!OLD_LOG) {
count=0;
! for(n=0;n<=didget;n++)
if (buffer[n]!='\r') {
temp[count]=buffer[n];
count++;
--- 562,568 ----
if(ses->logfile) {
if (!OLD_LOG) {
count=0;
! for(n=0;n<didget;n++)
if (buffer[n]!='\r') {
temp[count]=buffer[n];
count++;
***************
*** 732,738 ****
sprintf(strng,"%c8%s\n\r%c7%c[%d;%df", E, cptr, E, E, input_row, input_col);
else
sprintf(strng,"%s\n\r", cptr);
! write(1,strng, strlen(strng)+1);
display_col=1;
if (redraw && term_echoing && !is_split)
write(1, k_input, strlen(k_input));
--- 732,738 ----
sprintf(strng,"%c8%s\n\r%c7%c[%d;%df", E, cptr, E, E, input_row, input_col);
else
sprintf(strng,"%s\n\r", cptr);
! write(1,strng, strlen(strng));
display_col=1;
if (redraw && term_echoing && !is_split)
write(1, k_input, strlen(k_input));
***************
*** 764,770 ****
cptr++;
sprintf(strng,"%s\n\r", cptr);
}
! write(1,strng, strlen(strng)+1);
display_col=1;
}
text_came=TRUE;
--- 764,770 ----
cptr++;
sprintf(strng,"%s\n\r", cptr);
}
! write(1,strng, strlen(strng));
display_col=1;
}
text_came=TRUE;
***************
*** 832,838 ****
input_col=1;
sprintf(fn, "%c[2J%c[1;%dr%c[%d;1f", E, E, display_row, E, split_line);
write(1,fn, strlen(fn));
! write(1,"-------------------------------------------------------------------------------", 80);
sprintf(fn, "%c[%d;1f%c7", E, split_line-1, E);
write(1,fn,strlen(fn));
sprintf(fn, "%c[%d;1f", E, input_row);
--- 832,838 ----
input_col=1;
sprintf(fn, "%c[2J%c[1;%dr%c[%d;1f", E, E, display_row, E, split_line);
write(1,fn, strlen(fn));
! write(1,"--------------------------------------------------------------------------------", 80);
sprintf(fn, "%c[%d;1f%c7", E, split_line-1, E);
write(1,fn,strlen(fn));
sprintf(fn, "%c[%d;1f", E, input_row);
*** net.c.bak Sun Aug 28 18:12:10 1994
--- net.c Tue Nov 15 03:27:09 1994
***************
*** 80,86 ****
tintin_puts("#Trying to connect..", ses);
! alarm(15); /* We'll allow connect to hang in 15seconds! NO MORE! */
ticker_interrupted=FALSE;
connectresult=connect(sock, (struct sockaddr *)&sockaddr, sizeof(sockaddr));
#if defined(DEBUG)
--- 80,86 ----
tintin_puts("#Trying to connect..", ses);
! alarm(30); /* We'll allow connect to hang in 30seconds! NO MORE! */
ticker_interrupted=FALSE;
connectresult=connect(sock, (struct sockaddr *)&sockaddr, sizeof(sockaddr));
#if defined(DEBUG)

View File

@ -0,0 +1,43 @@
$OpenBSD: patch-configure,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
--- configure.orig Sun Aug 28 12:06:38 1994
+++ configure Sat Oct 27 00:05:07 2007
@@ -474,17 +474,20 @@ fi
OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -pipe"
-echo "Do you want the helpfile to be compressed (yes/no)? "
-read YESNO
-if test $YESNO; then
- if echo "$YESNO"|grep -i "no" >/dev/null; then
- DEFS="$DEFS -DCOMPRESSED_HELP=0"
- else
- DEFS="$DEFS -DCOMPRESSED_HELP=1"
- COMPRESSED_HELP="Ok"
- fi
-fi
+DEFS="$DEFS -DCOMPRESSED_HELP=1"
+COMPRESSED_HELP="Ok"
+#echo "Do you want the helpfile to be compressed (yes/no)? "
+#read YESNO
+#if test $YESNO; then
+# if echo "$YESNO"|grep -i "no" >/dev/null; then
+# DEFS="$DEFS -DCOMPRESSED_HELP=0"
+# else
+# DEFS="$DEFS -DCOMPRESSED_HELP=1"
+# COMPRESSED_HELP="Ok"
+# fi
+#fi
+
test -n "$silent" || echo "checking for -pipe"
cat > conftest.${ac_ext} <<EOF
#include "confdefs.h"
@@ -854,7 +857,7 @@ else
:;
fi
-for ac_func in bcopy
+for ac_func in
do
ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
test -n "$silent" || echo "checking for ${ac_func}"

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-install_sh,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
--- install.sh.orig Fri Sep 9 03:43:26 1994
+++ install.sh Sat Oct 27 00:05:07 2007
@@ -5,12 +5,11 @@
echo " "
echo "Copying the tintin++ executable to \"$1\"..."
-strip tt++
-cp tt++ "$1"
+install -c -s -o bin -g bin -m 555 tt++ "$1"
echo "Copying the tintin++ help file to \"$2\"..."
if [ "$3" ]; then
- cp support/.tt_help.txt.Z "$2/"
+ install -c -o bin -g bin -m 444 support/.tt_help.txt.Z "$2"
else
echo Uncompressing.
uncompress -c support/.tt_help.txt.Z | cat > "$2"/.tt_help.txt

View File

@ -0,0 +1,39 @@
$OpenBSD: patch-main_c,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
--- main.c.orig Sun Aug 28 16:12:06 1994
+++ main.c Sat Oct 27 00:05:07 2007
@@ -562,7 +562,7 @@ void read_mud(ses)
if(ses->logfile) {
if (!OLD_LOG) {
count=0;
- for(n=0;n<=didget;n++)
+ for(n=0;n<didget;n++)
if (buffer[n]!='\r') {
temp[count]=buffer[n];
count++;
@@ -732,7 +732,7 @@ void tintin_puts2(cptr, ses)
sprintf(strng,"%c8%s\n\r%c7%c[%d;%df", E, cptr, E, E, input_row, input_col);
else
sprintf(strng,"%s\n\r", cptr);
- write(1,strng, strlen(strng)+1);
+ write(1,strng, strlen(strng));
display_col=1;
if (redraw && term_echoing && !is_split)
write(1, k_input, strlen(k_input));
@@ -764,7 +764,7 @@ void tintin_puts3(cptr, ses)
cptr++;
sprintf(strng,"%s\n\r", cptr);
}
- write(1,strng, strlen(strng)+1);
+ write(1,strng, strlen(strng));
display_col=1;
}
text_came=TRUE;
@@ -832,7 +832,7 @@ void split_command(arg)
input_col=1;
sprintf(fn, "%c[2J%c[1;%dr%c[%d;1f", E, E, display_row, E, split_line);
write(1,fn, strlen(fn));
- write(1,"-------------------------------------------------------------------------------", 80);
+ write(1,"--------------------------------------------------------------------------------", 80);
sprintf(fn, "%c[%d;1f%c7", E, split_line-1, E);
write(1,fn,strlen(fn));
sprintf(fn, "%c[%d;1f", E, input_row);

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-misc_c,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
--- misc.c.orig Sun Aug 28 16:12:08 1994
+++ misc.c Sat Oct 27 00:05:07 2007
@@ -106,7 +106,7 @@ void bell_command(ses)
char temp[2];
temp[0]=7;
temp[1]=0;
- write(1, temp, 2);
+ write(1, temp, 1);
}
@@ -172,7 +172,7 @@ void end_command(command, ses)
cleanup_session(sesptr);
ses=NULL;
if (is_split)
- write(1, "c", 3);
+ write(1, "c", 2);
tintin_puts2("TINTIN suffers from bloodlack, and the lack of a beating heart...", ses);
tintin_puts2("TINTIN is dead! R.I.P.", ses);
tintin_puts2("Your blood freezes as you hear TINTIN's death cry.", ses);

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-net_c,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
--- net.c.orig Sun Aug 28 16:12:10 1994
+++ net.c Sat Oct 27 00:05:07 2007
@@ -80,7 +80,7 @@ int connect_mud(host, port, ses)
tintin_puts("#Trying to connect..", ses);
- alarm(15); /* We'll allow connect to hang in 15seconds! NO MORE! */
+ alarm(30); /* We'll allow connect to hang in 30seconds! NO MORE! */
ticker_interrupted=FALSE;
connectresult=connect(sock, (struct sockaddr *)&sockaddr, sizeof(sockaddr));
#if defined(DEBUG)

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-parse_c,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
--- parse.c.orig Sun Aug 28 16:12:10 1994
+++ parse.c Sat Oct 27 00:05:07 2007
@@ -670,10 +670,10 @@ void prompt(ses)
if(ses && !PSEUDO_PROMPT)
write_line_mud("", ses);
else if (!is_split)
- write(1,"> ", 3);
+ write(1,"> ", 2);
else {
sprintf(strng,"8> 7[%d;%df", input_row, input_col);
- write(1,strng, strlen(strng)+1);
+ write(1,strng, strlen(strng));
display_col+=2;
}
}

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-utils_c,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
--- utils.c.orig Sun Aug 28 16:12:16 1994
+++ utils.c Sat Oct 27 00:05:07 2007
@@ -21,6 +21,8 @@
#include <unistd.h>
#endif
+#include <sys/param.h>
+
void syserr();
/*********************************************/
@@ -56,7 +58,9 @@ void syserr(msg)
char *msg;
{
extern int errno, sys_nerr;
+#if !defined(BSD) || (BSD < 199306)
extern char *sys_errlist[];
+#endif
fprintf(stderr,"ERROR: %s (%d",msg, errno);
if(errno>0 && errno<sys_nerr)