I have done the QNX4 port with the current source tree. The number of

backend/Makefiles to be patched could significantly be reduced since
they
have been adopted to the QNX4 needs.

Andreas Kardos

src/backend/Makefile

@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.41 1999/12/13 22:32:16 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.42 1999/12/16 01:25:00 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -50,6 +50,10 @@ DIRS += tioga
 endif
 
 OBJS = $(DIRS:%=%/SUBSYS.o)
+ifeq ($(PORTNAME), qnx4)
+# This file chrashes wlink and is therefore not in bootstrap/SUBSYS.o.
+OBJS1 = bootstrap/bootstrap.o
+endif
 
 # kerberos flags
 
@@ -75,7 +79,7 @@ all: postgres $(POSTGRES_IMP) global1.bki.source local1_template1.bki.source \
 
 ifneq ($(PORTNAME), win)
 postgres: fmgr.h $(OBJS) ../utils/version.o
-	$(CC) -o postgres $(OBJS) ../utils/version.o $(LDFLAGS)
+	$(CC) -o postgres $(OBJS) $(OBJS1) ../utils/version.o $(LDFLAGS)
 else
 postgres: $(DLLOBJS) ../utils/dllinit.o postgres.def libpostgres.a
 	dlltool --dllname $@$(X) --output-exp $@.exp --def postgres.def
@@ -109,7 +113,7 @@ catalog/global1.description catalog/local1_template1.description:
 # The postgres.o target is needed by the rule in Makefile.global that
 # creates the exports file when MAKE_EXPORTS = true.
 postgres.o: $(OBJS)
-	$(CC) $(LDREL) $(LDOUT) postgres.o $(OBJS) $(LDFLAGS)
+	$(CC) $(LDREL) $(LDOUT) postgres.o $(OBJS) $(OBJS1) $(LDFLAGS)
 
 ############################################################################
 # The following targets are specified in make commands that appear in the
@@ -197,21 +201,21 @@ install-lib: $(LIBDIR) \
 	  $(LIBDIR)/pg_geqo.sample
 
 install-headers: fmgr.h $(SRCDIR)/include/config.h
-	@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
-	@if [ ! -d $(HEADERDIR)/port ]; then mkdir $(HEADERDIR)/port; fi
-	@if [ ! -d $(HEADERDIR)/port/$(PORTNAME) ]; \
+	-@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
+	-@if [ ! -d $(HEADERDIR)/port ]; then mkdir $(HEADERDIR)/port; fi
+	-@if [ ! -d $(HEADERDIR)/port/$(PORTNAME) ]; \
 		then mkdir $(HEADERDIR)/port/$(PORTNAME); fi
-	@if [ ! -d $(HEADERDIR)/lib ]; \
+	-@if [ ! -d $(HEADERDIR)/lib ]; \
 		then mkdir $(HEADERDIR)/lib; fi
-	@if [ ! -d $(HEADERDIR)/libpq ]; \
+	-@if [ ! -d $(HEADERDIR)/libpq ]; \
 		then mkdir $(HEADERDIR)/libpq; fi
-	@if [ ! -d $(HEADERDIR)/utils ]; \
+	-@if [ ! -d $(HEADERDIR)/utils ]; \
 		then mkdir $(HEADERDIR)/utils; fi
-	@if [ ! -d $(HEADERDIR)/access ]; \
+	-@if [ ! -d $(HEADERDIR)/access ]; \
 		then mkdir $(HEADERDIR)/access; fi
-	@if [ ! -d $(HEADERDIR)/executor ]; \
+	-@if [ ! -d $(HEADERDIR)/executor ]; \
 		then mkdir $(HEADERDIR)/executor; fi
-	@if [ ! -d $(HEADERDIR)/commands ]; \
+	-@if [ ! -d $(HEADERDIR)/commands ]; \
 		then mkdir $(HEADERDIR)/commands; fi
 	$(INSTALL) $(INSTLOPTS) fmgr.h \
           $(HEADERDIR)/fmgr.h
@@ -267,7 +271,7 @@ $(HEADERDIR):
 # are up to date.  It saves the time of doing all the submakes.
 .PHONY: quick
 quick: $(OBJS)
-	$(CC) -o postgres $(OBJS) $(LDFLAGS)
+	$(CC) -o postgres $(OBJS) $(OBJS1) $(LDFLAGS)
 
 #
 # Build the file, "./ID", used by the "gid" (grep-for-identifier) tool

src/backend/bootstrap/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for the bootstrap module
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.17 1999/12/13 22:32:35 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.18 1999/12/16 01:25:01 momjian Exp $
 #
 #
 # We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -32,7 +32,12 @@ endif
 
 BOOTYACCS= bootstrap_tokens.h bootparse.c
 
+ifneq ($(PORTNAME), qnx4)
 OBJS= bootparse.o bootscanner.o bootstrap.o 
+else
+# wlink crashes with bootstrap.o
+OBJS= bootparse.o bootscanner.o
+endif
 
 all: SUBSYS.o
 

src/backend/port/Makefile.in

@@ -13,7 +13,7 @@
 # be converted to Method 2.  
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.19 1999/12/13 22:33:05 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.20 1999/12/16 01:25:02 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -25,11 +25,19 @@ CFLAGS+= -I..
 OBJS = dynloader.o @INET_ATON@ @STRERROR@ @MISSING_RANDOM@ @SRANDOM@
 OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @STRCASECMP@ @STRDUP@ @TAS@ @ISINF@
 OBJS+= @STRTOL@ @STRTOUL@ @SNPRINTF@
+ifeq ($(PORTNAME), qnx4)
+OBJS += getrusage.o qnx4/SUBSYS.o
+endif
 all: SUBSYS.o
 
 SUBSYS.o: $(OBJS)
 	$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
 
+qnx4/SUBSYS.o: qnx4.dir
+
+qnx4.dir:
+	$(MAKE) -C qnx4 all
+
 .PHONY: clean dep
 
 distclean clean:

src/backend/port/dynloader/qnx4.c

+/*-------------------------------------------------------------------------
+ *
+ * dynloader.c
+ *	  dynamic loader for QNX4 using the shared library mechanism
+ *
+ * Copyright (c) 1999, repas AEG Automation GmbH
+ *
+ *
+ * IDENTIFICATION
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/Attic/qnx4.c,v 1.1 1999/12/16 01:25:04 momjian Exp $
+ *
+ *	NOTES
+ *
+ *-------------------------------------------------------------------------
+ */
+/* System includes */
+/*
+#include <stdio.h>
+#include <a.out.h>
+#include <dl.h>
+*/
+#include "postgres.h"
+#include "fmgr.h"
+#include "utils/dynamic_loader.h"
+#include "dynloader.h"
+
+void *
+pg_dlopen(char *filename)
+{
+	return (void *) NULL;
+}
+
+func_ptr
+pg_dlsym(void *handle, char *funcname)
+{
+	return NULL;
+}
+
+void
+pg_dlclose(void *handle)
+{
+}
+
+char *
+pg_dlerror()
+{
+	static char errmsg[] = "Failed to load shared library due to lack of shared library support.";
+
+	return errmsg;
+}

src/backend/port/dynloader/qnx4.h

+/*-------------------------------------------------------------------------
+ *
+ * dynloader.h
+ *	  dynamic loader for QNX4 using the shared library mechanism
+ *
+ * Copyright (c) 1999, repas AEG Automation GmbH
+ *
+ *
+ * IDENTIFICATION
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/Attic/qnx4.h,v 1.1 1999/12/16 01:25:04 momjian Exp $
+ *
+ *	NOTES
+ *
+ *-------------------------------------------------------------------------
+ */
+/* System includes */
+void	   *pg_dlopen(char *filename);
+func_ptr	pg_dlsym(void *handle, char *funcname);
+void		pg_dlclose(void *handle);
+char	   *pg_dlerror();

src/backend/port/isinf.c

-/* $Id: isinf.c,v 1.13 1999/07/30 03:45:44 momjian Exp $ */
+/* $Id: isinf.c,v 1.14 1999/12/16 01:25:02 momjian Exp $ */
 
 #include <math.h>
 
@@ -51,7 +51,7 @@ double		x;
 	return 0;
 }
 
-#else defined(HAVE_CLASS)
+#elif defined(HAVE_CLASS)
 int
 isinf(double x)
 {
@@ -66,3 +66,18 @@ isinf(double x)
 
 #endif
 #endif
+
+#ifdef __QNX__
+#include <float.h>
+
+int
+isinf(double x)
+{
+        if (x == HUGE_VAL)
+                return 1;
+        if (x == -HUGE_VAL)
+                return -1;
+        return 0;
+}
+
+#endif

src/backend/port/qnx/Makefile

+#-------------------------------------------------------------------------
+#
+# Makefile--
+#    Makefile for port/sparc
+#
+# IDENTIFICATION
+#    $Header: /cvsroot/pgsql/src/backend/port/qnx/Attic/Makefile,v 1.1 1999/12/16 01:25:06 momjian Exp $
+#
+#-------------------------------------------------------------------------
+
+SRCDIR = ../../..
+include ../../../Makefile.global
+
+INCLUDE_OPT = -I../.. 
+
+CFLAGS+=$(INCLUDE_OPT)
+
+OBJS = isnan.o rint.o sem.o shm.o
+
+all: SUBSYS.o tstrint tstsem tstshm
+
+SUBSYS.o: $(OBJS)
+	$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
+
+tstrint: tstrint.o rint.o
+	$(CC) -o tstrint rint.o tstrint.o
+
+tstsem: tstsem.o sem.o
+	$(CC) -o tstsem sem.o tstsem.o
+
+tstshm: tstshm.o shm.o
+	$(CC) -o tstshm shm.o tstshm.o
+
+depend dep:
+	$(CC) -MM $(INCLUDE_OPT) *.c >depend
+
+clean: 
+	rm -f SUBSYS.o $(OBJS) tstrint tstrint.o tstsem tstsem.o tstshm tstshm.o
+
+ifeq (depend,$(wildcard depend))
+include depend
+endif
+

src/backend/port/qnx/ipc.h

+/*-------------------------------------------------------------------------
+ *
+ * ipc.h
+ *	  System V IPC Emulation
+ *
+ * Copyright (c) 1999, repas AEG Automation GmbH
+ *
+ *
+ * IDENTIFICATION
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx/Attic/ipc.h,v 1.1 1999/12/16 01:25:06 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef	_SYS_IPC_H
+#define	_SYS_IPC_H
+
+/* Common IPC definitions. */
+/* Mode bits. */
+#define IPC_CREAT	0001000		/* create entry if key doesn't exist */
+#define IPC_EXCL 	0002000		/* fail if key exists */
+#define IPC_NOWAIT 	0004000		/* error if request must wait */
+
+/* Keys. */
+#define IPC_PRIVATE	(key_t)0        /* private key */
+
+/* Control Commands. */
+#define IPC_RMID	0		/* remove identifier */
+
+#endif	/* _SYS_IPC_H */

src/backend/port/qnx/isnan.c

+/*-------------------------------------------------------------------------
+ *
+ * isnan.c
+ *	  isnan() implementation
+ *
+ * Copyright (c) 1999, repas AEG Automation GmbH
+ *
+ *
+ * IDENTIFICATION
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx/Attic/isnan.c,v 1.1 1999/12/16 01:25:06 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "os.h"
+
+unsigned char __nan[8] = __nan_bytes;
+
+int isnan(double dsrc)
+{
+  return !memcmp( &dsrc, &NAN, sizeof( double ) );
+}

src/backend/port/qnx/rint.c

+/*-------------------------------------------------------------------------
+ *
+ * rint.c
+ *	  rint() implementation
+ *
+ * Copyright (c) 1999, repas AEG Automation GmbH
+ *
+ *
+ * IDENTIFICATION
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx/Attic/rint.c,v 1.1 1999/12/16 01:25:06 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include <math.h>
+#include "os.h"
+
+double rint(double x)
+{
+  double f, n = 0.;
+
+  f = modf( x, &n );
+
+  if( x > 0. )  {
+    if( f > .5 ) n += 1.;
+  }
+  else if( x < 0. )  {
+    if( f < -.5 ) n -= 1.;
+  }
+  return n;
+}

src/backend/port/qnx/sem.c

+/*-------------------------------------------------------------------------
+ *
+ * sem.c
+ *	  System V Semaphore Emulation
+ *
+ * Copyright (c) 1999, repas AEG Automation GmbH
+ *
+ *
+ * IDENTIFICATION
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx/Attic/sem.c,v 1.1 1999/12/16 01:25:06 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include <errno.h>
+#include <semaphore.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include "postgres.h"
+#include "storage/ipc.h"
+#include <sys/sem.h>
+
+
+#define SETMAX    32
+#define SEMMAX    16
+
+#define MODE    0777
+#define SHM_INFO_NAME   "SysV_Sem_Info"
+
+
+struct sem_info {
+  sem_t sem;
+  struct {
+    key_t  key;
+    int    nsems;
+    sem_t  sem[SEMMAX];  /* array of semaphores */
+    pid_t  pid[SEMMAX];  /* array of PIDs */
+  } set[SETMAX];
+};
+
+static struct sem_info  *SemInfo = ( struct sem_info * )-1;
+
+
+int semctl( int semid, int semnum, int cmd, /*...*/union semun arg )
+{
+  int r;
+
+  sem_wait( &SemInfo->sem );
+
+  if( semid < 0 || semid >= SETMAX ||
+      semnum < 0 || semnum >= SemInfo->set[semid].nsems )  {
+    sem_post( &SemInfo->sem );
+    errno = EINVAL;
+    return -1;
+  }
+
+  switch( cmd )  {
+    case GETPID:
+      r = SemInfo->set[semid].pid[semnum];
+      break;
+
+    case GETVAL:
+      r = SemInfo->set[semid].sem[semnum].value;
+      break;
+
+    case GETALL:
+      for( semnum = 0; semnum < SemInfo->set[semid].nsems; semnum++ )  {
+        arg.array[semnum] = SemInfo->set[semid].sem[semnum].value;
+      }
+      break;
+
+    case SETVAL:
+      SemInfo->set[semid].sem[semnum].value = arg.val;
+      break;
+
+    case SETALL:
+      for( semnum = 0; semnum < SemInfo->set[semid].nsems; semnum++ )  {
+        SemInfo->set[semid].sem[semnum].value = arg.array[semnum];
+      }
+      break;
+
+    case IPC_RMID:
+      for( semnum = 0; semnum < SemInfo->set[semid].nsems; semnum++ )  {
+        if( sem_destroy( &SemInfo->set[semid].sem[semnum] ) == -1 )  {
+          r = -1;
+        }
+      }
+      SemInfo->set[semid].key   = -1;
+      SemInfo->set[semid].nsems = 0;
+      break;
+
+    default:
+      sem_post( &SemInfo->sem );
+      errno = EINVAL;
+      return -1;
+  }
+
+  sem_post( &SemInfo->sem );
+
+  return r;
+}
+
+int semget( key_t key, int nsems, int semflg )
+{
+  int fd, semid, semnum/*, semnum1*/;
+  int exist = 0;
+
+  if( nsems < 0 || nsems > SEMMAX )  {
+    errno = EINVAL;
+    return -1;
+  }
+
+  /* open and map shared memory */
+  if( SemInfo == ( struct sem_info * )-1 )  {
+    /* test if the shared memory already exists */
+    fd = shm_open( SHM_INFO_NAME, O_RDWR | O_CREAT | O_EXCL, MODE );
+    if( fd == -1 && errno == EEXIST )  {
+      exist = 1;
+      fd = shm_open( SHM_INFO_NAME, O_RDWR | O_CREAT, MODE );
+    }
+    if( fd == -1 ) return fd;
+    /* The size may only be set once. Ignore errors. */
+    ltrunc( fd, sizeof( struct sem_info ), SEEK_SET );
+    SemInfo = mmap( NULL, sizeof( struct sem_info ),
+                    PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0 );
+    if( SemInfo == MAP_FAILED ) return -1;
+    if( !exist )  {
+      /* create semaphore for locking */
+      sem_init( &SemInfo->sem, 1, 1 );
+      sem_wait( &SemInfo->sem );
+      /* initilize shared memory */
+      memset( SemInfo->set, 0, sizeof( SemInfo->set ) );
+      for( semid = 0; semid < SETMAX; semid++ )  {
+        SemInfo->set[semid].key = -1;
+      }
+      sem_post( &SemInfo->sem );
+    }
+  }
+
+  sem_wait( &SemInfo->sem );
+
+  if( key != IPC_PRIVATE )   {
+    /* search existing element */
+    semid = 0;
+    while( semid < SETMAX && SemInfo->set[semid].key != key ) semid++;
+    if( !( semflg & IPC_CREAT ) && semid >= SETMAX )  {
+      sem_post( &SemInfo->sem );
+      errno = ENOENT;
+      return -1;
+    }
+    else if( semid < SETMAX )  {
+      if( semflg & IPC_CREAT && semflg & IPC_EXCL )  {
+        sem_post( &SemInfo->sem );
+        errno = EEXIST;
+        return -1;
+      }
+      else  {
+        if( nsems != 0 && SemInfo->set[semid].nsems < nsems )  {
+          sem_post( &SemInfo->sem );
+          errno = EINVAL;
+          return -1;
+        }
+        sem_post( &SemInfo->sem );
+        return semid;
+      }
+    }
+  }
+
+  /* search first free element */
+  semid = 0;
+  while( semid < SETMAX && SemInfo->set[semid].key != -1 ) semid++;
+  if( semid >= SETMAX )  {
+    sem_post( &SemInfo->sem );
+    errno = ENOSPC;
+    return -1;
+  }
+
+  for( semnum = 0; semnum < nsems; semnum++ )  {
+    sem_init( &SemInfo->set[semid].sem[semnum], 1, 0 );
+/* Currently sem_init always returns -1.
+    if( sem_init( &SemInfo->set[semid].sem[semnum], 1, 0 ) == -1 )  {
+      for( semnum1 = 0; semnum1 < semnum; semnum1++ )  {
+        sem_destroy( &SemInfo->set[semid].sem[semnum1] );
+      }
+      sem_post( &SemInfo->sem );
+      return -1;
+    }
+*/
+  }
+
+  SemInfo->set[semid].key   = key;
+  SemInfo->set[semid].nsems = nsems;
+
+  sem_post( &SemInfo->sem );
+
+  return 0;
+}
+
+int semop( int semid, struct sembuf *sops, size_t nsops )
+{
+  int i, j, r = 0, r1, errno1 = 0;
+
+  sem_wait( &SemInfo->sem );
+
+  if( semid < 0 || semid >= SETMAX )  {
+    sem_post( &SemInfo->sem );
+    errno = EINVAL;
+    return -1;
+  }
+  for( i = 0; i < nsops; i++ )  {
+    if( /*sops[i].sem_num < 0 ||*/ sops[i].sem_num >= SemInfo->set[semid].nsems )  {
+      sem_post( &SemInfo->sem );
+      errno = EFBIG;
+      return -1;
+    }
+  }
+
+  for( i = 0; i < nsops; i++ )  {
+    if( sops[i].sem_op < 0 )  {
+      if( sops[i].sem_flg & IPC_NOWAIT )  {
+        for( j = 0; j < -sops[i].sem_op; j++ )  {
+          if( sem_trywait( &SemInfo->set[semid].sem[sops[i].sem_num] ) )  {
+            errno1 = errno;
+            r = -1;
+          }
+        }
+      }
+      else  {
+        for( j = 0; j < -sops[i].sem_op; j++ )  {
+          sem_post( &SemInfo->sem ); /* avoid deadlock */
+          r1 = sem_wait( &SemInfo->set[semid].sem[sops[i].sem_num] );
+          sem_wait( &SemInfo->sem );
+          if( r1 )  {
+            errno1 = errno;
+            r = r1;
+          }
+        }
+      }
+    }
+    else if( sops[i].sem_op > 0 )  {
+      for( j = 0; j < sops[i].sem_op; j++ )  {
+        if( sem_post( &SemInfo->set[semid].sem[sops[i].sem_num] ) )  {
+          errno1 = errno;
+          r = -1;
+        }
+      }
+    }
+    else /* sops[i].sem_op == 0 */  {
+      /* not supported */
+    }
+    SemInfo->set[semid].pid[sops[i].sem_num] = getpid( );
+  }
+
+  sem_post( &SemInfo->sem );
+
+  errno = errno1;
+  return r;
+}

src/backend/port/qnx/sem.h

+/*-------------------------------------------------------------------------
+ *
+ * sem.h
+ *	  System V Semaphore Emulation
+ *
+ * Copyright (c) 1999, repas AEG Automation GmbH
+ *
+ *
+ * IDENTIFICATION
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx/Attic/sem.h,v 1.1 1999/12/16 01:25:06 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef	_SYS_SEM_H
+#define	_SYS_SEM_H
+
+#include <sys/ipc.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/*
+*       Semctl Command Definitions.
+ */
+
+#define GETNCNT 3	/* get semncnt */
+#define GETPID  4	/* get sempid */
+#define GETVAL  5	/* get semval */
+#define GETALL  6	/* get all semval's */
+#define GETZCNT 7	/* get semzcnt */
+#define SETVAL  8	/* set semval */
+#define SETALL  9	/* set all semval's */
+
+/*
+* User semaphore template for semop system calls.
+ */
+
+struct sembuf {
+        ushort_t        sem_num;        /* semaphore # */
+        short           sem_op;         /* semaphore operation */
+        short           sem_flg;        /* operation flags */
+};
+
+extern int semctl( int semid, int semnum, int cmd, /*...*/union semun arg );
+extern int semget( key_t key, int nsems, int semflg );
+extern int semop( int semid, struct sembuf *sops, size_t nsops );
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* _SYS_SEM_H */

src/backend/port/qnx/shm.c

+/*-------------------------------------------------------------------------
+ *
+ * shm.c
+ *	  System V Shared Memory Emulation
+ *
+ * Copyright (c) 1999, repas AEG Automation GmbH
+ *
+ *
+ * IDENTIFICATION
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx/Attic/shm.c,v 1.1 1999/12/16 01:25:06 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/shm.h>
+
+
+#define MODE	0777
+
+#define SHMMAX	1024
+
+
+struct shm_info {
+  int    shmid;
+  key_t  key;
+  size_t size;
+  void   *addr;
+};
+
+static struct shm_info  *ShmInfo;
+
+
+static int shm_putinfo( struct shm_info *info );
+static int shm_updinfo( int i, struct shm_info *info );
+static int shm_getinfo( int shmid, struct shm_info *info );
+static int shm_getinfobyaddr( const void *addr, struct shm_info *info );
+
+
+static int shm_putinfo( struct shm_info *info )
+{
+  int i;
+
+  if( ShmInfo == NULL )  {
+    ShmInfo = calloc( SHMMAX, sizeof( struct shm_info ) );
+    if( ShmInfo == NULL ) return -1;
+    /* initialize ShmInfo */
+    for( i = 0; i < SHMMAX; i++ )  {
+      ShmInfo[i].shmid = -1;
+    }
+  }
+
+  /* search first free element */
+  i = 0;
+  while( i < SHMMAX && ShmInfo[i].shmid != -1 ) i++;
+  if( i >= SHMMAX )  {
+    errno = ENOSPC;
+    return -1;
+  }
+
+  memcpy( &ShmInfo[i], info, sizeof( struct shm_info ) );
+  
+  return i;
+}
+
+static int shm_updinfo( int i, struct shm_info *info )
+{
+  if( i >= SHMMAX ) return -1;
+  if( ShmInfo == NULL ) return -1;
+
+  memcpy( &ShmInfo[i], info, sizeof( struct shm_info ) );
+  
+  return i;
+}
+
+static int shm_getinfo( int shmid, struct shm_info *info )
+{
+  int i;
+
+  if( ShmInfo == NULL ) return -1;
+
+  /* search element */
+  i = 0;
+  while( i < SHMMAX && ShmInfo[i].shmid != shmid ) i++;
+  if( i >= SHMMAX ) return -1;
+
+  memcpy( info, &ShmInfo[i], sizeof( struct shm_info ) );
+  
+  return i;
+}
+
+static int shm_getinfobyaddr( const void *addr, struct shm_info *info )
+{
+  int i;
+
+  if( ShmInfo == ( struct shm_info * )-1 ) return -1;
+
+  /* search element */
+  i = 0;
+  while( i < SHMMAX && ShmInfo[i].addr != addr ) i++;
+  if( i >= SHMMAX ) return -1;
+
+  memcpy( info, &ShmInfo[i], sizeof( struct shm_info ) );
+  
+  return i;
+}
+
+
+void *shmat( int shmid, const void *shmaddr, int shmflg )
+{
+  struct shm_info info;
+  int i;
+
+  i = shm_getinfo( shmid, &info );
+  if( i == -1 )  {
+    errno = EACCES;
+    return ( void * )-1;
+  }
+
+  info.addr = mmap( ( void * )shmaddr, info.size, 
+                    PROT_READ | PROT_WRITE, MAP_SHARED, shmid, 0 );
+  if( info.addr == MAP_FAILED ) return info.addr;
+
+  if( shm_updinfo( i, &info ) == -1 )  {
+    errno = EACCES;
+    return ( void * )-1;
+  }
+
+  return info.addr;
+}
+
+int shmdt( const void *addr )
+{
+  struct shm_info info;
+
+  if( shm_getinfobyaddr( addr, &info ) == -1 )  {
+    errno = EACCES;
+    return -1;
+  }
+
+  return munmap( ( void * )addr, info.size );
+}
+
+int shmctl( int shmid, int cmd, struct shmid_ds *buf )
+{
+  struct shm_info info;
+  char name[NAME_MAX+1];
+
+  /* IPC_RMID supported only */
+  if( cmd != IPC_RMID )  {
+    errno = EINVAL;
+    return -1;
+  }
+
+  if( shm_getinfo( shmid, &info ) == -1 )  {
+    errno = EACCES;
+    return -1;
+  }
+
+  return shm_unlink( itoa( info.key, name, 16 ) );
+}
+
+int shmget( key_t key, size_t size, int flags )
+{
+  char name[NAME_MAX+1];
+  int  oflag = 0;
+  struct shm_info info;
+
+  if( flags & IPC_CREAT ) oflag |= O_CREAT;
+  if( flags & IPC_EXCL  ) oflag |= O_EXCL;
+  if( flags & SHM_R )  {
+    if( flags & SHM_W ) oflag |= O_RDWR;
+    else oflag |= O_RDONLY;
+  }
+  info.shmid = shm_open( itoa( key, name, 16 ), oflag, MODE );
+
+  /* store shared memory information */
+  if( info.shmid != -1 )  {
+    info.key  = key;
+    info.size = size;
+    info.addr = NULL;
+    if( shm_putinfo( &info ) == -1 ) return -1;
+  }
+
+  /* The size may only be set once. Ignore errors. */
+  ltrunc( info.shmid, size, SEEK_SET );
+
+  return info.shmid;
+}

src/backend/port/qnx/shm.h

+/*-------------------------------------------------------------------------
+ *
+ * shm.h
+ *	  System V Shared Memory Emulation
+ *
+ * Copyright (c) 1999, repas AEG Automation GmbH
+ *
+ *
+ * IDENTIFICATION
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx/Attic/shm.h,v 1.1 1999/12/16 01:25:06 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef	_SYS_SHM_H
+#define	_SYS_SHM_H
+
+#include <sys/ipc.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#define SHM_R	0400	/* read permission */
+#define SHM_W	0200	/* write permission */
+
+struct shmid_ds {
+  int dummy;
+};
+
+extern void *shmat( int shmid, const void *shmaddr, int shmflg );
+extern int shmdt( const void *addr );
+extern int shmctl( int shmid, int cmd, struct shmid_ds *buf );
+extern int shmget( key_t key, size_t size, int flags );
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* _SYS_SHM_H */

src/backend/port/qnx/tstrint.c

+/*-------------------------------------------------------------------------
+ *
+ * tstrint.c
+ *	  rint() test
+ *
+ * Copyright (c) 1999, repas AEG Automation GmbH
+ *
+ *
+ * IDENTIFICATION
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx/Attic/tstrint.c,v 1.1 1999/12/16 01:25:06 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "os.h"
+
+
+int main( int argc, char **argv )
+{
+  double x;
+
+  if( argc != 2 ) exit( 1 );
+
+  x = strtod( argv[1], NULL );
+  printf( "rint( %f ) = %f\n", x, rint( x ) );
+
+  return 0;
+}

src/backend/port/qnx/tstsem.c

+/*-------------------------------------------------------------------------
+ *
+ * tstsem.c
+ *	  Test of System V Semaphore Emulation
+ *
+ * Copyright (c) 1999, repas AEG Automation GmbH
+ *
+ *
+ * IDENTIFICATION
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx/Attic/tstsem.c,v 1.1 1999/12/16 01:25:06 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "postgres.h"
+#include "storage/ipc.h"
+#include <sys/mman.h>
+#include <sys/sem.h>
+
+
+#define SEMMAX  1
+#define OPSMAX  1
+
+
+int main( int argc, char **argv )
+{
+  int     c, errflg = 0;
+  char    s[80];
+  key_t   key = IPC_PRIVATE;
+  int     nsems = SEMMAX;
+  int     semflg = 0;
+  int     unlink = 0;
+  int     semid, i;
+  struct sembuf sops[OPSMAX];
+  u_short array[SEMMAX];
+  union semun arg;
+
+  optarg = NULL;
+  while( !errflg && ( c = getopt( argc, argv, "k:n:cxu" ) ) != -1 )  {
+    switch( c )  {
+      case 'k': key  = atoi( optarg ); break;
+      case 'n': nsems = atoi( optarg ); break;
+      case 'c': semflg |= IPC_CREAT; break;
+      case 'x': semflg |= IPC_EXCL; break;
+      case 'u': unlink = 1; break;
+      default: errflg++;
+    }
+  }
+  if( errflg )  {
+    printf( "usage: tstsem [-k key] [-n nsems] [-cxu]\n" );
+    exit( 1 );
+  }
+
+  if( unlink )  {
+    i = shm_unlink( "SysV_Sem_Info" );
+    if( i == -1 ) perror( "shm_unlink" );
+    exit( i );
+  }
+
+  semid = semget( key, nsems, semflg );
+  if( semid == -1 )  {
+    perror( "semget" );
+    exit( semid );
+  }
+
+  do  {
+    printf( "(-)sem_op, (+)sem_op, (G)ETVAL, (S)ETVAL, GET(P)ID, GET(A)LL, SETA(L)L, e(x)it: " );
+    scanf( "%s", s );
+    switch( s[0] )  {
+      case '-': 
+      case '+': 
+        sops[0].sem_num = 0;
+        sops[0].sem_op  = atoi( s );
+        if( sops[0].sem_op == 0 ) sops[0].sem_op = s[0] == '+' ? +1 : -1;
+        sops[0].sem_flg = 0;
+        if( semop( semid, sops, 1 ) == -1 ) perror( "semop" );
+        break;
+
+      case 'G': 
+      case 'g': 
+        i = semctl( semid, 0, GETVAL, arg );
+        if( i == -1 ) perror( "semctl" );
+        else printf( "semval = %d\n", i );
+        break;
+
+      case 'S': 
+      case 's': 
+        printf( "semval = " );
+        scanf( "%d", &arg.val );
+        if( semctl( semid, 0, SETVAL, arg ) == -1 ) perror( "semctl" );
+        break;
+
+      case 'P': 
+      case 'p': 
+        i = semctl( semid, 0, GETPID, arg );
+        if( i == -1 ) perror( "semctl" );
+        else printf( "PID = %d\n", i );
+        break;
+
+      case 'A': 
+      case 'a': 
+        arg.array = array;
+        i = semctl( semid, 0, GETALL, arg );
+        if( i == -1 ) perror( "semctl" );
+        else  {
+          for( i = 0; i < nsems; i++ )  {
+            printf( "semval[%d] = %hu\n", i, arg.array[i] );
+          }
+        }
+        break;
+
+      case 'L': 
+      case 'l': 
+        arg.array = array;
+        for( i = 0; i < nsems; i++ )  {
+          printf( "semval[%d] = ", i );
+          scanf( "%hu", &arg.array[i] );
+        }
+        if( semctl( semid, 0, SETALL, arg ) == -1 )perror( "semctl" );
+        break;
+    }
+  }
+  while( s[0] != 'x' );
+
+  if( semctl( semid, 0, IPC_RMID, arg ) == -1 )  {
+    perror( "semctl" );
+    exit( -1 );
+  }
+
+  exit( 0 );
+}

src/backend/port/qnx/tstshm.c

+/*-------------------------------------------------------------------------
+ *
+ * tstshm.c
+ *	  Test of System V Shared Memory Emulation
+ *
+ * Copyright (c) 1999, repas AEG Automation GmbH
+ *
+ *
+ * IDENTIFICATION
+ *	  $Header: /cvsroot/pgsql/src/backend/port/qnx/Attic/tstshm.c,v 1.1 1999/12/16 01:25:06 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/shm.h>
+
+
+int main( int argc, char **argv )
+{
+  int     c, errflg = 0;
+  char    s[80];
+  key_t   key = 0x1000;
+  size_t  size = 256;
+  int     shmid = -1;
+  caddr_t addr = NULL;
+
+  optarg = NULL;
+  while( !errflg && ( c = getopt( argc, argv, "k:s:" ) ) != -1 )  {
+    switch( c )  {
+      case 'k': key  = atoi( optarg ); break;
+      case 's': size = atoi( optarg ); break;
+      default: errflg++;
+    }
+  }
+  if( errflg )  {
+    printf( "usage: tstshm [-k key] [-s size]\n" );
+    exit( 1 );
+  }
+
+  do  {
+    printf( "shm(g)et, shm(a)t, shm(d)t, shm(c)tl, (w)rite, (r)ead, e(x)it: " );
+    scanf( "%s", s );
+    switch( s[0] )  {
+      case 'g': 
+        shmid = shmget( key, size, IPC_CREAT | SHM_R | SHM_W );
+        if( shmid == -1 ) perror( "shmget" );
+        break;
+
+      case 'a': 
+        addr = shmat( shmid, NULL, 0 );
+        if( addr == ( void * )-1 ) perror( "shmat" );
+        break;
+
+      case 'd': 
+        if( shmdt( addr ) == -1 ) perror( "shmdt" );
+        else addr = NULL;
+        break;
+
+      case 'c': 
+        if( shmctl( shmid, IPC_RMID, NULL ) == -1 ) perror( "shmctl" );
+        else shmid = -1;
+        break;
+
+      case 'w': 
+        printf( "String to write: " );
+        scanf( "%s", addr );
+        break;
+
+      case 'r': 
+        puts( addr );
+        break;
+    }
+  }
+  while( s[0] != 'x' );
+
+  return 0;
+}

src/backend/postmaster/postmaster.c

@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.130 1999/12/06 07:21:12 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.131 1999/12/16 01:25:07 momjian Exp $
  *
  * NOTES
  *
@@ -200,7 +200,7 @@ static char Execfile[MAXPGPATH];
 
 static int	ServerSock_INET = INVALID_SOCK;		/* stream socket server */
 
-#ifndef __CYGWIN32__
+#if !defined(__CYGWIN32__) && !defined(__QNX__)
 static int	ServerSock_UNIX = INVALID_SOCK;		/* stream socket server */
 
 #endif
@@ -631,7 +631,7 @@ PostmasterMain(int argc, char *argv[])
 	    }
 	}
 
-#ifndef __CYGWIN32__
+#if !defined(__CYGWIN32__) && !defined(__QNX__)
 	status = StreamServerPort(NULL, PostPortName, &ServerSock_UNIX);
 	if (status != STATUS_OK)
 	{
@@ -887,7 +887,7 @@ ServerLoop(void)
 
 		/* new connection pending on our well-known port's socket */
 
-#ifndef __CYGWIN32__
+#if !defined(__CYGWIN32__) && !defined(__QNX__)
 		if (ServerSock_UNIX != INVALID_SOCK &&
 			FD_ISSET(ServerSock_UNIX, &rmask) &&
    		        (port = ConnCreate(ServerSock_UNIX)) != NULL) {
@@ -1035,7 +1035,7 @@ initMasks(fd_set *rmask, fd_set *wmask)
 	FD_ZERO(rmask);
 	FD_ZERO(wmask);
 
-#ifndef __CYGWIN32__
+#if !defined(__CYGWIN32__) && !defined(__QNX__)
 	if (ServerSock_UNIX != INVALID_SOCK)
 	{
 		FD_SET(ServerSock_UNIX, rmask);
@@ -1831,7 +1831,7 @@ DoBackend(Port *port)
 	/* Close the postmaster sockets */
 	if (NetServer) 
 		StreamClose(ServerSock_INET);
-#ifndef __CYGWIN32__
+#if !defined(__CYGWIN32__) && !defined(__QNX__)
 	StreamClose(ServerSock_UNIX);
 #endif
 
@@ -1964,7 +1964,7 @@ ExitPostmaster(int status)
 	 */
 	if (ServerSock_INET != INVALID_SOCK)
 		StreamClose(ServerSock_INET);
-#ifndef __CYGWIN32__
+#if !defined(__CYGWIN32__) && !defined(__QNX__)
 	if (ServerSock_UNIX != INVALID_SOCK)
 		StreamClose(ServerSock_UNIX);
 #endif
@@ -2129,7 +2129,7 @@ SSDataBase(bool startup)
 		on_exit_reset();	
 		if (NetServer) 
 			StreamClose(ServerSock_INET);
-#ifndef __CYGWIN32__
+#if !defined(__CYGWIN32__) && !defined(__QNX__)
 		StreamClose(ServerSock_UNIX);
 #endif
 

src/backend/storage/lmgr/proc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.64 1999/11/07 23:08:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.65 1999/12/16 01:25:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@
  *		This is so that we can support more backends. (system-wide semaphore
  *		sets run out pretty fast.)				  -ay 4/95
  *
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.64 1999/11/07 23:08:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.65 1999/12/16 01:25:08 momjian Exp $
  */
 #include <sys/time.h>
 #include <unistd.h>
@@ -63,7 +63,8 @@
 #include "libpq/pqsignal.h"
 
 
-/* In Ultrix, sem.h must be included after ipc.h */
+#include "storage/ipc.h"
+/* In Ultrix and QNX, sem.h must be included after ipc.h */
 #include <sys/sem.h>
 
 #include "storage/lmgr.h"

src/bin/pgaccess/Makefile

@@ -6,7 +6,7 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.7 1999/10/31 19:50:47 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.8 1999/12/16 01:25:10 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -22,15 +22,15 @@ pgaccess: pgaccess.sh
 
 install:
 	$(INSTALL) $(INSTL_EXE_OPTS) pgaccess $(BINDIR)/pgaccess
-	@if [ ! -d $(POSTGRESDIR)/pgaccess ]; then mkdir $(POSTGRESDIR)/pgaccess; fi
+	-@if [ ! -d $(POSTGRESDIR)/pgaccess ]; then mkdir $(POSTGRESDIR)/pgaccess; fi
 	$(INSTALL) $(INSTL_EXE_OPTS) main.tcl $(POSTGRESDIR)/pgaccess
-	@if [ ! -d $(POSTGRESDIR)/pgaccess/lib ]; then mkdir $(POSTGRESDIR)/pgaccess/lib; fi
+	-@if [ ! -d $(POSTGRESDIR)/pgaccess/lib ]; then mkdir $(POSTGRESDIR)/pgaccess/lib; fi
 	$(INSTALL) $(INSTLOPTS) lib/*.tcl $(POSTGRESDIR)/pgaccess/lib
-	@if [ ! -d $(POSTGRESDIR)/pgaccess/lib/help ]; then mkdir $(POSTGRESDIR)/pgaccess/lib/help; fi
+	-@if [ ! -d $(POSTGRESDIR)/pgaccess/lib/help ]; then mkdir $(POSTGRESDIR)/pgaccess/lib/help; fi
 	$(INSTALL) $(INSTLOPTS) lib/help/*.hlp $(POSTGRESDIR)/pgaccess/lib/help
-	@if [ ! -d $(POSTGRESDIR)/pgaccess/lib/languages ]; then mkdir $(POSTGRESDIR)/pgaccess/lib/languages; fi
+	-@if [ ! -d $(POSTGRESDIR)/pgaccess/lib/languages ]; then mkdir $(POSTGRESDIR)/pgaccess/lib/languages; fi
 	$(INSTALL) $(INSTLOPTS) lib/languages/[a-z]* $(POSTGRESDIR)/pgaccess/lib/languages
-	@if [ ! -d $(POSTGRESDIR)/pgaccess/images ]; then mkdir $(POSTGRESDIR)/pgaccess/images; fi
+	-@if [ ! -d $(POSTGRESDIR)/pgaccess/images ]; then mkdir $(POSTGRESDIR)/pgaccess/images; fi
 	$(INSTALL) $(INSTLOPTS) images/*.gif $(POSTGRESDIR)/pgaccess/images
 
 clean:

src/bin/scripts/Makefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.3 1999/12/08 10:29:55 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.4 1999/12/16 01:25:11 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -32,7 +32,7 @@ droplang:
 vacuumdb:
 
 install: $(SCRIPTS)
-	$(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
+	for i in $+; do $(INSTALL) $(INSTL_EXE_OPTS) $$i $(BINDIR); done
 
 clean:
 	rm -f createlang

src/config.guess

@@ -810,6 +810,9 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit 0 ;;
+    *:QNX:*:*)
+	echo i386-pc-qnx${UNAME_VERSION}
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

src/config.sub

@@ -777,6 +777,9 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
+	-qnx4*)
+		os=-qnx4
+		;;
 	-none)
 		;;
 	*)

src/configure.in

@@ -46,6 +46,7 @@ nextstep*) os=nextstep need_tas=no ;;
        esac ;;
    sysv4*) os=svr4 need_tas=no ;;
    unixware*) os=unixware need_tas=no ;;
+    qnx4*) os=qnx4 need_tas=no ;;
 *) echo ""
    echo "*************************************************************"
    echo "configure does not currently recognize your operating system,"

src/include/port/qnx4.h

+#include <sys/types.h> /* for namser.h */
+#include <arpa/nameser.h> /* for BYTE_ORDER */
+#include <process.h> /* for execv */
+#include <ioctl.h> /* for unix.h */
+#include <termios.h> /* for unix.h */
+#include <unix.h>
+#include <sys/select.h> /* for select */
+#if !defined(__GNUC__)
+#include <semaphore.h> /* for sem_t */
+#endif
+
+#define USE_POSIX_TIME
+#define HAS_TEST_AND_SET
+#define HAVE_STRING_H
+
+#undef HAVE_GETRUSAGE
+
+#define strncasecmp strnicmp
+
+#ifndef                 NAN
+#ifndef                 __nan_bytes
+#define __nan_bytes                             { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f }
+#endif   /* __nan_bytes */
+extern unsigned char __nan[8];
+#define                            NAN     (*(const double *) __nan)
+#endif   /* NAN */
+
+typedef u_short ushort;
+
+#if defined(__GNUC__)
+typedef unsigned char slock_t;
+#else
+typedef sem_t slock_t;
+#endif
+
+extern int isnan(double dsrc);
+
+extern double rint(double x);
+
+extern char *crypt(const char *, const char *);
+
+extern long random(void);
+extern void srandom(unsigned int seed);

src/include/storage/s_lock.h

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.67 1999/11/23 19:47:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.68 1999/12/16 01:25:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -197,6 +197,18 @@ tas(volatile slock_t *lock)
  * All non gcc
  */
 
+#if defined(__QNX__)
+/*
+ * QNX 4
+ *
+ * Note that slock_t under QNX is sem_t instead of char
+ */
+#define TAS(lock)       (sem_trywait((lock)) < 0)
+#define S_UNLOCK(lock)  sem_post((lock))
+#define S_INIT_LOCK(lock)       sem_init((lock), 1, 1)
+#define S_LOCK_FREE(lock)       (lock)->value
+#endif   /* __QNX__ */
+
 
 #if defined(NEED_I386_TAS_ASM)
 /* non gcc i386 based things */

src/include/utils/builtins.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.91 1999/11/25 01:28:07 wieck Exp $
+ * $Id: builtins.h,v 1.92 1999/12/16 01:25:14 momjian Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
@@ -155,6 +155,11 @@ extern int	namestrcmp(Name name, char *str);
 #define ltoa pg_ltoa
 #endif	 /* hpux */
 extern int32 pg_atoi(char *s, int size, int c);
+/* XXX hack.  QNX has itoa and ltoa (with different arguments) already. */
+#ifdef __QNX__
+#define itoa pg_itoa
+#define ltoa pg_ltoa
+#endif   /* QNX */
 extern void itoa(int i, char *a);
 extern void ltoa(int32 l, char *a);
 

src/interfaces/Makefile

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.30 1999/10/11 18:05:39 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.31 1999/12/16 01:25:15 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -53,7 +53,7 @@ install-perl5: perl5/Makefile
 	$(MAKE) -C perl5 clean
 	cd perl5 && POSTGRES_HOME="$(POSTGRESDIR)" $(PERL) Makefile.PL
 	$(MAKE) -C perl5 all
-	@if [ -w `sed -n -e 's/^ *INSTALLSITELIB *= *//p' perl5/Makefile` ]; then \
+	-@if [ -w `sed -n -e 's/^ *INSTALLSITELIB *= *//p' perl5/Makefile` ]; then \
 		$(MAKE) $(MFLAGS) -C perl5 install; \
 		rm -f perl5/Makefile; \
 	else \

src/interfaces/libpgeasy/Makefile.in

@@ -4,7 +4,7 @@
 #    Makefile for pgeasy library
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.3 1999/10/11 18:51:09 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.4 1999/12/16 01:25:16 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -41,7 +41,7 @@ include $(SRCDIR)/Makefile.shlib
 install: install-headers install-lib $(install-shlib-dep)
 
 install-headers: libpgeasy.h
-	@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
+	-@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
 	$(INSTALL) $(INSTLOPTS) libpgeasy.h $(HEADERDIR)/libpgeasy.h
 
 .PHONY: clean

src/interfaces/libpgtcl/Makefile.in

@@ -6,7 +6,7 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.36 1999/10/11 17:46:59 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.37 1999/12/16 01:25:17 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -46,7 +46,7 @@ install-headers: beforeinstall-headers libpgtcl.h
 	$(INSTALL) $(INSTLOPTS) libpgtcl.h $(HEADERDIR)/libpgtcl.h
 
 beforeinstall-headers:
-	@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
+	-@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
 
 
 .PHONY: clean

src/interfaces/libpq++/Makefile.in

@@ -6,7 +6,7 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.18 1999/12/03 17:35:05 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.19 1999/12/16 01:25:20 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -90,8 +90,8 @@ install-headers: beforeinstall-headers $(MAINHEADER)
 	done
 
 beforeinstall-headers:
-	@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
-	@if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi
+	-@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
+	-@if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi
 
 .PHONY: clean
 

src/interfaces/libpq/Makefile.in

@@ -6,7 +6,7 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.49 1999/10/13 11:38:37 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.50 1999/12/16 01:25:19 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -77,7 +77,7 @@ $(SRCDIR)/backend/fmgr.h:
 install: install-headers install-lib $(install-shlib-dep)
 
 install-headers: libpq-fe.h libpq-int.h
-	@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
+	-@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
 	$(INSTALL) $(INSTLOPTS) libpq-fe.h $(HEADERDIR)/libpq-fe.h
 	$(INSTALL) $(INSTLOPTS) libpq-int.h $(HEADERDIR)/libpq-int.h
 	$(INSTALL) $(INSTLOPTS) pqexpbuffer.h $(HEADERDIR)/pqexpbuffer.h

src/makefiles/Makefile.qnx4

+MK_NO_LORDER= true
+CXXFLAGS+= -I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++
+AR= ar
+LD= $(AR)
+LDREL= $(AROPT)
+LDOUT=
+LIBS= -lunix
+LDFLAGS=   $(LIBS)
+
+%$(DLSUFFIX): %.o
+	@echo Cannot make shared library $@ from $*.o

src/template/qnx

+AROPT:cr
+CFLAGS:
+LIBS:-lunix
+SHARED_LIB:
+ALL:
+SRCH_INC:
+SRCH_LIB:
+USE_LOCALE:no
+DLSUFFIX:.so
+YFLAGS:-d
+YACC:
+CXXFLAGS:-I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++

src/test/regress/regress.sh

 #!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.33 1999/12/10 00:48:32 momjian Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.34 1999/12/16 01:25:23 momjian Exp $
 #
 if [ $# -eq 0 ]
 then
@@ -11,7 +11,7 @@ portname=$1
 shift
 extratests="$*"
 
-if [ x$portname = "xwin" ]
+if [ x$portname = "xwin" -o x$portname = "xqnx4" ]
 then
 	HOST="-h localhost"
 else
@@ -67,16 +67,26 @@ if [ $? -ne 0 ]; then
      exit 1
 fi
 
+if [ x$portname != "xqnx4" ]
+then
 echo "=============== installing PL/pgSQL...                ================="
 createlang $HOST plpgsql regression
 if [ $? -ne 0 -a $? -ne 2 ]; then
      echo createlang failed
      exit 1
 fi
+fi
 
 echo "=============== running regression queries...         ================="
 echo "" > regression.diffs
 
+if [ x$portname = "xqnx4" ]
+then
+	DIFFOPT="-b"
+else
+	DIFFOPT="-w"
+fi
+
 stdtests=`awk '
 $1=="test"	{ print $2; }
 			{}
@@ -93,13 +103,14 @@ do
 		EXPECTED="expected/${i}.out"
 	fi
   
-	if [ `diff -w ${EXPECTED} results/${i}.out | wc -l` -ne 0 ]
+	if [ `diff ${DIFFOPT} ${EXPECTED} results/${i}.out | wc -l` -ne 0 ]
 	then
-		( diff -wC3 ${EXPECTED} results/${i}.out; \
+		( diff ${DIFFOPT} -C3 ${EXPECTED} results/${i}.out; \
 		echo "";  \
 		echo "----------------------"; \
 		echo "" ) >> regression.diffs
 		echo failed
+		echo "diff ${DIFFOPT} -C3 ${EXPECTED} results/${i}.out"
 	else
 		echo ok
 	fi