- Fix build on gcc 4

svn path=/head/; revision=182600
2024-10-18 19:49:40 +00:00 · 2007-01-17 07:22:54 +00:00 · 2007-01-17 07:22:54 +00:00 · c8d58ded75 · 2021-03-31 03:12:20 +00:00
commit c8d58ded75
parent 48ec2c6e8a
1 changed files with 155 additions and 0 deletions
--- a/net/netscript/files/patch-netscript.c
+++ b/net/netscript/files/patch-netscript.c
@ -0,0 +1,155 @@
+--- netscript.c.orig	Tue Oct  8 10:59:06 2002
+++ netscript.c	Wed Jan 17 15:21:24 2007
+@@ -633,7 +633,7 @@
+ U SH isudpr=0;
+ U SH isvhost=0;
+ U SH lnum=0;
+-U SH log=0;
+U SH islog=0;
+ U SH nofrom=0;
+ U SH norrecv=0;
+ U SH norsend=0;
+@@ -1551,7 +1551,7 @@
+   /* make sure the socket is really there. */
+   IF(SE((sock+1),0,&cfd,0,&tv)>0) 
+    WR(sock,output,size);
+-  IF(log&&tnetraw)
+  IF(islog&&tnetraw)
+    logdata(output,3);
+  }
+  IF(setroute){
+@@ -1978,7 +1978,7 @@
+   wro(dump,SL(dump),0);
+   wro("\n",1,0);
+   /* add the output to the log, if enabled. (-l option) */
+-  IF(log&&!tnetraw)
+  IF(islog&&!tnetraw)
+    logdata(dump,0);
+   /* last use of dump for this run. */
+   FR(dump);
+@@ -2113,8 +2113,10 @@
+   /* unless udp mode is active, then will rebind. */
+   IF(bindmode!=2||isudp){
+    /* main server sockaddr structure. */
+-   (isudp?sock:ssock)=SK(AF_INET,(isudp?SOCK_DGRAM:SOCK_STREAM),(isudp?
+-   IPPROTO_UDP:IPPROTO_TCP));
+   if(isudp)
+     sock=SK(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
+   else
+     ssock=SK(AF_INET,SOCK_STREAM,IPPROTO_TCP);
+    parsesocketopt(1,(isudp?sock:ssock));
+    B((V *)&sns,SO(sns));
+    sns.sin_family=AF_INET;
+@@ -2379,7 +2381,7 @@
+   }
+  }
+  /* states log start time, and ip that was used.  if enabled. (-l option) */
+- IF(log&&!tnetraw){
+ IF(islog&&!tnetraw){
+   logdata("NEW NETSCRIPT SESSION STARTED.",2);
+   /* logging of the ip used. */
+   logdata(
+@@ -2468,7 +2470,7 @@
+        pd(iread,0,columns);
+       wro(iread,SL(iread),0);
+       wro("\n",1,0);
+-      IF(log&&!tnetraw)
+      IF(islog&&!tnetraw)
+        logdata(iread,0);
+      }
+      FC(ifd);
+@@ -2484,7 +2486,7 @@
+    wro(iswrite,SL(iswrite),0);
+    wro("\n",1,0);
+    /* add the initial data to the log, if enabled. (-i, and -l option) */
+-   IF(log&&!tnetraw)
+   IF(islog&&!tnetraw)
+     logdata(iswrite,0);
+   }
+  }
+@@ -2501,7 +2503,7 @@
+   }
+   /* handle incoming telnet dumping. (-y, and -Y options) */
+   dumptelnet(sread);
+-  IF(log&&tnetraw)
+  IF(islog&&tnetraw)
+    logdata(sread,3);
+   /* check, and use the ns_incoming_raw() symbol.  it passes the raw dump of */
+   /* the socket read buffer, the size of the buffer, and the length of the */
+@@ -2578,7 +2580,7 @@
+     IF(!nosrecv)
+      pd(sreadl,1,columns);
+     /* add the output to the log, if enabled. (-l option) */
+-    IF(log&&!tnetraw)
+    IF(islog&&!tnetraw)
+      logdata(sreadl,1);
+     /* reset the temporary variable. */
+     IF(stoprules==2)
+@@ -2705,7 +2707,7 @@
+           pd(iwrite,0,columns);
+          wro(iwrite,SL(iwrite),0);
+          wro("\n",1,0);
+-         IF(log&&!tnetraw)
+         IF(islog&&!tnetraw)
+           logdata(iwrite,0);
+          FC(ifd);
+         }
+@@ -3036,7 +3038,7 @@
+        wro(swrite,SL(swrite),0);
+        wro("\n",1,0);
+        /* add the input to the log, if enabled. (-l option) */
+-       IF(log&&!tnetraw)
+       IF(islog&&!tnetraw)
+         logdata(swrite,0);
+       }
+      }
+@@ -3400,14 +3402,14 @@
+     nsprint("logfile: can not log data to a file with privileged access.\n");
+    E{
+     IF(!parameter(iread,1,0x20)){
+-     IF(log)
+     IF(islog)
+       FR(logfile);
+      parsecmdline(parm);
+      IF(!(logfile=(C *)SDU(parsedline)))
+       pe("iface(): duplication of memory error",1);
+-     log=1;
+     islog=1;
+     }
+-    nsprint("logfile: %s\n",(log?logfile:IFACE_UNSET));
+    nsprint("logfile: %s\n",(islog?logfile:IFACE_UNSET));
+    }
+   }
+ #ifdef NCURSES
+@@ -3995,7 +3997,7 @@
+  IF(tnetraw&&truetnet){
+   nsprint("\n");
+   /* same goes for logging. */
+-  IF(log)
+  IF(islog)
+    logdata("\n",3);
+  }
+  closesocket(0);
+@@ -4075,7 +4077,7 @@
+    wro(et,SL(et),0);
+    wro("\n",1,0);
+    /* log if requested. */
+-   IF(log)
+   IF(islog)
+     logdata(et,0);
+    /* reset waiting loop. */
+    isguiwait=0;
+@@ -4926,11 +4928,11 @@
+      IF(isprivileged)
+       pe("can not log data to a file with privileged access",0);
+      E
+-      IF(!log){
+      IF(!islog){
+        parsecmdline(optarg);
+        IF(!(logfile=(C *)SDU(parsedline)))
+         pe("main(): duplication of memory error",1);
+-       log=1;
+       islog=1;
+       }
+      BR;
+ #ifdef GTK