open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

From: "D'Arcy J.M. Cain" <darcy@druid.net>

Browse Source 
Subject: [HACKERS] libpq/pqcomm stuff and Solaris byte order

I decided to go ahead with the required changes since no one else seems
to.  I don't guarantee that it is perfect but with these changes the
package actually compiles.  While I was at it I added to the Sparc
Solaris header to define the byte order.  Note that NetBSD sets this
in the system headers so it wasn't required there.

In particular, someone may want to check whether I removed the correct
84 lines from backend/libpq/pqcomprim.c.
pull/50/head
Marc G. Fournier 29 years ago
parent 7d5770eaf2
commit bf872f0aff
4 changed files with 46 additions and 109 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      src/backend/libpq/pqcomm.c
  2. 137
      src/backend/libpq/pqcomprim.c
  3. 10
      src/include/libpq/pqcomm.h
  4. 4
      src/port/sparc_solaris.h

4
src/backend/libpq/pqcomm.c
Unescape View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.13 1997/03/18 20:14:33 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.14 1997/03/20 18:21:35 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -217,7 +217,7 @@ int PQgetline(char *s, int maxlen)
} }
else else
{ {
for( ; *s; *s++) for( ; *s; s++)
{ {
if(*s == '\n') if(*s == '\n')
{ {

137
src/backend/libpq/pqcomprim.c
Unescape View File

@ -8,27 +8,34 @@
/* Is the other way around than system ntoh/hton, so we roll our own /* Is the other way around than system ntoh/hton, so we roll our own
here */ here */
#if BYTE_ORDER == LITTLE_ENDIAN #ifndef BYTE_ORDER
#define ntoh_s(n) n #error BYTE_ORDER must be defined as LITTLE_ENDIAN, BIG_ENDIAN or PDP_ENDIAN
#define ntoh_l(n) n
#define hton_s(n) n
#define hton_l(n) n
#endif
#if BYTE_ORDER == BIG_ENDIAN
#define ntoh_s(n) (u_short)(((u_char *) &n)[0] << 8 | ((u_char *) &n)[1]);
#define ntoh_l(n) (u_long)(((u_char *)&n)[0] << 24 | ((u_char *)&n)[1] << 16 |\
((u_char *)&n)[2] << 8 | ((u_char *)&n)[3]);
#define hton_s(n) (ntoh_s(n))
#define hton_l(n) (ntoh_l(n))
#endif
#if BYTE_ORDER == PDP_ENDIAN
#endif
#ifndef ntoh_s
#error Please write byte order macros
#endif #endif
/* --------------------------------------------------------------------- */ #if BYTE_ORDER == LITTLE_ENDIAN
int pqPutShort(const int integer, FILE *f) # define ntoh_s(n) n
# define ntoh_l(n) n
# define hton_s(n) n
# define hton_l(n) n
#else /* BYTE_ORDER != LITTLE_ENDIAN */
# if BYTE_ORDER == BIG_ENDIAN
# define ntoh_s(n) (u_short)(((u_char *) &n)[0] << 8 | ((u_char *) &n)[1]);
# define ntoh_l(n) (u_long)(((u_char *)&n)[0] << 24 | \
((u_char *)&n)[1] << 16 | \
((u_char *)&n)[2] << 8 | ((u_char *)&n)[3]);
# define hton_s(n) (ntoh_s(n))
# define hton_l(n) (ntoh_l(n))
# else /* BYTE_ORDER != BIG_ENDIAN */
# if BYTE_ORDER == PDP_ENDIAN
# #error PDP_ENDIAN macros not written yet
# else /* BYTE_ORDER != anything known */
# #error BYTE_ORDER not defined as anything understood
# endif /* BYTE_ORDER == PDP_ENDIAN */
# endif /* BYTE_ORDER == BIG_ENDIAN */
#endif /* BYTE_ORDER == LITTLE_ENDIAN */
/* --------------------------------------------------------------------- */
int pqPutShort(int integer, FILE *f)
{ {
int retval = 0; int retval = 0;
u_short n; u_short n;
@ -41,7 +48,7 @@ int pqPutShort(const int integer, FILE *f)
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
int pqPutLong(const int integer, FILE *f) int pqPutLong(int integer, FILE *f)
{ {
int retval = 0; int retval = 0;
u_long n; u_long n;
@ -83,7 +90,7 @@ int pqGetLong(int *result, FILE *f)
/* pqGetNBytes: Read a chunk of exactly len bytes in buffer s. /* pqGetNBytes: Read a chunk of exactly len bytes in buffer s.
Return 0 if ok. Return 0 if ok.
*/ */
int pqGetNBytes(char* s, const int len, FILE *f) int pqGetNBytes(char *s, size_t len, FILE *f)
{ {
int cnt; int cnt;
@ -98,7 +105,7 @@ int pqGetNBytes(char* s, const int len, FILE *f)
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
int pqPutNBytes(const char *s, const int len, FILE *f) int pqPutNBytes(const char *s, size_t len, FILE *f)
{ {
if (f == NULL) if (f == NULL)
return 0; return 0;
@ -110,7 +117,7 @@ int pqPutNBytes(const char *s, const int len, FILE *f)
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
int pqGetString(char *s, int len, FILE *f) int pqGetString(char *s, size_t len, FILE *f)
{ {
int c; int c;
@ -147,7 +154,7 @@ int pqGetByte(FILE *f)
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
int pqPutByte(const int c, FILE *f) int pqPutByte(int c, FILE *f)
{ {
if(!f) return 0; if(!f) return 0;
@ -156,85 +163,3 @@ int pqPutByte(const int c, FILE *f)
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
#include <stdlib.h>
#include <stdio.h>
#include "postgres.h"
#include "libpq/pqcomm.h"
/* --------------------------------------------------------------------- */
/* Is the other way around than system ntoh/hton, so we roll our own
here */
#if BYTE_ORDER == LITTLE_ENDIAN
#define ntoh_s(n) n
#define ntoh_l(n) n
#define hton_s(n) n
#define hton_l(n) n
#endif
#if BYTE_ORDER == BIG_ENDIAN
#define ntoh_s(n) (u_short)(((u_char *) &n)[0] << 8 | ((u_char *) &n)[1]);
#define ntoh_l(n) (u_long)(((u_char *)&n)[0] << 24 | ((u_char *)&n)[1] << 16 |\
((u_char *)&n)[2] << 8 | ((u_char *)&n)[3]);
#define hton_s(n) (ntoh_s(n))
#define hton_l(n) (ntoh_l(n))
#endif
#if BYTE_ORDER == PDP_ENDIAN
#endif
#ifndef ntoh_s
#error Please write byte order macros
#endif
/* --------------------------------------------------------------------- */
int pqPutShort(const int integer, FILE *f)
{
int retval = 0;
u_short n;
n = hton_s(integer);
if(fwrite(&n, sizeof(u_short), 1, f) != 1)
retval = 1;
return retval;
}
/* --------------------------------------------------------------------- */
int pqPutLong(const int integer, FILE *f)
{
int retval = 0;
u_long n;
n = hton_l(integer);
if(fwrite(&n, sizeof(u_long), 1, f) != 1)
retval = 1;
return retval;
}
/* --------------------------------------------------------------------- */
int pqGetShort(int *result, FILE *f)
{
int retval = 0;
u_short n;
if(fread(&n, sizeof(u_short), 1, f) != 1)
retval = 1;
*result = ntoh_s(n);
return retval;
}
/* --------------------------------------------------------------------- */
int pqGetLong(int *result, FILE *f)
{
int retval = 0;
u_long n;
if(fread(&n, sizeof(u_long), 1, f) != 1)
retval = 1;
*result = ntoh_l(n);
return retval;
}
/* --------------------------------------------------------------------- */

10
src/include/libpq/pqcomm.h
Unescape View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: pqcomm.h,v 1.9 1997/03/16 18:50:47 scrappy Exp $ * $Id: pqcomm.h,v 1.10 1997/03/20 18:23:03 scrappy Exp $
* *
* NOTES * NOTES
* Some of this should move to libpq.h * Some of this should move to libpq.h
@ -126,8 +126,16 @@ extern int PQAsyncNotifyWaiting;
/* in pqcompriv.c */ /* in pqcompriv.c */
int pqGetShort(int *, FILE *); int pqGetShort(int *, FILE *);
int pqGetLong(int *, FILE *); int pqGetLong(int *, FILE *);
int pqGetNBytes(char *, size_t, FILE *);
int pqGetString(char *, size_t, FILE *);
int pqGetByte(FILE *);
int pqPutShort(int, FILE *); int pqPutShort(int, FILE *);
int pqPutLong(int, FILE *); int pqPutLong(int, FILE *);
int pqPutNBytes(const char *, size_t, FILE *);
int pqPutString(const char *, FILE *);
int pqPutByte(int, FILE *);
/* /*
* prototypes for functions in pqpacket.c * prototypes for functions in pqpacket.c
*/ */

4
src/port/sparc_solaris.h
Unescape View File

@ -4,3 +4,7 @@
# define SYSV_DIRENT # define SYSV_DIRENT
# define HAS_TEST_AND_SET # define HAS_TEST_AND_SET
typedef unsigned char slock_t; typedef unsigned char slock_t;
#ifndef BYTE_ORDER
#define BYTE_ORDER BIG_ENDIAN
#endif

Write Preview
Loading…
Cancel
Save