diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2003-08-02 02:03:03 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2003-08-02 02:03:03 +0000 |
| commit | 5777cd28dc4c661ca8615fd99ebf23e1beab31bc (patch) | |
| tree | a49b221342307719b8b14283734c678c7903c406 /net | |
| parent | Fix build for gcc-3.3.x (diff) | |
Fix build on gcc-3.3.x
Submitted by: Simon Barner <barner@in.tum.de>
Notes
Notes:
svn path=/head/; revision=86169
Diffstat (limited to 'net')
| -rw-r--r-- | net/netsaint-plugins/files/patch-check_by_ssh.c | 8 | ||||
| -rw-r--r-- | net/sup/files/patch-aa | 22 | ||||
| -rw-r--r-- | net/sup/files/patch-vprintf.c | 28 |
3 files changed, 32 insertions, 26 deletions
diff --git a/net/netsaint-plugins/files/patch-check_by_ssh.c b/net/netsaint-plugins/files/patch-check_by_ssh.c index f89ad7d49ffa..68de5fab2234 100644 --- a/net/netsaint-plugins/files/patch-check_by_ssh.c +++ b/net/netsaint-plugins/files/patch-check_by_ssh.c @@ -1,11 +1,11 @@ ---- plugins/check_by_ssh.c.orig Fri Jun 21 11:19:56 2002 -+++ plugins/check_by_ssh.c Fri Jun 21 11:54:25 2002 +--- plugins/check_by_ssh.c.orig Mon Apr 23 09:43:11 2001 ++++ plugins/check_by_ssh.c Tue Jul 22 05:05:52 2003 @@ -191,7 +191,7 @@ if (commands>1) remotecmd=strscat(remotecmd,";echo STATUS CODE: $?;"); - if (strlen (remotecmd) <= 1) -+ if (remotecmd==NULL) ++ if ((remotecmd==NULL) || (strlen (remotecmd) <= 1)) usage ("No remotecmd\n"); comm = ssprintf(comm,"%s %s '%s'",comm,hostname,remotecmd); @@ -23,7 +23,7 @@ #define OPTIONS "\ --H <host> [-P port] [-f] [-y] [-t timeout] [-i identity]\n -+-H <host> -C <command> [-fyv] [-P port] [-t timeout] [-i identity]\n ++-H <host> -C <command> [-fyv] [-P port] [-t timeout] [-i identity]\n\ [-l user] [-n name] [-s servicelist] [-O outputfile]" void print_usage(void) diff --git a/net/sup/files/patch-aa b/net/sup/files/patch-aa index 6702b5f6f45a..141fcc3bfd80 100644 --- a/net/sup/files/patch-aa +++ b/net/sup/files/patch-aa @@ -2742,28 +2742,6 @@ diff -c /var/tmp/sup/supmsg.h sup/supmsg.h EXTERN long scantime; /* time that collection was scanned */ /* msgneed */ -diff -c /var/tmp/sup/vprintf.c sup/vprintf.c -*** vprintf.c Fri Aug 20 17:46:35 1993 ---- sup/vprintf.c Thu Apr 6 15:26:03 1995 -*************** -*** 118,126 **** ---- 118,133 ---- - { - FILE fakebuf; - -+ #ifdef __hpux -+ fakebuf._flag = _IODUMMY+_IOWRT;/* no _IOWRT: avoid stdio bug */ -+ fakebuf._base = fakebuf._ptr = s; -+ fakebuf._cnt = n-1; -+ fakebuf.__fileL = fakebuf.__fileH = 0xff; -+ #else - fakebuf._flag = _IOSTRG+_IOWRT; /* no _IOWRT: avoid stdio bug */ - fakebuf._ptr = s; - fakebuf._cnt = n-1; -+ #endif - _doprnt(fmt, args, &fakebuf); - fakebuf._cnt++; - putc('\0', &fakebuf); *** /dev/null Sun Aug 13 11:14:38 1995 --- daemon.c Sun Aug 13 19:59:10 1995 *************** diff --git a/net/sup/files/patch-vprintf.c b/net/sup/files/patch-vprintf.c new file mode 100644 index 000000000000..83308ae1fb49 --- /dev/null +++ b/net/sup/files/patch-vprintf.c @@ -0,0 +1,28 @@ +--- vprintf.c.orig Sat Aug 21 02:46:35 1993 ++++ vprintf.c Wed Jul 30 02:59:04 2003 +@@ -59,7 +59,7 @@ + */ + + #include <stdio.h> +-#include <varargs.h> ++#include <stdarg.h> + + #ifdef DOPRINT_VA + /* +@@ -118,9 +118,16 @@ + { + FILE fakebuf; + ++#ifdef __hpux ++ fakebuf._flag = _IODUMMY+_IOWRT;/* no _IOWRT: avoid stdio bug */ ++ fakebuf._base = fakebuf._ptr = s; ++ fakebuf._cnt = n-1; ++ fakebuf.__fileL = fakebuf.__fileH = 0xff; ++#else + fakebuf._flag = _IOSTRG+_IOWRT; /* no _IOWRT: avoid stdio bug */ + fakebuf._ptr = s; + fakebuf._cnt = n-1; ++#endif + _doprnt(fmt, args, &fakebuf); + fakebuf._cnt++; + putc('\0', &fakebuf); |