temporarily add ifdef sunos (includes) to assist Steve Romig in debugging

SCCS-vsn: sbin/dump/main.c 5.18
SCCS-vsn: sbin/dump/optr.c 5.9
SCCS-vsn: sbin/dump/dumprmt.c 5.12
SCCS-vsn: sbin/dump/traverse.c 5.12

diff --git a/usr/src/sbin/dump/dumprmt.c b/usr/src/sbin/dump/dumprmt.c
index 5352ef4..ccda2b0 100644 (file)
--- a/usr/src/sbin/dump/dumprmt.c
+++ b/usr/src/sbin/dump/dumprmt.c
@@ -6,14 +6,29 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)dumprmt.c  5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)dumprmt.c  5.12 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

+#ifdef sunos
+#include <stdio.h>
+#include <ctype.h>
+#include <sys/param.h>
+#include <sys/mtio.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/dir.h>
+#include <sys/vnode.h>
+#include <ufs/inode.h>
+#else

 #include <sys/param.h>
 #include <sys/mtio.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <ufs/dinode.h>
 #include <sys/param.h>
 #include <sys/mtio.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <ufs/dinode.h>

+#include <stdio.h>
+#endif

 #include <signal.h>
 
 #include <netinet/in.h>
 #include <signal.h>
 
 #include <netinet/in.h>


@@ -21,7 +36,6 @@ static char sccsid[] = "@(#)dumprmt.c 5.11 (Berkeley) %G%";
 #include <netdb.h>
 #include <protocols/dumprestore.h>
 #include <pwd.h>
 #include <netdb.h>
 #include <protocols/dumprestore.h>
 #include <pwd.h>

-#include <stdio.h>

 #ifdef __STDC__
 #include <unistd.h>
 #include <stdlib.h>
 #ifdef __STDC__
 #include <unistd.h>
 #include <stdlib.h>

diff --git a/usr/src/sbin/dump/main.c b/usr/src/sbin/dump/main.c
index 1eaeb3a..c371fb0 100644 (file)
--- a/usr/src/sbin/dump/main.c
+++ b/usr/src/sbin/dump/main.c
@@ -12,12 +12,24 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.17 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.18 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

+#ifdef sunos
+#include <stdio.h>
+#include <errno.h>
+#include <ctype.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/dir.h>
+#include <sys/vnode.h>
+#include <ufs/inode.h>
+#else

 #include <sys/param.h>
 #include <ufs/dir.h>
 #include <ufs/dinode.h>
 #include <sys/param.h>
 #include <ufs/dir.h>
 #include <ufs/dinode.h>

+#endif

 #include <ufs/fs.h>
 #include <protocols/dumprestore.h>
 #include <signal.h>
 #include <ufs/fs.h>
 #include <protocols/dumprestore.h>
 #include <signal.h>


@@ -454,3 +466,19 @@ rawname(cp)
        strcat(rawbuf, dp+1);
        return (rawbuf);
 }
        strcat(rawbuf, dp+1);
        return (rawbuf);
 }

+
+#ifdef sunos
+char *
+strerror(errnum)
+       int errnum;
+{
+       extern int sys_nerr;
+       extern char *sys_errlist[];
+
+       if (errnum < sys_nerr) {
+               return(sys_errlist[errnum]);
+       } else {
+               return("bogus errno in strerror");
+       }
+}
+#endif

diff --git a/usr/src/sbin/dump/optr.c b/usr/src/sbin/dump/optr.c
index 92f3955..5c84945 100644 (file)
--- a/usr/src/sbin/dump/optr.c
+++ b/usr/src/sbin/dump/optr.c
@@ -6,12 +6,23 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)optr.c     5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)optr.c     5.9 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

+#ifdef sunos
+#include <stdio.h>
+#include <ctype.h>
+#include <sys/param.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/dir.h>
+#else

 #include <sys/param.h>
 #include <sys/wait.h>
 #include <ufs/dir.h>
 #include <sys/param.h>
 #include <sys/wait.h>
 #include <ufs/dir.h>

+#include <stdio.h>
+#endif

 #include <signal.h>
 #include <time.h>
 #include <fstab.h>
 #include <signal.h>
 #include <time.h>
 #include <fstab.h>


@@ -20,7 +31,6 @@ static char sccsid[] = "@(#)optr.c    5.8 (Berkeley) %G%";
 #include <utmp.h>
 #include <tzfile.h>
 #include <errno.h>
 #include <utmp.h>
 #include <tzfile.h>
 #include <errno.h>

-#include <stdio.h>

 #ifdef __STDC__
 #include <unistd.h>
 #include <stdlib.h>
 #ifdef __STDC__
 #include <unistd.h>
 #include <stdlib.h>

diff --git a/usr/src/sbin/dump/traverse.c b/usr/src/sbin/dump/traverse.c
index 0dd928b..c0dc2b8 100644 (file)
--- a/usr/src/sbin/dump/traverse.c
+++ b/usr/src/sbin/dump/traverse.c
@@ -6,12 +6,23 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)traverse.c 5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)traverse.c 5.12 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

+#ifdef sunos
+#include <stdio.h>
+#include <ctype.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/dir.h>
+#include <sys/vnode.h>
+#include <ufs/inode.h>
+#else

 #include <sys/param.h>
 #include <ufs/dir.h>
 #include <ufs/dinode.h>
 #include <sys/param.h>
 #include <ufs/dir.h>
 #include <ufs/dinode.h>

+#endif

 #include <ufs/fs.h>
 #include <protocols/dumprestore.h>
 #ifdef __STDC__
 #include <ufs/fs.h>
 #include <protocols/dumprestore.h>
 #ifdef __STDC__