Make paging *not* be the default. Also regenerate patches with new naming
scheme while I'm at it.
This commit is contained in:
parent
bceccac395
commit
8ed18b6667
@ -1,9 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2001/05/06 05:00:00 lebel Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2001/05/14 16:42:49 millert Exp $
|
||||
# $NetBSD: Makefile,v 1.6 1998/04/15 11:15:34 frueauf Exp $
|
||||
|
||||
COMMENT= "Internet CB - mostly-defunct chat client"
|
||||
|
||||
DISTNAME= icb-5.0.9
|
||||
PKGNAME= icb-5.0.9p1
|
||||
CATEGORIES= net
|
||||
NEED_VERSION= 1.402
|
||||
MASTER_SITES= ftp://ftp.swcp.com/pub/icb/clients/unix/
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- murgil/clientserve.c.orig Fri Feb 24 16:19:39 1995
|
||||
+++ murgil/clientserve.c Sun Jan 16 01:34:58 2000
|
||||
@@ -41,7 +41,7 @@
|
||||
/* look at tty fd */
|
||||
FD_SET(0,&fdset); /**/
|
||||
|
||||
- signal(SIGALRM, gotalarm);
|
||||
+ signal(SIGALRM, (void *)gotalarm);
|
||||
timeisup = 0;
|
||||
|
||||
for (;;) {
|
@ -1,11 +0,0 @@
|
||||
--- murgil/getrname.c.orig Fri Feb 24 16:19:41 1995
|
||||
+++ murgil/getrname.c Sun Jan 16 01:35:00 2000
|
||||
@@ -14,7 +14,7 @@
|
||||
{
|
||||
static char rname[24];
|
||||
struct hostent *host;
|
||||
-#if defined(linux)
|
||||
+#if defined(linux) || defined(__OpenBSD__)
|
||||
#define PEER_CAST (struct sockaddr *)
|
||||
#define HOST_CAST (char *)
|
||||
#else
|
@ -1,11 +0,0 @@
|
||||
--- murgil/serverserve.c.orig Fri Feb 24 16:19:44 1995
|
||||
+++ murgil/serverserve.c Sun Jan 16 01:35:02 2000
|
||||
@@ -33,7 +33,7 @@
|
||||
if (port_fd > highestfd)
|
||||
highestfd = port_fd;
|
||||
|
||||
- signal(SIGALRM, gotalarm);
|
||||
+ signal(SIGALRM, (void *)gotalarm);
|
||||
timeisup = 0;
|
||||
|
||||
for (;;) {
|
@ -1,18 +0,0 @@
|
||||
--- icb/strings.c.orig Fri Feb 24 16:20:30 1995
|
||||
+++ icb/strings.c Sun Jan 16 01:45:47 2000
|
||||
@@ -333,6 +333,7 @@
|
||||
/* cat multiple strings into one */
|
||||
/* call with strscat(dest, src, src, ...) */
|
||||
|
||||
+#if 0
|
||||
char *
|
||||
strscat(va_alist)
|
||||
va_dcl
|
||||
@@ -357,6 +358,7 @@
|
||||
*dest = '\0';
|
||||
return(dest);
|
||||
}
|
||||
+#endif
|
||||
|
||||
char *basename(path)
|
||||
char *path;
|
@ -1,10 +0,0 @@
|
||||
--- icb/globals.c.orig Sun Jan 16 05:13:12 2000
|
||||
+++ icb/globals.c Sun Jan 16 05:13:51 2000
|
||||
@@ -59,6 +59,7 @@
|
||||
1, /* beeps */
|
||||
"vi", /* editmode */
|
||||
0, /* tabreply */
|
||||
+ 0, /* printtime */
|
||||
1, /* cute */
|
||||
0, /* autodel */
|
||||
"", /* personalto */
|
@ -1,14 +0,0 @@
|
||||
--- icb/helpdata.c.orig Sun Jan 16 05:17:17 2000
|
||||
+++ icb/helpdata.c Sun Jan 16 05:20:39 2000
|
||||
@@ -600,6 +600,11 @@
|
||||
" waiting for your screen, this gives you a chance to see the output",
|
||||
" of your command.",
|
||||
"",
|
||||
+"printtime (boolean) default: false",
|
||||
+"",
|
||||
+" Print the current time in front of every line sent to the display",
|
||||
+" and log file.",
|
||||
+"",
|
||||
"restricted (boolean) default: false",
|
||||
"",
|
||||
" Restricted shuts off the ability to run subshell commands or to",
|
14
net/icb/patches/patch-icb_bindings
Normal file
14
net/icb/patches/patch-icb_bindings
Normal file
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-icb_bindings,v 1.1 2001/05/14 16:42:53 millert Exp $
|
||||
--- icb/bindings.orig Fri Feb 24 14:20:17 1995
|
||||
+++ icb/bindings Mon May 14 10:33:06 2001
|
||||
@@ -36,8 +36,8 @@ proc m {args} {
|
||||
eval s_personal $args
|
||||
}
|
||||
|
||||
-# paging is now the default (!)
|
||||
-oset pagesize -1
|
||||
+# do not page by default
|
||||
+oset pagesize 0
|
||||
|
||||
c_usage add tcl g "tcl command" "pass command to tcl without quoting"
|
||||
c_usage add oset g "\[variable\] \[value\]" "view or set an icb variable"
|
@ -1,5 +1,6 @@
|
||||
--- icb/c_log.c.orig Fri Feb 24 16:20:18 1995
|
||||
+++ icb/c_log.c Sat Aug 26 22:41:27 2000
|
||||
$OpenBSD: patch-icb_c_log_c,v 1.1 2001/05/14 16:42:53 millert Exp $
|
||||
--- icb/c_log.c.orig Fri Feb 24 14:20:18 1995
|
||||
+++ icb/c_log.c Mon May 14 10:33:04 2001
|
||||
@@ -6,6 +6,7 @@
|
||||
#include "icb.h"
|
||||
#include "externs.h"
|
||||
@ -8,7 +9,7 @@
|
||||
|
||||
FILE *logfp = NULL;
|
||||
|
||||
@@ -45,8 +46,10 @@
|
||||
@@ -45,8 +46,10 @@ char *path;
|
||||
time_t time();
|
||||
struct tm *t, *localtime();
|
||||
time_t clock;
|
||||
@ -19,7 +20,7 @@
|
||||
|
||||
/* determine pathname to use */
|
||||
if (path == NULL || *path == '\0')
|
||||
@@ -97,8 +100,8 @@
|
||||
@@ -97,8 +100,8 @@ char *path;
|
||||
aptr++;
|
||||
|
||||
/* timestamp it */
|
||||
@ -30,7 +31,7 @@
|
||||
putl(mbuf, PL_SCR | PL_LOG);
|
||||
|
||||
return(0);
|
||||
@@ -126,8 +129,8 @@
|
||||
@@ -126,8 +129,8 @@ closesessionlog()
|
||||
aptr++;
|
||||
|
||||
/* timestamp it */
|
@ -1,6 +1,7 @@
|
||||
--- icb/c_shell.c.orig Fri Feb 24 16:20:19 1995
|
||||
+++ icb/c_shell.c Sun Jan 16 05:08:31 2000
|
||||
@@ -14,7 +14,7 @@
|
||||
$OpenBSD: patch-icb_c_shell_c,v 1.1 2001/05/14 16:42:53 millert Exp $
|
||||
--- icb/c_shell.c.orig Fri Feb 24 14:20:19 1995
|
||||
+++ icb/c_shell.c Mon May 14 10:33:03 2001
|
||||
@@ -14,7 +14,7 @@ TARGDEFS
|
||||
static char *usage = "usage: c_shell [command]";
|
||||
int w, pid;
|
||||
int shellout = 0;
|
||||
@ -9,7 +10,7 @@
|
||||
char *shell, *getenv();
|
||||
|
||||
/* disallow use if restricted mode set */
|
||||
@@ -66,7 +66,7 @@
|
||||
@@ -66,7 +66,7 @@ TARGDEFS
|
||||
icbterm();
|
||||
|
||||
/* restore signal processing */
|
12
net/icb/patches/patch-icb_defprocs_c
Normal file
12
net/icb/patches/patch-icb_defprocs_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-icb_defprocs_c,v 1.1 2001/05/14 16:42:53 millert Exp $
|
||||
--- icb/defprocs.c.orig Fri Feb 24 14:20:20 1995
|
||||
+++ icb/defprocs.c Mon May 14 10:33:06 2001
|
||||
@@ -30,7 +30,7 @@ char *defprocs[] =
|
||||
}\n\
|
||||
eval s_personal $args\n\
|
||||
}",
|
||||
- "oset pagesize -1",
|
||||
+ "oset pagesize 0",
|
||||
"c_usage add tcl g \"tcl command\" \"pass command to tcl without quoting\"",
|
||||
"c_usage add oset g \"\\[variable\\] \\[value\\]\" \"view or set an icb variable\"",
|
||||
"c_usage add ounset g \"\\[variable\\]\" \"unset an icb variable\"",
|
11
net/icb/patches/patch-icb_globals_c
Normal file
11
net/icb/patches/patch-icb_globals_c
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-icb_globals_c,v 1.1 2001/05/14 16:42:53 millert Exp $
|
||||
--- icb/globals.c.orig Fri Feb 24 14:20:22 1995
|
||||
+++ icb/globals.c Mon May 14 10:33:05 2001
|
||||
@@ -59,6 +59,7 @@ GLOBS gv = {
|
||||
1, /* beeps */
|
||||
"vi", /* editmode */
|
||||
0, /* tabreply */
|
||||
+ 0, /* printtime */
|
||||
1, /* cute */
|
||||
0, /* autodel */
|
||||
"", /* personalto */
|
24
net/icb/patches/patch-icb_helpdata_c
Normal file
24
net/icb/patches/patch-icb_helpdata_c
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-icb_helpdata_c,v 1.1 2001/05/14 16:42:53 millert Exp $
|
||||
--- icb/helpdata.c.orig Fri Feb 24 14:20:23 1995
|
||||
+++ icb/helpdata.c Mon May 14 10:33:05 2001
|
||||
@@ -573,7 +573,7 @@ char *ht_variables[] =
|
||||
" into the logfile, if logging is active. The value of this variable may",
|
||||
" be overridden for a single replay command by specifying -log or -nolog.",
|
||||
"",
|
||||
-"pagesize (integer) default: -1 (see below)",
|
||||
+"pagesize (integer) default: 0 (see below)",
|
||||
"",
|
||||
" If this is nonzero, paging is in effect, and a more prompt will be",
|
||||
" displayed every pagesize lines. Hitting a space continues, hitting any",
|
||||
@@ -599,6 +599,11 @@ char *ht_variables[] =
|
||||
" shell command is finished. Since a large amount of icb output may be",
|
||||
" waiting for your screen, this gives you a chance to see the output",
|
||||
" of your command.",
|
||||
+"",
|
||||
+"printtime (boolean) default: false",
|
||||
+"",
|
||||
+" Print the current time in front of every line sent to the display",
|
||||
+" and log file.",
|
||||
"",
|
||||
"restricted (boolean) default: false",
|
||||
"",
|
@ -1,6 +1,7 @@
|
||||
--- icb/icb.h.orig Sun Jan 16 05:21:47 2000
|
||||
+++ icb/icb.h Sun Jan 16 05:22:47 2000
|
||||
@@ -38,6 +38,7 @@
|
||||
$OpenBSD: patch-icb_icb_h,v 1.1 2001/05/14 16:42:53 millert Exp $
|
||||
--- icb/icb.h.orig Fri Feb 24 14:20:23 1995
|
||||
+++ icb/icb.h Mon May 14 10:33:06 2001
|
||||
@@ -38,6 +38,7 @@ typedef struct {
|
||||
int beeps; /* whether beeps are audible */
|
||||
char *editmode; /* input editing mode */
|
||||
int tabreply; /* should replies go into the tab history? */
|
@ -1,6 +1,7 @@
|
||||
--- icb/oset.c.orig Sun Jan 16 05:24:09 2000
|
||||
+++ icb/oset.c Sun Jan 16 05:25:55 2000
|
||||
@@ -39,6 +39,7 @@
|
||||
$OpenBSD: patch-icb_oset_c,v 1.1 2001/05/14 16:42:53 millert Exp $
|
||||
--- icb/oset.c.orig Fri Feb 24 14:20:24 1995
|
||||
+++ icb/oset.c Mon May 14 10:33:06 2001
|
||||
@@ -39,6 +39,7 @@ VARIABLE vars[] = {
|
||||
{ "pagesize", V_INT, (char *)&gv.pagesize },
|
||||
{ "pauseonshell", V_BOOLEAN, (char *)&gv.pauseonshell },
|
||||
{ "personalto", V_STRING, (char *)&gv.personalto },
|
@ -1,5 +1,6 @@
|
||||
--- icb/print.c.orig Sun Jan 16 05:27:01 2000
|
||||
+++ icb/print.c Sun Jan 16 05:32:24 2000
|
||||
$OpenBSD: patch-icb_print_c,v 1.1 2001/05/14 16:42:53 millert Exp $
|
||||
--- icb/print.c.orig Fri Feb 24 14:20:25 1995
|
||||
+++ icb/print.c Mon May 14 10:33:06 2001
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#include "icb.h"
|
||||
@ -8,7 +9,7 @@
|
||||
|
||||
extern FILE *logfp;
|
||||
|
||||
@@ -17,12 +18,22 @@
|
||||
@@ -17,12 +18,22 @@ int flags;
|
||||
char printbuf[1024];
|
||||
char *p = printbuf;
|
||||
char *t = s;
|
||||
@ -31,7 +32,7 @@
|
||||
if (flags & PL_SCR) {
|
||||
/* if paging in effect, do paging */
|
||||
if (gv.pagesize && (++linenumber >= gv.pagesize)) {
|
||||
@@ -35,6 +46,8 @@
|
||||
@@ -35,6 +46,8 @@ int flags;
|
||||
*p++ = *t++;
|
||||
*p++ = '\r';
|
||||
*p++ = '\n';
|
@ -1,6 +1,7 @@
|
||||
--- icb/protos.h.orig Fri Feb 24 16:20:25 1995
|
||||
+++ icb/protos.h Sun Jan 16 01:47:15 2000
|
||||
@@ -64,7 +64,7 @@
|
||||
$OpenBSD: patch-icb_protos_h,v 1.1 2001/05/14 16:42:54 millert Exp $
|
||||
--- icb/protos.h.orig Fri Feb 24 14:20:25 1995
|
||||
+++ icb/protos.h Mon May 14 10:33:03 2001
|
||||
@@ -64,7 +64,7 @@ int importantmsg(char *pkt);
|
||||
int inserttab(void);
|
||||
int ishushed(char *nick);
|
||||
int lcaseit(char *s);
|
@ -1,12 +1,13 @@
|
||||
--- icb/serverlist.c.orig Fri Feb 24 16:20:29 1995
|
||||
+++ icb/serverlist.c Sun Jan 16 01:56:24 2000
|
||||
$OpenBSD: patch-icb_serverlist_c,v 1.1 2001/05/14 16:42:54 millert Exp $
|
||||
--- icb/serverlist.c.orig Fri Feb 24 14:20:29 1995
|
||||
+++ icb/serverlist.c Mon May 14 10:33:04 2001
|
||||
@@ -1,4 +1,5 @@
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include "icb.h"
|
||||
@@ -16,7 +17,8 @@
|
||||
@@ -16,7 +17,8 @@ FILE *openserverfile()
|
||||
struct stat statbuf;
|
||||
char *personalsl;
|
||||
char command[256];
|
||||
@ -16,7 +17,7 @@
|
||||
FILE *ret;
|
||||
|
||||
#ifdef sgi
|
||||
@@ -25,15 +27,19 @@
|
||||
@@ -25,15 +27,19 @@ FILE *openserverfile()
|
||||
#ifndef SYSV
|
||||
getwd(pwd);
|
||||
#else /* SYSV */
|
@ -1,6 +1,7 @@
|
||||
--- icb/signals.c.orig Fri Feb 24 16:20:29 1995
|
||||
+++ icb/signals.c Sun Jan 16 01:50:13 2000
|
||||
@@ -22,14 +22,14 @@
|
||||
$OpenBSD: patch-icb_signals_c,v 1.1 2001/05/14 16:42:54 millert Exp $
|
||||
--- icb/signals.c.orig Fri Feb 24 14:20:29 1995
|
||||
+++ icb/signals.c Mon May 14 10:33:04 2001
|
||||
@@ -22,14 +22,14 @@ trapsignals()
|
||||
/* sighandler askquit(), suspend(), icbexit(); */
|
||||
|
||||
/* exit on a hangup or terminate signal */
|
||||
@ -19,7 +20,7 @@
|
||||
}
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
@@ -45,7 +45,7 @@ suspend()
|
||||
sigsetmask(sigblock(0) &~ mask(SIGTSTP));
|
||||
kill(0, SIGTSTP);
|
||||
sigblock(mask(SIGTSTP));
|
||||
@ -28,7 +29,7 @@
|
||||
icbterm();
|
||||
continued = 1;
|
||||
}
|
||||
@@ -73,7 +73,7 @@
|
||||
@@ -73,7 +73,7 @@ askquit()
|
||||
if (c == 'Y' || c == 'y')
|
||||
icbexit();
|
||||
|
19
net/icb/patches/patch-icb_strings_c
Normal file
19
net/icb/patches/patch-icb_strings_c
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-icb_strings_c,v 1.1 2001/05/14 16:42:54 millert Exp $
|
||||
--- icb/strings.c.orig Fri Feb 24 14:20:30 1995
|
||||
+++ icb/strings.c Mon May 14 10:33:03 2001
|
||||
@@ -333,6 +333,7 @@ char *s;
|
||||
/* cat multiple strings into one */
|
||||
/* call with strscat(dest, src, src, ...) */
|
||||
|
||||
+#if 0
|
||||
char *
|
||||
strscat(va_alist)
|
||||
va_dcl
|
||||
@@ -357,6 +358,7 @@ va_dcl
|
||||
*dest = '\0';
|
||||
return(dest);
|
||||
}
|
||||
+#endif
|
||||
|
||||
char *basename(path)
|
||||
char *path;
|
@ -1,6 +1,7 @@
|
||||
--- icb/tcl.c.orig Fri Feb 24 16:20:30 1995
|
||||
+++ icb/tcl.c Sun Jan 16 01:59:09 2000
|
||||
@@ -145,7 +145,7 @@
|
||||
$OpenBSD: patch-icb_tcl_c,v 1.1 2001/05/14 16:42:54 millert Exp $
|
||||
--- icb/tcl.c.orig Fri Feb 24 14:20:30 1995
|
||||
+++ icb/tcl.c Mon May 14 10:33:05 2001
|
||||
@@ -145,7 +145,7 @@ getrcname()
|
||||
|
||||
if ((homedir = getenv("HOME")) == NULL) {
|
||||
printf("icb: warning - $HOME not set.\r\n");
|
||||
@ -9,7 +10,7 @@
|
||||
}
|
||||
|
||||
for (p=names; p && *p; ++p)
|
||||
@@ -153,12 +153,9 @@
|
||||
@@ -153,12 +153,9 @@ getrcname()
|
||||
sprintf(rcpath, "%s/%s", homedir, *p);
|
||||
rcfile = rcpath;
|
||||
if (access(rcfile, R_OK)==0)
|
@ -1,5 +1,6 @@
|
||||
--- icb/unix.c.orig Fri Feb 24 16:20:31 1995
|
||||
+++ icb/unix.c Sun Jan 16 01:58:40 2000
|
||||
$OpenBSD: patch-icb_unix_c,v 1.1 2001/05/14 16:42:54 millert Exp $
|
||||
--- icb/unix.c.orig Fri Feb 24 14:20:31 1995
|
||||
+++ icb/unix.c Mon May 14 10:33:04 2001
|
||||
@@ -9,11 +9,35 @@
|
||||
#include "externs.h"
|
||||
#include <pwd.h>
|
||||
@ -60,7 +61,7 @@
|
||||
|
||||
int badttyinfo = 0; /* used when running under some weird modes */
|
||||
|
||||
@@ -79,13 +100,13 @@
|
||||
@@ -79,13 +100,13 @@ FILE *fp;
|
||||
pushback(c)
|
||||
char c;
|
||||
{
|
||||
@ -77,7 +78,7 @@
|
||||
}
|
||||
|
||||
|
||||
@@ -94,25 +115,30 @@
|
||||
@@ -94,25 +115,30 @@ char c;
|
||||
|
||||
getterm()
|
||||
{
|
||||
@ -114,7 +115,7 @@
|
||||
/* get local special chars */
|
||||
if (ioctl(0, TIOCGLTC, <) < 0) {
|
||||
ttyinfo.redraw = '\022'; /* ^R */
|
||||
@@ -121,10 +147,10 @@
|
||||
@@ -121,10 +147,10 @@ getterm()
|
||||
ttyinfo.redraw = lt.t_rprntc;
|
||||
ttyinfo.werase = lt.t_werasc;
|
||||
}
|
||||
@ -127,7 +128,7 @@
|
||||
|
||||
/* get the current window size */
|
||||
getwinsize();
|
||||
@@ -138,21 +164,24 @@
|
||||
@@ -138,21 +164,24 @@ icbterm()
|
||||
{
|
||||
struct TTYSTRUCT tty;
|
||||
|
||||
@ -156,7 +157,7 @@
|
||||
|
||||
echomode = 0;
|
||||
/* set the new flags */
|
||||
@@ -167,6 +196,10 @@
|
||||
@@ -167,6 +196,10 @@ icbterm()
|
||||
|
||||
restoreterm()
|
||||
{
|
||||
@ -167,7 +168,7 @@
|
||||
if (badttyinfo)
|
||||
return;
|
||||
|
||||
@@ -258,11 +291,11 @@
|
||||
@@ -258,11 +291,11 @@ echo()
|
||||
}
|
||||
|
||||
/* turn on echo */
|
||||
@ -182,7 +183,7 @@
|
||||
|
||||
echomode = 1;
|
||||
|
||||
@@ -287,11 +320,11 @@
|
||||
@@ -287,11 +320,11 @@ noecho()
|
||||
}
|
||||
|
||||
/* turn off echo */
|
12
net/icb/patches/patch-murgil_clientserve_c
Normal file
12
net/icb/patches/patch-murgil_clientserve_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-murgil_clientserve_c,v 1.1 2001/05/14 16:42:54 millert Exp $
|
||||
--- murgil/clientserve.c.orig Fri Feb 24 14:19:39 1995
|
||||
+++ murgil/clientserve.c Mon May 14 10:33:02 2001
|
||||
@@ -41,7 +41,7 @@ clientserve()
|
||||
/* look at tty fd */
|
||||
FD_SET(0,&fdset); /**/
|
||||
|
||||
- signal(SIGALRM, gotalarm);
|
||||
+ signal(SIGALRM, (void *)gotalarm);
|
||||
timeisup = 0;
|
||||
|
||||
for (;;) {
|
12
net/icb/patches/patch-murgil_getrname_c
Normal file
12
net/icb/patches/patch-murgil_getrname_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-murgil_getrname_c,v 1.1 2001/05/14 16:42:54 millert Exp $
|
||||
--- murgil/getrname.c.orig Fri Feb 24 14:19:41 1995
|
||||
+++ murgil/getrname.c Mon May 14 10:33:02 2001
|
||||
@@ -14,7 +14,7 @@ int s; /* connected socket fd */
|
||||
{
|
||||
static char rname[24];
|
||||
struct hostent *host;
|
||||
-#if defined(linux)
|
||||
+#if defined(linux) || defined(__OpenBSD__)
|
||||
#define PEER_CAST (struct sockaddr *)
|
||||
#define HOST_CAST (char *)
|
||||
#else
|
12
net/icb/patches/patch-murgil_serverserve_c
Normal file
12
net/icb/patches/patch-murgil_serverserve_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-murgil_serverserve_c,v 1.1 2001/05/14 16:42:54 millert Exp $
|
||||
--- murgil/serverserve.c.orig Fri Feb 24 14:19:44 1995
|
||||
+++ murgil/serverserve.c Mon May 14 10:33:02 2001
|
||||
@@ -33,7 +33,7 @@ serverserve()
|
||||
if (port_fd > highestfd)
|
||||
highestfd = port_fd;
|
||||
|
||||
- signal(SIGALRM, gotalarm);
|
||||
+ signal(SIGALRM, (void *)gotalarm);
|
||||
timeisup = 0;
|
||||
|
||||
for (;;) {
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-readline_Make,v 1.1 2001/03/12 15:59:02 wilfried Exp $
|
||||
--- readline/Make.orig Fri Feb 24 22:19:59 1995
|
||||
+++ readline/Make Mon Mar 12 16:55:33 2001
|
||||
@@ -34,8 +34,7 @@
|
||||
$OpenBSD: patch-readline_Make,v 1.2 2001/05/14 16:42:54 millert Exp $
|
||||
--- readline/Make.orig Fri Feb 24 14:19:59 1995
|
||||
+++ readline/Make Mon May 14 10:33:07 2001
|
||||
@@ -34,8 +34,7 @@ INCDIR = ..
|
||||
READLINE_DEFINES = $(TYPES) -DVI_MODE
|
||||
|
||||
DEBUG_FLAGS = -g
|
||||
|
@ -1,6 +1,7 @@
|
||||
--- readline/readline.c.orig Fri Feb 24 16:20:03 1995
|
||||
+++ readline/readline.c Sun Jan 16 01:43:01 2000
|
||||
@@ -610,22 +610,22 @@
|
||||
$OpenBSD: patch-readline_readline_c,v 1.1 2001/05/14 16:42:54 millert Exp $
|
||||
--- readline/readline.c.orig Fri Feb 24 14:20:03 1995
|
||||
+++ readline/readline.c Mon May 14 10:33:03 2001
|
||||
@@ -610,22 +610,22 @@ rl_signal_handler (sig)
|
||||
|
||||
rl_set_signals ()
|
||||
{
|
||||
@ -28,7 +29,7 @@
|
||||
|
||||
if (old_tstp == (SigHandler *)SIG_IGN)
|
||||
{
|
||||
@@ -635,26 +635,26 @@
|
||||
@@ -635,26 +635,26 @@ rl_set_signals ()
|
||||
#endif
|
||||
|
||||
#if defined (SIGWINCH)
|
@ -1,6 +1,7 @@
|
||||
--- sample.icbrc.orig Sun Jan 16 05:42:58 2000
|
||||
+++ sample.icbrc Sun Jan 16 05:46:28 2000
|
||||
@@ -15,6 +15,7 @@
|
||||
$OpenBSD: patch-sample_icbrc,v 1.1 2001/05/14 16:42:54 millert Exp $
|
||||
--- sample.icbrc.orig Fri Feb 24 14:19:29 1995
|
||||
+++ sample.icbrc Mon May 14 10:33:06 2001
|
||||
@@ -15,6 +15,7 @@ oset tabreply false # set to "true" to p
|
||||
oset autodel false # set to "true" to have nicks that generate an "error -
|
||||
# so-and-so not signed on" removed from tab history
|
||||
#echoback on # uncomment to see your own public messages
|
@ -1,5 +1,6 @@
|
||||
--- tcl/Make.orig Fri Feb 24 22:19:48 1995
|
||||
+++ tcl/Make Mon Mar 12 16:54:43 2001
|
||||
$OpenBSD: patch-tcl_Make,v 1.1 2001/05/14 16:42:55 millert Exp $
|
||||
--- tcl/Make.orig Fri Feb 24 14:19:48 1995
|
||||
+++ tcl/Make Mon May 14 10:33:04 2001
|
||||
@@ -6,18 +6,11 @@
|
||||
# You should not need to modify this makefile.
|
||||
|
||||
@ -20,7 +21,7 @@
|
||||
tclAssem.c \
|
||||
tclBasic.c \
|
||||
tclCmdAH.c \
|
||||
@@ -30,13 +23,6 @@
|
||||
@@ -30,13 +23,6 @@ SRC = \
|
||||
|
||||
OBJ = \
|
||||
panic.o \
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-tcl_tclBasic_c,v 1.1 2001/03/12 15:59:02 wilfried Exp $
|
||||
--- tcl/tclBasic.c.orig Fri Feb 24 22:19:53 1995
|
||||
+++ tcl/tclBasic.c Sun Feb 11 11:58:22 2001
|
||||
$OpenBSD: patch-tcl_tclBasic_c,v 1.2 2001/05/14 16:42:55 millert Exp $
|
||||
--- tcl/tclBasic.c.orig Fri Feb 24 14:19:53 1995
|
||||
+++ tcl/tclBasic.c Mon May 14 10:33:07 2001
|
||||
@@ -132,6 +132,7 @@ Tcl_CreateInterp()
|
||||
iPtr->errorLine = 0;
|
||||
iPtr->commandPtr = NULL;
|
||||
|
@ -1,6 +1,7 @@
|
||||
--- tcl/tclCmdAH.c.orig Sun Jan 16 05:55:47 2000
|
||||
+++ tcl/tclCmdAH.c Sun Jan 16 06:01:42 2000
|
||||
@@ -38,9 +38,17 @@
|
||||
$OpenBSD: patch-tcl_tclCmdAH_c,v 1.1 2001/05/14 16:42:55 millert Exp $
|
||||
--- tcl/tclCmdAH.c.orig Fri Feb 24 14:19:53 1995
|
||||
+++ tcl/tclCmdAH.c Mon May 14 10:33:02 2001
|
||||
@@ -38,9 +38,17 @@ static char rcsid[] = "$Header: /home/ag
|
||||
#include <sys/wait.h>
|
||||
#include "tclInt.h"
|
||||
|
||||
@ -18,7 +19,7 @@
|
||||
|
||||
/*
|
||||
*----------------------------------------------------------------------
|
||||
@@ -430,7 +438,7 @@
|
||||
@@ -430,7 +438,7 @@ Tcl_ExecCmd(dummy, interp, argc, argv)
|
||||
int pid = -1; /* -1 means child process doesn't
|
||||
* exist (yet). Non-zero gives its
|
||||
* id (0 only in child). */
|
||||
@ -27,7 +28,7 @@
|
||||
char *cmdName, *execName;
|
||||
|
||||
/*
|
||||
@@ -501,8 +509,13 @@
|
||||
@@ -501,8 +509,13 @@ Tcl_ExecCmd(dummy, interp, argc, argv)
|
||||
} else {
|
||||
char tmp[sizeof(TMP_FILE_NAME) + 1];
|
||||
strcpy(tmp, TMP_FILE_NAME);
|
||||
@ -41,7 +42,7 @@
|
||||
if (stdIn[0] < 0) {
|
||||
sprintf(interp->result,
|
||||
"couldn't create input file for \"%.50s\" command: %.50s",
|
||||
@@ -642,7 +655,7 @@
|
||||
@@ -642,7 +655,7 @@ Tcl_ExecCmd(dummy, interp, argc, argv)
|
||||
sprintf(interp->result, "command terminated abnormally");
|
||||
result = TCL_ERROR;
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-tcl_tclHistory_c,v 1.1 2001/03/12 15:59:02 wilfried Exp $
|
||||
--- tcl/tclHistory.c.orig Fri Feb 24 22:19:55 1995
|
||||
+++ tcl/tclHistory.c Sun Feb 11 12:01:16 2001
|
||||
$OpenBSD: patch-tcl_tclHistory_c,v 1.2 2001/05/14 16:42:55 millert Exp $
|
||||
--- tcl/tclHistory.c.orig Fri Feb 24 14:19:55 1995
|
||||
+++ tcl/tclHistory.c Mon May 14 10:33:07 2001
|
||||
@@ -664,6 +664,7 @@ RevCommand(iPtr, string)
|
||||
revPtr->lastIndex = iPtr->evalLast - iPtr->historyFirst - 1;
|
||||
revPtr->newSize = strlen(string);
|
||||
|
@ -1,6 +1,7 @@
|
||||
--- tcl/tclProc.c.orig Fri Feb 24 22:19:56 1995
|
||||
+++ tcl/tclProc.c Sun Feb 11 12:27:12 2001
|
||||
@@ -124,8 +124,8 @@
|
||||
$OpenBSD: patch-tcl_tclProc_c,v 1.1 2001/05/14 16:42:55 millert Exp $
|
||||
--- tcl/tclProc.c.orig Fri Feb 24 14:19:56 1995
|
||||
+++ tcl/tclProc.c Mon May 14 10:33:04 2001
|
||||
@@ -124,8 +124,8 @@ Tcl_ProcCmd(dummy, interp, argc, argv)
|
||||
argPtr = (Var *) malloc(VAR_SIZE(nameLength, valueLength));
|
||||
procPtr->argPtr = argPtr;
|
||||
} else {
|
||||
@ -11,7 +12,7 @@
|
||||
}
|
||||
strcpy(argPtr->name, fieldValues[0]);
|
||||
if (fieldCount == 2) {
|
||||
@@ -136,6 +136,7 @@
|
||||
@@ -136,6 +136,7 @@ Tcl_ProcCmd(dummy, interp, argc, argv)
|
||||
}
|
||||
argPtr->valueLength = valueLength;
|
||||
argPtr->flags = 0;
|
||||
@ -19,7 +20,7 @@
|
||||
argPtr->nextPtr = NULL;
|
||||
free((char *) fieldValues);
|
||||
}
|
||||
@@ -793,11 +794,13 @@
|
||||
@@ -793,11 +794,13 @@ InterpProc(procPtr, interp, argc, argv)
|
||||
*/
|
||||
|
||||
procDone:
|
||||
@ -35,7 +36,7 @@
|
||||
}
|
||||
iPtr->framePtr = frame.callerPtr;
|
||||
iPtr->varFramePtr = frame.callerVarPtr;
|
||||
@@ -826,13 +829,14 @@
|
||||
@@ -826,13 +829,14 @@ void
|
||||
ProcDeleteProc(procPtr)
|
||||
register Proc *procPtr; /* Procedure to be deleted. */
|
||||
{
|
Loading…
Reference in New Issue
Block a user