[Queue-developers] [queue-dev] Patch to fix compile problems under FreeBSD 4.0

[<sa...@xp...>]

Here is a patch to fix some compile/link problems with FreeBSD 4.0
I know it is ugly, but hey, it seems to work. :)

/Santeri

--
This email is the product of your deranged imagination,
and does not in any way imply existence of the author.
--

Only in queue-1.12.9-gray: .deps
Common subdirectories: queue-1.12.9/CVS and queue-1.12.9-gray/CVS
Only in queue-1.12.9-gray: Makefile
diff -u queue-1.12.9/Makefile.in queue-1.12.9-gray/Makefile.in
--- queue-1.12.9/Makefile.in Wed May 17 23:23:25 2000
+++ queue-1.12.9-gray/Makefile.in Wed Dec 13 17:53:09 2000
@@ -81,9 +81,9 @@
 sbin_PROGRAMS =3D queued
 bin_PROGRAMS =3D queue
 queued_SOURCES =3D queued.c lex.l handle.c ident.c pty.c qlib.c
-queued_LDADD =3D @LEXLIB@ @LIBOBJS@
+queued_LDADD =3D @LEXLIB@ @LIBOBJS@ -lopie
 queue_SOURCES =3D queue.c wakeup.c ident.c qlib.c
-queue_LDADD =3D @LIBOBJS@
+queue_LDADD =3D @LIBOBJS@=20
 ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4
 mkinstalldirs =3D $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER =3D config.h
Only in queue-1.12.9-gray: config.cache
Only in queue-1.12.9-gray: config.h
Only in queue-1.12.9-gray: config.log
Only in queue-1.12.9-gray: config.status
Common subdirectories: queue-1.12.9/doc and queue-1.12.9-gray/doc
Only in queue-1.12.9-gray: getopt_long.o
Only in queue-1.12.9-gray: handle.o
Only in queue-1.12.9-gray: ident.o
Only in queue-1.12.9-gray: lex.o
Only in queue-1.12.9-gray: profile
diff -u queue-1.12.9/pty.c queue-1.12.9-gray/pty.c
--- queue-1.12.9/pty.c Wed Mar 10 06:13:15 1999
+++ queue-1.12.9-gray/pty.c Wed Dec 13 17:51:07 2000
@@ -120,8 +120,8 @@
 void deallocpty() {
 #ifndef NO_ROOT
 setutent();
-myu.ut_type =3D DEAD_PROCESS;
-getutid(&myu);
+// myu.ut_type =3D DEAD_PROCESS;
+//getutid(&myu);
 pututline(&myu);
 endutent();
 #endif /*NO_ROOT*/
@@ -135,20 +135,20 @@
 char *line;
 char buf[255];
 line =3D mtos();
-strcpy(myu.ut_user,name);
-strcpy(myu.ut_id,line+12);
+//strcpy(myu.ut_user,name);
+//strcpy(myu.ut_id,line+12);
 strcpy(buf,"/dev/tty");
-strcat(buf,myu.ut_id);
+//strcat(buf,myu.ut_id);
 strcpy(myu.ut_line, line+9);
-myu.ut_pid =3D getpid();
-myu.ut_type =3D USER_PROCESS;
+//myu.ut_pid =3D getpid();
+//myu.ut_type =3D USER_PROCESS;
 myu.ut_time =3D time(NULL);
 #ifdef HAVE_UT_ADDR
 strcpy(myu.ut_host,"Queue process");
 myu.ut_addr =3D 0L;
 #endif
 setutent();
-getutid(&myu);
+//getutid(&myu);
 pututline(&myu);
 fchown(pty2,uid,gid);
 fchmod(pty2,S_IRUSR|S_IWUSR);
Only in queue-1.12.9-gray: pty.o
Only in queue-1.12.9-gray: qlib.o
Only in queue-1.12.9-gray: queue
Only in queue-1.12.9-gray: queue.o
Only in queue-1.12.9-gray: queued
diff -u queue-1.12.9/queued.c queue-1.12.9-gray/queued.c
--- queue-1.12.9/queued.c Wed May 17 23:20:10 2000
+++ queue-1.12.9-gray/queued.c Wed Dec 13 17:43:17 2000
@@ -1009,7 +1009,7 @@
 extern int sys_nerr;
=20
 #ifndef linux
-extern char *sys_errlist[];
+// extern char *sys_errlist[];
 #endif
=20
  char *
@@ -3418,6 +3418,9 @@
 original batch program.
=20
 As you might expect, the code is very much OS dependent.*/
+
+#include <sys/param.h>
+#include <sys/mount.h>
=20
 #ifdef HAVE_SYS_STATVFS_H
 #define STATFS statvfs
Only in queue-1.12.9-gray: queued.o
Only in queue-1.12.9-gray: stamp-h
Only in queue-1.12.9-gray: wakeup.o