| Server IP : 82.208.35.60 / Your IP : 216.73.216.89 Web Server : Apache/2.4.55 (FreeBSD) OpenSSL/1.1.1q-freebsd PHP/7.3.31 System : FreeBSD server7.d2m.cz 12.4-RELEASE-p9 FreeBSD 12.4-RELEASE-p9 GENERIC amd64 User : studiokobylisy_cz ( 1008) PHP Version : 7.3.31 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : OFF | Perl : OFF | Python : OFF | Sudo : OFF | Pkexec : OFF Directory : /usr/ports/shells/v7sh/files/ |
Upload File : |
diff -u -x CVS -x work -x core -x *.core -x #* -x *~ -x *.orig -x *.rej -I $Id.*$ -I $.+BSD.*$ fault.c.orig fault.c
--- fault.c.orig Fri Jun 4 02:51:01 2004
+++ fault.c Sat Jun 19 18:42:22 2004
@@ -10,8 +10,54 @@
#include "defs.h"
+BOOL trapnote;
STRING trapcom[MAXTRAP];
+#if defined(SYSIII)
+BOOL trapflg[MAXTRAP] = {
+ 0,
+ 0, /* Hangup */
+ SIGCAUGHT, /* Interrupt */
+ SIGCAUGHT, /* Quit */
+ 0, /* Illegal instruction */
+ 0, /* Trace/BPT trap */
+ 0, /* IOT trap */
+ 0, /* EMT trap */
+ 0, /* Floating exception */
+ 0, /* Killed */
+ 0, /* Bus error */
+ 0, /* Memory fault */
+ 0, /* Bad system call */
+ 0, /* Broken pipe */
+ SIGCAUGHT, /* Alarm call */
+ SIGCAUGHT, /* Terminated */
+ 0, /* Urgent condition */
+ 0, /* Stopped */
+ 0, /* Stopped from terminal */
+ 0, /* Continued */
+ 0, /* Child terminated */
+ 0, /* Stopped on terminal input */
+ 0, /* Stopped on terminal output */
+ 0, /* Asynchronous I/O */
+ 0, /* Exceeded cpu time limit */
+ 0, /* Exceeded file size limit */
+ 0, /* Virtual time alarm */
+ 0, /* Profiling time alarm */
+ 0, /* Window size changed */
+ 0, /* Information request */
+ 0, /* User defined signal 1 */
+ 0, /* User defined signal 2 */
+ 0 /* Thread interrupt */
+};
+#else /* V7 */
BOOL trapflg[MAXTRAP];
+#endif
+#if defined(RENO)
+BOOL trapjmp[MAXTRAP];
+jmp_buf INTbuf;
+#endif
+#if defined(SYSIII)
+BOOL wasintr;
+#endif
/* ======== fault handling routines ======== */
@@ -21,49 +67,77 @@
{
REG INT flag;
+#if defined(V7)
signal(sig,fault);
+#endif
IF sig==MEMF
- THEN IF setbrk(brkincr) == -1
+ THEN IF setbrk(brkincr) == (BYTPTR)-1
THEN error(nospace);
+ /*NOTREACHED*/
FI
ELIF sig==ALARM
THEN IF flags&waiting
THEN done();
+ /*NOTREACHED*/
FI
ELSE flag = (trapcom[sig] ? TRAPSET : SIGSET);
trapnote |= flag;
trapflg[sig] |= flag;
+#if defined(SYSIII)
+ IF sig == INTR THEN wasintr++ FI
+#endif
FI
+#if defined(RENO)
+ IF trapjmp[sig] ANDF sig==INTR
+ THEN trapjmp[sig] = 0;
+ longjmp(INTbuf, 1);
+ FI
+#endif
}
-stdsigs()
+VOID stdsigs()
{
ignsig(QUIT);
getsig(INTR);
+#if defined(SYSIII)
+ signal(MEMF, fault);
+#else /* V7 */
getsig(MEMF);
+#endif
getsig(ALARM);
}
-ignsig(n)
+SIGPTR ignsig(n)
+ INT n;
{
- REG INT s, i;
+ REG INT i;
+ REG SIGPTR s=SIG_DFL; /* GCC */
- IF (s=signal(i=n,1)&01)==0
+#if defined(SYSIII)
+ IF (i=n)==MEMF
+ THEN clrsig(i);
+ failed(badtrap, memfault);
+ /*NOTREACHED*/
+ ELIF (s=signal(i=n,SIG_IGN))==SIG_DFL
+#else /* V7 */
+ IF (s=signal(i=n,SIG_IGN))==SIG_DFL
+#endif
THEN trapflg[i] |= SIGMOD;
FI
return(s);
}
-getsig(n)
+VOID getsig(n)
+ INT n;
{
REG INT i;
- IF trapflg[i=n]&SIGMOD ORF ignsig(i)==0
+ IF trapflg[i=n]&SIGMOD ORF ignsig(i)==SIG_DFL
THEN signal(i,fault);
FI
}
-oldsigs()
+VOID oldsigs()
{
REG INT i;
REG STRING t;
@@ -79,17 +153,24 @@
trapnote=0;
}
-clrsig(i)
+VOID clrsig(i)
INT i;
{
- free(trapcom[i]); trapcom[i]=0;
+ free((BLKPTR) trapcom[i]); trapcom[i]=0;
IF trapflg[i]&SIGMOD
- THEN signal(i,fault);
+#if defined(SYSIII)
+ THEN IF trapflg[i]&SIGCAUGHT
+ THEN signal(i, fault);
+ ELSE signal(i, SIG_DFL);
+ FI
trapflg[i] &= ~SIGMOD;
+#else /* V7 */
+ THEN signal(i,fault);
+#endif
FI
}
-chktrap()
+VOID chktrap()
{
/* check for traps */
REG INT i=MAXTRAP;
@@ -99,7 +180,7 @@
WHILE --i
DO IF trapflg[i]&TRAPSET
THEN trapflg[i] &= ~TRAPSET;
- IF t=trapcom[i]
+ IF (t=trapcom[i])!=NIL /* GCC */
THEN INT savxit=exitval;
execexp(t,0);
exitval=savxit; exitset();