summaryrefslogtreecommitdiff
path: root/src/port
diff options
context:
space:
mode:
Diffstat (limited to 'src/port')
-rw-r--r--src/port/copydir.c31
-rw-r--r--src/port/crypt.c859
-rw-r--r--src/port/dirmod.c22
-rw-r--r--src/port/fseeko.c9
-rw-r--r--src/port/getaddrinfo.c66
-rw-r--r--src/port/getopt.c2
-rw-r--r--src/port/getopt_long.c14
-rw-r--r--src/port/gettimeofday.c15
-rw-r--r--src/port/path.c24
-rw-r--r--src/port/threads.c4
10 files changed, 565 insertions, 481 deletions
diff --git a/src/port/copydir.c b/src/port/copydir.c
index 53a819d38d..68959971fd 100644
--- a/src/port/copydir.c
+++ b/src/port/copydir.c
@@ -6,13 +6,14 @@
#include "postgres.h"
-#undef mkdir /* no reason to use that macro because we ignore the 2nd arg */
+#undef mkdir /* no reason to use that macro because we
+ * ignore the 2nd arg */
#include <dirent.h>
int
-copydir(char *fromdir,char *todir)
+copydir(char *fromdir, char *todir)
{
DIR *xldir;
struct dirent *xlde;
@@ -37,19 +38,19 @@ copydir(char *fromdir,char *todir)
while ((xlde = readdir(xldir)) != NULL)
{
- snprintf(fromfl, MAXPGPATH, "%s/%s", fromdir, xlde->d_name);
- snprintf(tofl, MAXPGPATH, "%s/%s", todir, xlde->d_name);
- if (CopyFile(fromfl,tofl,TRUE) < 0)
- {
- int save_errno = errno;
-
- closedir(xldir);
- errno = save_errno;
- ereport(ERROR,
- (errcode_for_file_access(),
- errmsg("could not copy file \"%s\": %m", fromfl)));
- return 1;
- }
+ snprintf(fromfl, MAXPGPATH, "%s/%s", fromdir, xlde->d_name);
+ snprintf(tofl, MAXPGPATH, "%s/%s", todir, xlde->d_name);
+ if (CopyFile(fromfl, tofl, TRUE) < 0)
+ {
+ int save_errno = errno;
+
+ closedir(xldir);
+ errno = save_errno;
+ ereport(ERROR,
+ (errcode_for_file_access(),
+ errmsg("could not copy file \"%s\": %m", fromfl)));
+ return 1;
+ }
}
closedir(xldir);
diff --git a/src/port/crypt.c b/src/port/crypt.c
index 893e227fcf..caa8d82142 100644
--- a/src/port/crypt.c
+++ b/src/port/crypt.c
@@ -11,22 +11,22 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
+ * must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -39,10 +39,11 @@
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)crypt.c 8.1.1.1 (Berkeley) 8/18/93";
+
#else
__RCSID("$NetBSD: crypt.c,v 1.18 2001/03/01 14:37:35 wiz Exp $");
#endif
-#endif /* not lint */
+#endif /* not lint */
#include "pg_config.h"
@@ -57,10 +58,10 @@ __RCSID("$NetBSD: crypt.c,v 1.18 2001/03/01 14:37:35 wiz Exp $");
#include <unistd.h>
#endif
-static int des_setkey(const char *key);
-static int des_cipher(const char *in, char *out, long salt, int num_iter);
-static int setkey(const char *key);
-static int encrypt(char *block, int flag);
+static int des_setkey(const char *key);
+static int des_cipher(const char *in, char *out, long salt, int num_iter);
+static int setkey(const char *key);
+static int encrypt(char *block, int flag);
/*
* UNIX password, and DES, encryption.
@@ -89,7 +90,7 @@ static int encrypt(char *block, int flag);
#ifdef CHAR_BITS
#if CHAR_BITS != 8
- #error C_block structure assumes 8 bit characters
+#error C_block structure assumes 8 bit characters
#endif
#endif
@@ -97,7 +98,7 @@ static int encrypt(char *block, int flag);
* define "B64" to be the declaration for a 64 bit integer.
* XXX this feature is currently unused, see "endian" comment below.
*/
-#define B64 __int64
+#define B64 __int64
/*
* define "LARGEDATA" to get faster permutations, by using about 72 kilobytes
@@ -108,7 +109,7 @@ static int encrypt(char *block, int flag);
/* compile with "-DSTATIC=void" when profiling */
#ifndef STATIC
-#define STATIC static void
+#define STATIC static void
#endif
/*
@@ -119,7 +120,7 @@ typedef int int32_t;
/* ==================================== */
-#define _PASSWORD_EFMT1 '_' /* extended encryption format */
+#define _PASSWORD_EFMT1 '_' /* extended encryption format */
/*
* Cipher-block representation (Bob Baldwin):
@@ -128,7 +129,7 @@ typedef int int32_t;
* representation is to store one bit per byte in an array of bytes. Bit N of
* the NBS spec is stored as the LSB of the Nth byte (index N-1) in the array.
* Another representation stores the 64 bits in 8 bytes, with bits 1..8 in the
- * first byte, 9..16 in the second, and so on. The DES spec apparently has
+ * first byte, 9..16 in the second, and so on. The DES spec apparently has
* bit 1 in the MSB of the first byte, but that is particularly noxious so we
* bit-reverse each byte so that bit 1 is the LSB of the first byte, bit 8 is
* the MSB of the first byte. Specifically, the 64-bit input data and key are
@@ -136,21 +137,21 @@ typedef int int32_t;
* MSB format.
*
* DES operates internally on groups of 32 bits which are expanded to 48 bits
- * by permutation E and shrunk back to 32 bits by the S boxes. To speed up
+ * by permutation E and shrunk back to 32 bits by the S boxes. To speed up
* the computation, the expansion is applied only once, the expanded
* representation is maintained during the encryption, and a compression
- * permutation is applied only at the end. To speed up the S-box lookups,
+ * permutation is applied only at the end. To speed up the S-box lookups,
* the 48 bits are maintained as eight 6 bit groups, one per byte, which
* directly feed the eight S-boxes. Within each byte, the 6 bits are the
- * most significant ones. The low two bits of each byte are zero. (Thus,
+ * most significant ones. The low two bits of each byte are zero. (Thus,
* bit 1 of the 48 bit E expansion is stored as the "4"-valued bit of the
* first byte in the eight byte representation, bit 2 of the 48 bit value is
- * the "8"-valued bit, and so on.) In fact, a combined "SPE"-box lookup is
+ * the "8"-valued bit, and so on.) In fact, a combined "SPE"-box lookup is
* used, in which the output is the 64 bit result of an S-box lookup which
* has been permuted by P and expanded by E, and is ready for use in the next
* iteration. Two 32-bit wide tables, SPE[0] and SPE[1], are used for this
- * lookup. Since each byte in the 48 bit path is a multiple of four, indexed
- * lookup of SPE[0] and SPE[1] is simple and fast. The key schedule and
+ * lookup. Since each byte in the 48 bit path is a multiple of four, indexed
+ * lookup of SPE[0] and SPE[1] is simple and fast. The key schedule and
* "salt" are also converted to this 8*(6+2) format. The SPE table size is
* 8*64*8 = 4K bytes.
*
@@ -164,7 +165,7 @@ typedef int int32_t;
* The byte-order problem is unfortunate, since on the one hand it is good
* to have a machine-independent C_block representation (bits 1..8 in the
* first byte, etc.), and on the other hand it is good for the LSB of the
- * first byte to be the LSB of i0. We cannot have both these things, so we
+ * first byte to be the LSB of i0. We cannot have both these things, so we
* currently use the "little-endian" representation and avoid any multi-byte
* operations that depend on byte order. This largely precludes use of the
* 64-bit datatype since the relative order of i0 and i1 are unknown. It
@@ -191,13 +192,13 @@ typedef int int32_t;
* IE3264: MSB->LSB conversion, initial permutation, and expansion.
* This is done by collecting the 32 even-numbered bits and applying
* a 32->64 bit transformation, and then collecting the 32 odd-numbered
- * bits and applying the same transformation. Since there are only
+ * bits and applying the same transformation. Since there are only
* 32 input bits, the IE3264 transformation table is half the size of
* the usual table.
* CF6464: Compression, final permutation, and LSB->MSB conversion.
* This is done by two trivial 48->32 bit compressions to obtain
* a 64-bit block (the bit numbering is given in the "CIFP" table)
- * followed by a 64->64 bit "cleanup" transformation. (It would
+ * followed by a 64->64 bit "cleanup" transformation. (It would
* be possible to group the bits in the 64-bit block so that 2
* identical 32->32 bit transformations could be used instead,
* saving a factor of 4 in space and possibly 2 in time, but
@@ -216,7 +217,7 @@ typedef int int32_t;
* transforms 56 bits into 48 bits, dropping 8 bits, so PC2 is not
* invertible. We get around that problem by using a modified PC2
* which retains the 8 otherwise-lost bits in the unused low-order
- * bits of each byte. The low-order bits are cleared when the
+ * bits of each byte. The low-order bits are cleared when the
* codes are stored into the key schedule.
* PC2ROT[1]: Same as PC2ROT[0], but with two rotations.
* This is faster than applying PC2ROT[0] twice,
@@ -225,7 +226,7 @@ typedef int int32_t;
*
* The salting is a simple permutation applied to the 48-bit result of E.
* Specifically, if bit i (1 <= i <= 24) of the salt is set then bits i and
- * i+24 of the result are swapped. The salt is thus a 24 bit number, with
+ * i+24 of the result are swapped. The salt is thus a 24 bit number, with
* 16777216 possible values. (The original salt was 12 bits and could not
* swap bits 13..24 with 36..48.)
*
@@ -235,45 +236,47 @@ typedef int int32_t;
* 8% performance penalty.
*/
-typedef union {
+typedef union
+{
unsigned char b[8];
- struct {
- int32_t i0;
- int32_t i1;
- } b32;
+ struct
+ {
+ int32_t i0;
+ int32_t i1;
+ } b32;
#if defined(B64)
- B64 b64;
+ B64 b64;
#endif
-} C_block;
+} C_block;
/*
* Convert twenty-four-bit long in host-order
* to six bits (and 2 low-order zeroes) per char little-endian format.
*/
-#define TO_SIX_BIT(rslt, src) { \
+#define TO_SIX_BIT(rslt, src) { \
C_block cvt; \
cvt.b[0] = src; src >>= 6; \
cvt.b[1] = src; src >>= 6; \
cvt.b[2] = src; src >>= 6; \
cvt.b[3] = src; \
- rslt = (cvt.b32.i0 & 0x3f3f3f3fL) << 2; \
+ rslt = (cvt.b32.i0 & 0x3f3f3f3fL) << 2; \
}
/*
* These macros may someday permit efficient use of 64-bit integers.
*/
-#define ZERO(d,d0,d1) d0 = 0, d1 = 0
-#define LOAD(d,d0,d1,bl) d0 = (bl).b32.i0, d1 = (bl).b32.i1
-#define LOADREG(d,d0,d1,s,s0,s1) d0 = s0, d1 = s1
-#define OR(d,d0,d1,bl) d0 |= (bl).b32.i0, d1 |= (bl).b32.i1
-#define STORE(s,s0,s1,bl) (bl).b32.i0 = s0, (bl).b32.i1 = s1
-#define DCL_BLOCK(d,d0,d1) int32_t d0, d1
+#define ZERO(d,d0,d1) d0 = 0, d1 = 0
+#define LOAD(d,d0,d1,bl) d0 = (bl).b32.i0, d1 = (bl).b32.i1
+#define LOADREG(d,d0,d1,s,s0,s1) d0 = s0, d1 = s1
+#define OR(d,d0,d1,bl) d0 |= (bl).b32.i0, d1 |= (bl).b32.i1
+#define STORE(s,s0,s1,bl) (bl).b32.i0 = s0, (bl).b32.i1 = s1
+#define DCL_BLOCK(d,d0,d1) int32_t d0, d1
#if defined(LARGEDATA)
- /* Waste memory like crazy. Also, do permutations in line */
-#define LGCHUNKBITS 3
-#define CHUNKBITS (1<<LGCHUNKBITS)
-#define PERM6464(d,d0,d1,cpp,p) \
+ /* Waste memory like crazy. Also, do permutations in line */
+#define LGCHUNKBITS 3
+#define CHUNKBITS (1<<LGCHUNKBITS)
+#define PERM6464(d,d0,d1,cpp,p) \
LOAD(d,d0,d1,(p)[(0<<CHUNKBITS)+(cpp)[0]]); \
OR (d,d0,d1,(p)[(1<<CHUNKBITS)+(cpp)[1]]); \
OR (d,d0,d1,(p)[(2<<CHUNKBITS)+(cpp)[2]]); \
@@ -282,208 +285,214 @@ typedef union {
OR (d,d0,d1,(p)[(5<<CHUNKBITS)+(cpp)[5]]); \
OR (d,d0,d1,(p)[(6<<CHUNKBITS)+(cpp)[6]]); \
OR (d,d0,d1,(p)[(7<<CHUNKBITS)+(cpp)[7]]);
-#define PERM3264(d,d0,d1,cpp,p) \
+#define PERM3264(d,d0,d1,cpp,p) \
LOAD(d,d0,d1,(p)[(0<<CHUNKBITS)+(cpp)[0]]); \
OR (d,d0,d1,(p)[(1<<CHUNKBITS)+(cpp)[1]]); \
OR (d,d0,d1,(p)[(2<<CHUNKBITS)+(cpp)[2]]); \
OR (d,d0,d1,(p)[(3<<CHUNKBITS)+(cpp)[3]]);
#else
- /* "small data" */
-#define LGCHUNKBITS 2
-#define CHUNKBITS (1<<LGCHUNKBITS)
-#define PERM6464(d,d0,d1,cpp,p) \
+ /* "small data" */
+#define LGCHUNKBITS 2
+#define CHUNKBITS (1<<LGCHUNKBITS)
+#define PERM6464(d,d0,d1,cpp,p) \
{ C_block tblk; permute(cpp,&tblk,p,8); LOAD (d,d0,d1,tblk); }
-#define PERM3264(d,d0,d1,cpp,p) \
+#define PERM3264(d,d0,d1,cpp,p) \
{ C_block tblk; permute(cpp,&tblk,p,4); LOAD (d,d0,d1,tblk); }
-#endif /* LARGEDATA */
+#endif /* LARGEDATA */
+
+STATIC init_des(void);
+STATIC init_perm(C_block[64 / CHUNKBITS][1 << CHUNKBITS], unsigned char[64], int, int);
-STATIC init_des(void);
-STATIC init_perm(C_block [64/CHUNKBITS][1<<CHUNKBITS], unsigned char [64], int, int);
#ifndef LARGEDATA
-STATIC permute(unsigned char *, C_block *, C_block *, int);
+STATIC permute(unsigned char *, C_block *, C_block *, int);
#endif
#ifdef DEBUG
-STATIC prtab(char *, unsigned char *, int);
+STATIC prtab(char *, unsigned char *, int);
#endif
#ifndef LARGEDATA
STATIC
permute(cp, out, p, chars_in)
- unsigned char *cp;
- C_block *out;
- C_block *p;
- int chars_in;
+unsigned char *cp;
+C_block *out;
+C_block *p;
+int chars_in;
{
- DCL_BLOCK(D,D0,D1);
- C_block *tp;
- int t;
+ DCL_BLOCK(D, D0, D1);
+ C_block *tp;
+ int t;
- ZERO(D,D0,D1);
- do {
+ ZERO(D, D0, D1);
+ do
+ {
t = *cp++;
- tp = &p[t&0xf]; OR(D,D0,D1,*tp); p += (1<<CHUNKBITS);
- tp = &p[t>>4]; OR(D,D0,D1,*tp); p += (1<<CHUNKBITS);
+ tp = &p[t & 0xf];
+ OR(D, D0, D1, *tp);
+ p += (1 << CHUNKBITS);
+ tp = &p[t >> 4];
+ OR(D, D0, D1, *tp);
+ p += (1 << CHUNKBITS);
} while (--chars_in > 0);
- STORE(D,D0,D1,*out);
+ STORE(D, D0, D1, *out);
}
-#endif /* LARGEDATA */
+#endif /* LARGEDATA */
/* ===== (mostly) Standard DES Tables ==================== */
-static unsigned char IP[] = { /* initial permutation */
- 58, 50, 42, 34, 26, 18, 10, 2,
- 60, 52, 44, 36, 28, 20, 12, 4,
- 62, 54, 46, 38, 30, 22, 14, 6,
- 64, 56, 48, 40, 32, 24, 16, 8,
- 57, 49, 41, 33, 25, 17, 9, 1,
- 59, 51, 43, 35, 27, 19, 11, 3,
- 61, 53, 45, 37, 29, 21, 13, 5,
- 63, 55, 47, 39, 31, 23, 15, 7,
+static unsigned char IP[] = { /* initial permutation */
+ 58, 50, 42, 34, 26, 18, 10, 2,
+ 60, 52, 44, 36, 28, 20, 12, 4,
+ 62, 54, 46, 38, 30, 22, 14, 6,
+ 64, 56, 48, 40, 32, 24, 16, 8,
+ 57, 49, 41, 33, 25, 17, 9, 1,
+ 59, 51, 43, 35, 27, 19, 11, 3,
+ 61, 53, 45, 37, 29, 21, 13, 5,
+ 63, 55, 47, 39, 31, 23, 15, 7,
};
/* The final permutation is the inverse of IP - no table is necessary */
-static unsigned char ExpandTr[] = { /* expansion operation */
- 32, 1, 2, 3, 4, 5,
- 4, 5, 6, 7, 8, 9,
- 8, 9, 10, 11, 12, 13,
+static unsigned char ExpandTr[] = { /* expansion operation */
+ 32, 1, 2, 3, 4, 5,
+ 4, 5, 6, 7, 8, 9,
+ 8, 9, 10, 11, 12, 13,
12, 13, 14, 15, 16, 17,
16, 17, 18, 19, 20, 21,
20, 21, 22, 23, 24, 25,
24, 25, 26, 27, 28, 29,
- 28, 29, 30, 31, 32, 1,
+ 28, 29, 30, 31, 32, 1,
};
-static unsigned char PC1[] = { /* permuted choice table 1 */
- 57, 49, 41, 33, 25, 17, 9,
- 1, 58, 50, 42, 34, 26, 18,
- 10, 2, 59, 51, 43, 35, 27,
- 19, 11, 3, 60, 52, 44, 36,
+static unsigned char PC1[] = { /* permuted choice table 1 */
+ 57, 49, 41, 33, 25, 17, 9,
+ 1, 58, 50, 42, 34, 26, 18,
+ 10, 2, 59, 51, 43, 35, 27,
+ 19, 11, 3, 60, 52, 44, 36,
63, 55, 47, 39, 31, 23, 15,
- 7, 62, 54, 46, 38, 30, 22,
- 14, 6, 61, 53, 45, 37, 29,
- 21, 13, 5, 28, 20, 12, 4,
+ 7, 62, 54, 46, 38, 30, 22,
+ 14, 6, 61, 53, 45, 37, 29,
+ 21, 13, 5, 28, 20, 12, 4,
};
-static unsigned char Rotates[] = { /* PC1 rotation schedule */
+static unsigned char Rotates[] = { /* PC1 rotation schedule */
1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1,
};
/* note: each "row" of PC2 is left-padded with bits that make it invertible */
-static unsigned char PC2[] = { /* permuted choice table 2 */
- 9, 18, 14, 17, 11, 24, 1, 5,
- 22, 25, 3, 28, 15, 6, 21, 10,
- 35, 38, 23, 19, 12, 4, 26, 8,
- 43, 54, 16, 7, 27, 20, 13, 2,
-
- 0, 0, 41, 52, 31, 37, 47, 55,
- 0, 0, 30, 40, 51, 45, 33, 48,
- 0, 0, 44, 49, 39, 56, 34, 53,
- 0, 0, 46, 42, 50, 36, 29, 32,
+static unsigned char PC2[] = { /* permuted choice table 2 */
+ 9, 18, 14, 17, 11, 24, 1, 5,
+ 22, 25, 3, 28, 15, 6, 21, 10,
+ 35, 38, 23, 19, 12, 4, 26, 8,
+ 43, 54, 16, 7, 27, 20, 13, 2,
+
+ 0, 0, 41, 52, 31, 37, 47, 55,
+ 0, 0, 30, 40, 51, 45, 33, 48,
+ 0, 0, 44, 49, 39, 56, 34, 53,
+ 0, 0, 46, 42, 50, 36, 29, 32,
};
-static unsigned char S[8][64] = { /* 48->32 bit substitution tables */
- /* S[1] */
- { 14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
- 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
- 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
- 15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13 },
- /* S[2] */
- { 15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
- 3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
- 0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
- 13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9 },
- /* S[3] */
- { 10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
- 13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
- 13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
- 1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12 },
- /* S[4] */
- { 7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
- 13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
- 10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
- 3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14 },
- /* S[5] */
- { 2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
- 14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
- 4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
- 11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3 },
- /* S[6] */
- { 12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
- 10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
- 9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
- 4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13 },
- /* S[7] */
- { 4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
- 13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
- 1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
- 6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12 },
- /* S[8] */
- { 13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
- 1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
- 7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
- 2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11 }
+static unsigned char S[8][64] = { /* 48->32 bit substitution tables */
+ /* S[1] */
+ {14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
+ 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
+ 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
+ 15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13},
+ /* S[2] */
+ {15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
+ 3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
+ 0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
+ 13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9},
+ /* S[3] */
+ {10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
+ 13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
+ 13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
+ 1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12},
+ /* S[4] */
+ {7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
+ 13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
+ 10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
+ 3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14},
+ /* S[5] */
+ {2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
+ 14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
+ 4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
+ 11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3},
+ /* S[6] */
+ {12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
+ 10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
+ 9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
+ 4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13},
+ /* S[7] */
+ {4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
+ 13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
+ 1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
+ 6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12},
+ /* S[8] */
+ {13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
+ 1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
+ 7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
+ 2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11}
};
static unsigned char P32Tr[] = { /* 32-bit permutation function */
- 16, 7, 20, 21,
+ 16, 7, 20, 21,
29, 12, 28, 17,
- 1, 15, 23, 26,
- 5, 18, 31, 10,
- 2, 8, 24, 14,
- 32, 27, 3, 9,
- 19, 13, 30, 6,
- 22, 11, 4, 25,
+ 1, 15, 23, 26,
+ 5, 18, 31, 10,
+ 2, 8, 24, 14,
+ 32, 27, 3, 9,
+ 19, 13, 30, 6,
+ 22, 11, 4, 25,
};
-static unsigned char CIFP[] = { /* compressed/interleaved permutation */
- 1, 2, 3, 4, 17, 18, 19, 20,
- 5, 6, 7, 8, 21, 22, 23, 24,
- 9, 10, 11, 12, 25, 26, 27, 28,
- 13, 14, 15, 16, 29, 30, 31, 32,
+static unsigned char CIFP[] = { /* compressed/interleaved permutation */
+ 1, 2, 3, 4, 17, 18, 19, 20,
+ 5, 6, 7, 8, 21, 22, 23, 24,
+ 9, 10, 11, 12, 25, 26, 27, 28,
+ 13, 14, 15, 16, 29, 30, 31, 32,
- 33, 34, 35, 36, 49, 50, 51, 52,
- 37, 38, 39, 40, 53, 54, 55, 56,
- 41, 42, 43, 44, 57, 58, 59, 60,
- 45, 46, 47, 48, 61, 62, 63, 64,
+ 33, 34, 35, 36, 49, 50, 51, 52,
+ 37, 38, 39, 40, 53, 54, 55, 56,
+ 41, 42, 43, 44, 57, 58, 59, 60,
+ 45, 46, 47, 48, 61, 62, 63, 64,
};
-static unsigned char itoa64[] = /* 0..63 => ascii-64 */
- "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+static unsigned char itoa64[] = /* 0..63 => ascii-64 */
+"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
/* ===== Tables that are initialized at run time ==================== */
-static unsigned char a64toi[128]; /* ascii-64 => 0..63 */
+static unsigned char a64toi[128]; /* ascii-64 => 0..63 */
/* Initial key schedule permutation */
-static C_block PC1ROT[64/CHUNKBITS][1<<CHUNKBITS];
+static C_block PC1ROT[64 / CHUNKBITS][1 << CHUNKBITS];
/* Subsequent key schedule rotation permutations */
-static C_block PC2ROT[2][64/CHUNKBITS][1<<CHUNKBITS];
+static C_block PC2ROT[2][64 / CHUNKBITS][1 << CHUNKBITS];
/* Initial permutation/expansion table */
-static C_block IE3264[32/CHUNKBITS][1<<CHUNKBITS];
+static C_block IE3264[32 / CHUNKBITS][1 << CHUNKBITS];
-/* Table that combines the S, P, and E operations. */
+/* Table that combines the S, P, and E operations. */
static int32_t SPE[2][8][64];
/* compressed/interleaved => final permutation table */
-static C_block CF6464[64/CHUNKBITS][1<<CHUNKBITS];
+static C_block CF6464[64 / CHUNKBITS][1 << CHUNKBITS];
/* ==================================== */
-static C_block constdatablock; /* encryption constant */
-static char cryptresult[1+4+4+11+1]; /* encrypted result */
+static C_block constdatablock; /* encryption constant */
+static char cryptresult[1 + 4 + 4 + 11 + 1]; /* encrypted result */
extern char *__md5crypt(const char *, const char *); /* XXX */
-extern char *__bcrypt(const char *, const char *); /* XXX */
+extern char *__bcrypt(const char *, const char *); /* XXX */
/*
@@ -492,105 +501,127 @@ extern char *__bcrypt(const char *, const char *); /* XXX */
*/
char *
crypt(key, setting)
- const char *key;
- const char *setting;
+const char *key;
+const char *setting;
{
- char *encp;
- int32_t i;
- int t;
- int32_t salt;
- int num_iter, salt_size;
- C_block keyblock, rsltblock;
+ char *encp;
+ int32_t i;
+ int t;
+ int32_t salt;
+ int num_iter,
+ salt_size;
+ C_block keyblock,
+ rsltblock;
#if 0
/* Non-DES encryption schemes hook in here. */
- if (setting[0] == _PASSWORD_NONDES) {
- switch (setting[1]) {
- case '2':
- return (__bcrypt(key, setting));
- case '1':
- default:
- return (__md5crypt(key, setting));
+ if (setting[0] == _PASSWORD_NONDES)
+ {
+ switch (setting[1])
+ {
+ case '2':
+ return (__bcrypt(key, setting));
+ case '1':
+ default:
+ return (__md5crypt(key, setting));
}
}
#endif
- for (i = 0; i < 8; i++) {
- if ((t = 2*(unsigned char)(*key)) != 0)
+ for (i = 0; i < 8; i++)
+ {
+ if ((t = 2 * (unsigned char) (*key)) != 0)
key++;
keyblock.b[i] = t;
}
- if (des_setkey((char *)keyblock.b)) /* also initializes "a64toi" */
+ if (des_setkey((char *) keyblock.b)) /* also initializes
+ * "a64toi" */
return (NULL);
encp = &cryptresult[0];
- switch (*setting) {
- case _PASSWORD_EFMT1:
- /*
- * Involve the rest of the password 8 characters at a time.
- */
- while (*key) {
- if (des_cipher((char *)(void *)&keyblock,
- (char *)(void *)&keyblock, 0L, 1))
- return (NULL);
- for (i = 0; i < 8; i++) {
- if ((t = 2*(unsigned char)(*key)) != 0)
- key++;
- keyblock.b[i] ^= t;
+ switch (*setting)
+ {
+ case _PASSWORD_EFMT1:
+
+ /*
+ * Involve the rest of the password 8 characters at a time.
+ */
+ while (*key)
+ {
+ if (des_cipher((char *) (void *) &keyblock,
+ (char *) (void *) &keyblock, 0L, 1))
+ return (NULL);
+ for (i = 0; i < 8; i++)
+ {
+ if ((t = 2 * (unsigned char) (*key)) != 0)
+ key++;
+ keyblock.b[i] ^= t;
+ }
+ if (des_setkey((char *) keyblock.b))
+ return (NULL);
}
- if (des_setkey((char *)keyblock.b))
- return (NULL);
- }
- *encp++ = *setting++;
+ *encp++ = *setting++;
- /* get iteration count */
- num_iter = 0;
- for (i = 4; --i >= 0; ) {
- if ((t = (unsigned char)setting[i]) == '\0')
- t = '.';
- encp[i] = t;
- num_iter = (num_iter<<6) | a64toi[t];
- }
- setting += 4;
- encp += 4;
- salt_size = 4;
- break;
- default:
- num_iter = 25;
- salt_size = 2;
+ /* get iteration count */
+ num_iter = 0;
+ for (i = 4; --i >= 0;)
+ {
+ if ((t = (unsigned char) setting[i]) == '\0')
+ t = '.';
+ encp[i] = t;
+ num_iter = (num_iter << 6) | a64toi[t];
+ }
+ setting += 4;
+ encp += 4;
+ salt_size = 4;
+ break;
+ default:
+ num_iter = 25;
+ salt_size = 2;
}
salt = 0;
- for (i = salt_size; --i >= 0; ) {
- if ((t = (unsigned char)setting[i]) == '\0')
+ for (i = salt_size; --i >= 0;)
+ {
+ if ((t = (unsigned char) setting[i]) == '\0')
t = '.';
encp[i] = t;
- salt = (salt<<6) | a64toi[t];
+ salt = (salt << 6) | a64toi[t];
}
encp += salt_size;
- if (des_cipher((char *)(void *)&constdatablock,
- (char *)(void *)&rsltblock, salt, num_iter))
+ if (des_cipher((char *) (void *) &constdatablock,
+ (char *) (void *) &rsltblock, salt, num_iter))
return (NULL);
/*
* Encode the 64 cipher bits as 11 ascii characters.
*/
- i = ((int32_t)((rsltblock.b[0]<<8) | rsltblock.b[1])<<8) |
- rsltblock.b[2];
- encp[3] = itoa64[i&0x3f]; i >>= 6;
- encp[2] = itoa64[i&0x3f]; i >>= 6;
- encp[1] = itoa64[i&0x3f]; i >>= 6;
- encp[0] = itoa64[i]; encp += 4;
- i = ((int32_t)((rsltblock.b[3]<<8) | rsltblock.b[4])<<8) |
- rsltblock.b[5];
- encp[3] = itoa64[i&0x3f]; i >>= 6;
- encp[2] = itoa64[i&0x3f]; i >>= 6;
- encp[1] = itoa64[i&0x3f]; i >>= 6;
- encp[0] = itoa64[i]; encp += 4;
- i = ((int32_t)((rsltblock.b[6])<<8) | rsltblock.b[7])<<2;
- encp[2] = itoa64[i&0x3f]; i >>= 6;
- encp[1] = itoa64[i&0x3f]; i >>= 6;
+ i = ((int32_t) ((rsltblock.b[0] << 8) | rsltblock.b[1]) << 8) |
+ rsltblock.b[2];
+ encp[3] = itoa64[i & 0x3f];
+ i >>= 6;
+ encp[2] = itoa64[i & 0x3f];
+ i >>= 6;
+ encp[1] = itoa64[i & 0x3f];
+ i >>= 6;
+ encp[0] = itoa64[i];
+ encp += 4;
+ i = ((int32_t) ((rsltblock.b[3] << 8) | rsltblock.b[4]) << 8) |
+ rsltblock.b[5];
+ encp[3] = itoa64[i & 0x3f];
+ i >>= 6;
+ encp[2] = itoa64[i & 0x3f];
+ i >>= 6;
+ encp[1] = itoa64[i & 0x3f];
+ i >>= 6;
+ encp[0] = itoa64[i];
+ encp += 4;
+ i = ((int32_t) ((rsltblock.b[6]) << 8) | rsltblock.b[7]) << 2;
+ encp[2] = itoa64[i & 0x3f];
+ i >>= 6;
+ encp[1] = itoa64[i & 0x3f];
+ i >>= 6;
encp[0] = itoa64[i];
encp[3] = 0;
@@ -602,8 +633,8 @@ crypt(key, setting)
/*
* The Key Schedule, filled in by des_setkey() or setkey().
*/
-#define KS_SIZE 16
-static C_block KS[KS_SIZE];
+#define KS_SIZE 16
+static C_block KS[KS_SIZE];
static volatile int des_ready = 0;
@@ -612,24 +643,25 @@ static volatile int des_ready = 0;
*/
static int
des_setkey(key)
- const char *key;
+const char *key;
{
DCL_BLOCK(K, K0, K1);
- C_block *ptabp;
- int i;
+ C_block *ptabp;
+ int i;
if (!des_ready)
init_des();
- PERM6464(K,K0,K1,(unsigned char *)key,(C_block *)PC1ROT);
- key = (char *)&KS[0];
- STORE(K&~0x03030303L, K0&~0x03030303L, K1, *(C_block *)key);
- for (i = 1; i < 16; i++) {
+ PERM6464(K, K0, K1, (unsigned char *) key, (C_block *) PC1ROT);
+ key = (char *) &KS[0];
+ STORE(K & ~0x03030303L, K0 & ~0x03030303L, K1, *(C_block *) key);
+ for (i = 1; i < 16; i++)
+ {
key += sizeof(C_block);
- STORE(K,K0,K1,*(C_block *)key);
- ptabp = (C_block *)PC2ROT[Rotates[i]-1];
- PERM6464(K,K0,K1,(unsigned char *)key,ptabp);
- STORE(K&~0x03030303L, K0&~0x03030303L, K1, *(C_block *)key);
+ STORE(K, K0, K1, *(C_block *) key);
+ ptabp = (C_block *) PC2ROT[Rotates[i] - 1];
+ PERM6464(K, K0, K1, (unsigned char *) key, ptabp);
+ STORE(K & ~0x03030303L, K0 & ~0x03030303L, K1, *(C_block *) key);
}
return (0);
}
@@ -644,80 +676,93 @@ des_setkey(key)
*/
static int
des_cipher(in, out, salt, num_iter)
- const char *in;
- char *out;
- long salt;
- int num_iter;
+const char *in;
+char *out;
+long salt;
+int num_iter;
{
/* variables that we want in registers, most important first */
#if defined(pdp11)
- int j;
+ int j;
#endif
- int32_t L0, L1, R0, R1, k;
- C_block *kp;
- int ks_inc, loop_count;
- C_block B;
+ int32_t L0,
+ L1,
+ R0,
+ R1,
+ k;
+ C_block *kp;
+ int ks_inc,
+ loop_count;
+ C_block B;
L0 = salt;
- TO_SIX_BIT(salt, L0); /* convert to 4*(6+2) format */
+ TO_SIX_BIT(salt, L0); /* convert to 4*(6+2) format */
#if defined(__vax__) || defined(pdp11)
- salt = ~salt; /* "x &~ y" is faster than "x & y". */
-#define SALT (~salt)
+ salt = ~salt; /* "x &~ y" is faster than "x & y". */
+#define SALT (~salt)
#else
-#define SALT salt
+#define SALT salt
#endif
#if defined(MUST_ALIGN)
- B.b[0] = in[0]; B.b[1] = in[1]; B.b[2] = in[2]; B.b[3] = in[3];
- B.b[4] = in[4]; B.b[5] = in[5]; B.b[6] = in[6]; B.b[7] = in[7];
- LOAD(L,L0,L1,B);
+ B.b[0] = in[0];
+ B.b[1] = in[1];
+ B.b[2] = in[2];
+ B.b[3] = in[3];
+ B.b[4] = in[4];
+ B.b[5] = in[5];
+ B.b[6] = in[6];
+ B.b[7] = in[7];
+ LOAD(L, L0, L1, B);
#else
- LOAD(L,L0,L1,*(C_block *)in);
+ LOAD(L, L0, L1, *(C_block *) in);
#endif
- LOADREG(R,R0,R1,L,L0,L1);
+ LOADREG(R, R0, R1, L, L0, L1);
L0 &= 0x55555555L;
L1 &= 0x55555555L;
- L0 = (L0 << 1) | L1; /* L0 is the even-numbered input bits */
+ L0 = (L0 << 1) | L1; /* L0 is the even-numbered input bits */
R0 &= 0xaaaaaaaaL;
R1 = (R1 >> 1) & 0x55555555L;
- L1 = R0 | R1; /* L1 is the odd-numbered input bits */
- STORE(L,L0,L1,B);
- PERM3264(L,L0,L1,B.b, (C_block *)IE3264); /* even bits */
- PERM3264(R,R0,R1,B.b+4,(C_block *)IE3264); /* odd bits */
+ L1 = R0 | R1; /* L1 is the odd-numbered input bits */
+ STORE(L, L0, L1, B);
+ PERM3264(L, L0, L1, B.b, (C_block *) IE3264); /* even bits */
+ PERM3264(R, R0, R1, B.b + 4, (C_block *) IE3264); /* odd bits */
if (num_iter >= 0)
- { /* encryption */
+ { /* encryption */
kp = &KS[0];
- ks_inc = sizeof(*kp);
+ ks_inc = sizeof(*kp);
}
else
- { /* decryption */
+ { /* decryption */
num_iter = -num_iter;
- kp = &KS[KS_SIZE-1];
- ks_inc = -(long)sizeof(*kp);
+ kp = &KS[KS_SIZE - 1];
+ ks_inc = -(long) sizeof(*kp);
}
- while (--num_iter >= 0) {
+ while (--num_iter >= 0)
+ {
loop_count = 8;
- do {
+ do
+ {
-#define SPTAB(t, i) \
- (*(int32_t *)((unsigned char *)t + i*(sizeof(int32_t)/4)))
+#define SPTAB(t, i) \
+ (*(int32_t *)((unsigned char *)t + i*(sizeof(int32_t)/4)))
#if defined(gould)
/* use this if B.b[i] is evaluated just once ... */
-#define DOXOR(x,y,i) x^=SPTAB(SPE[0][i],B.b[i]); y^=SPTAB(SPE[1][i],B.b[i]);
+#define DOXOR(x,y,i) x^=SPTAB(SPE[0][i],B.b[i]); y^=SPTAB(SPE[1][i],B.b[i]);
#else
#if defined(pdp11)
/* use this if your "long" int indexing is slow */
-#define DOXOR(x,y,i) j=B.b[i]; x^=SPTAB(SPE[0][i],j); y^=SPTAB(SPE[1][i],j);
+#define DOXOR(x,y,i) j=B.b[i]; x^=SPTAB(SPE[0][i],j); y^=SPTAB(SPE[1][i],j);
#else
/* use this if "k" is allocated to a register ... */
-#define DOXOR(x,y,i) k=B.b[i]; x^=SPTAB(SPE[0][i],k); y^=SPTAB(SPE[1][i],k);
+#define DOXOR(x,y,i) k=B.b[i]; x^=SPTAB(SPE[0][i],k); y^=SPTAB(SPE[1][i],k);
#endif
#endif
-#define CRUNCH(p0, p1, q0, q1) \
+#define CRUNCH(p0, p1, q0, q1) \
k = (q0 ^ q1) & SALT; \
B.b32.i0 = k ^ q0 ^ kp->b32.i0; \
B.b32.i1 = k ^ q1 ^ kp->b32.i1; \
@@ -735,26 +780,35 @@ des_cipher(in, out, salt, num_iter)
CRUNCH(L0, L1, R0, R1);
CRUNCH(R0, R1, L0, L1);
} while (--loop_count != 0);
- kp = (C_block *)((char *)kp-(ks_inc*KS_SIZE));
+ kp = (C_block *) ((char *) kp - (ks_inc * KS_SIZE));
/* swap L and R */
- L0 ^= R0; L1 ^= R1;
- R0 ^= L0; R1 ^= L1;
- L0 ^= R0; L1 ^= R1;
+ L0 ^= R0;
+ L1 ^= R1;
+ R0 ^= L0;
+ R1 ^= L1;
+ L0 ^= R0;
+ L1 ^= R1;
}
/* store the encrypted (or decrypted) result */
L0 = ((L0 >> 3) & 0x0f0f0f0fL) | ((L1 << 1) & 0xf0f0f0f0L);
L1 = ((R0 >> 3) & 0x0f0f0f0fL) | ((R1 << 1) & 0xf0f0f0f0L);
- STORE(L,L0,L1,B);
- PERM6464(L,L0,L1,B.b, (C_block *)CF6464);
+ STORE(L, L0, L1, B);
+ PERM6464(L, L0, L1, B.b, (C_block *) CF6464);
#if defined(MUST_ALIGN)
- STORE(L,L0,L1,B);
- out[0] = B.b[0]; out[1] = B.b[1]; out[2] = B.b[2]; out[3] = B.b[3];
- out[4] = B.b[4]; out[5] = B.b[5]; out[6] = B.b[6]; out[7] = B.b[7];
+ STORE(L, L0, L1, B);
+ out[0] = B.b[0];
+ out[1] = B.b[1];
+ out[2] = B.b[2];
+ out[3] = B.b[3];
+ out[4] = B.b[4];
+ out[5] = B.b[5];
+ out[6] = B.b[6];
+ out[7] = B.b[7];
#else
- STORE(L,L0,L1,*(C_block *)out);
+ STORE(L, L0, L1, *(C_block *) out);
#endif
return (0);
}
@@ -767,10 +821,12 @@ des_cipher(in, out, salt, num_iter)
STATIC
init_des()
{
- int i, j;
- int32_t k;
- int tableno;
- static unsigned char perm[64], tmp32[32]; /* "static" for speed */
+ int i,
+ j;
+ int32_t k;
+ int tableno;
+ static unsigned char perm[64],
+ tmp32[32]; /* "static" for speed */
static volatile long init_start = 0;
/*
@@ -784,15 +840,18 @@ init_des()
*/
for (i = 0; i < 64; i++)
perm[i] = 0;
- for (i = 0; i < 64; i++) {
+ for (i = 0; i < 64; i++)
+ {
if ((k = PC2[i]) == 0)
continue;
- k += Rotates[0]-1;
- if ((k%28) < Rotates[0]) k -= 28;
+ k += Rotates[0] - 1;
+ if ((k % 28) < Rotates[0])
+ k -= 28;
k = PC1[k];
- if (k > 0) {
+ if (k > 0)
+ {
k--;
- k = (k|07) - (k&07);
+ k = (k | 07) - (k & 07);
k++;
}
perm[i] = k;
@@ -805,20 +864,25 @@ init_des()
/*
* PC2ROT - PC2 inverse, then Rotate (once or twice), then PC2.
*/
- for (j = 0; j < 2; j++) {
+ for (j = 0; j < 2; j++)
+ {
unsigned char pc2inv[64];
+
for (i = 0; i < 64; i++)
perm[i] = pc2inv[i] = 0;
- for (i = 0; i < 64; i++) {
+ for (i = 0; i < 64; i++)
+ {
if ((k = PC2[i]) == 0)
continue;
- pc2inv[k-1] = i+1;
+ pc2inv[k - 1] = i + 1;
}
- for (i = 0; i < 64; i++) {
+ for (i = 0; i < 64; i++)
+ {
if ((k = PC2[i]) == 0)
continue;
k += j;
- if ((k%28) <= j) k -= 28;
+ if ((k % 28) <= j)
+ k -= 28;
perm[i] = pc2inv[k];
}
#ifdef DEBUG
@@ -830,19 +894,22 @@ init_des()
/*
* Bit reverse, then initial permutation, then expansion.
*/
- for (i = 0; i < 8; i++) {
- for (j = 0; j < 8; j++) {
- k = (j < 2)? 0: IP[ExpandTr[i*6+j-2]-1];
+ for (i = 0; i < 8; i++)
+ {
+ for (j = 0; j < 8; j++)
+ {
+ k = (j < 2) ? 0 : IP[ExpandTr[i * 6 + j - 2] - 1];
if (k > 32)
k -= 32;
else if (k > 0)
k--;
- if (k > 0) {
+ if (k > 0)
+ {
k--;
- k = (k|07) - (k&07);
+ k = (k | 07) - (k & 07);
k++;
}
- perm[i*8+j] = k;
+ perm[i * 8 + j] = k;
}
}
#ifdef DEBUG
@@ -853,14 +920,16 @@ init_des()
/*
* Compression, then final permutation, then bit reverse.
*/
- for (i = 0; i < 64; i++) {
- k = IP[CIFP[i]-1];
- if (k > 0) {
+ for (i = 0; i < 64; i++)
+ {
+ k = IP[CIFP[i] - 1];
+ if (k > 0)
+ {
k--;
- k = (k|07) - (k&07);
+ k = (k | 07) - (k & 07);
k++;
}
- perm[k-1] = i+1;
+ perm[k - 1] = i + 1;
}
#ifdef DEBUG
prtab("cftab", perm, 8);
@@ -871,31 +940,33 @@ init_des()
* SPE table
*/
for (i = 0; i < 48; i++)
- perm[i] = P32Tr[ExpandTr[i]-1];
- for (tableno = 0; tableno < 8; tableno++) {
- for (j = 0; j < 64; j++) {
- k = (((j >> 0) &01) << 5)|
- (((j >> 1) &01) << 3)|
- (((j >> 2) &01) << 2)|
- (((j >> 3) &01) << 1)|
- (((j >> 4) &01) << 0)|
- (((j >> 5) &01) << 4);
+ perm[i] = P32Tr[ExpandTr[i] - 1];
+ for (tableno = 0; tableno < 8; tableno++)
+ {
+ for (j = 0; j < 64; j++)
+ {
+ k = (((j >> 0) & 01) << 5) |
+ (((j >> 1) & 01) << 3) |
+ (((j >> 2) & 01) << 2) |
+ (((j >> 3) & 01) << 1) |
+ (((j >> 4) & 01) << 0) |
+ (((j >> 5) & 01) << 4);
k = S[tableno][k];
- k = (((k >> 3)&01) << 0)|
- (((k >> 2)&01) << 1)|
- (((k >> 1)&01) << 2)|
- (((k >> 0)&01) << 3);
+ k = (((k >> 3) & 01) << 0) |
+ (((k >> 2) & 01) << 1) |
+ (((k >> 1) & 01) << 2) |
+ (((k >> 0) & 01) << 3);
for (i = 0; i < 32; i++)
tmp32[i] = 0;
for (i = 0; i < 4; i++)
tmp32[4 * tableno + i] = (k >> i) & 01;
k = 0;
- for (i = 24; --i >= 0; )
- k = (k<<1) | tmp32[perm[i]-1];
+ for (i = 24; --i >= 0;)
+ k = (k << 1) | tmp32[perm[i] - 1];
TO_SIX_BIT(SPE[0][tableno][j], k);
k = 0;
- for (i = 24; --i >= 0; )
- k = (k<<1) | tmp32[perm[i+24]-1];
+ for (i = 24; --i >= 0;)
+ k = (k << 1) | tmp32[perm[i + 24] - 1];
TO_SIX_BIT(SPE[1][tableno][j], k);
}
}
@@ -913,21 +984,27 @@ init_des()
*/
STATIC
init_perm(perm, p, chars_in, chars_out)
- C_block perm[64/CHUNKBITS][1<<CHUNKBITS];
- unsigned char p[64];
- int chars_in, chars_out;
+C_block perm[64 / CHUNKBITS][1 << CHUNKBITS];
+unsigned char p[64];
+int chars_in,
+ chars_out;
{
- int i, j, k, l;
-
- for (k = 0; k < chars_out*8; k++) { /* each output bit position */
- l = p[k] - 1; /* where this bit comes from */
+ int i,
+ j,
+ k,
+ l;
+
+ for (k = 0; k < chars_out * 8; k++)
+ { /* each output bit position */
+ l = p[k] - 1; /* where this bit comes from */
if (l < 0)
- continue; /* output bit is always 0 */
- i = l>>LGCHUNKBITS; /* which chunk this bit comes from */
- l = 1<<(l&(CHUNKBITS-1)); /* mask for this bit */
- for (j = 0; j < (1<<CHUNKBITS); j++) { /* each chunk value */
+ continue; /* output bit is always 0 */
+ i = l >> LGCHUNKBITS; /* which chunk this bit comes from */
+ l = 1 << (l & (CHUNKBITS - 1)); /* mask for this bit */
+ for (j = 0; j < (1 << CHUNKBITS); j++)
+ { /* each chunk value */
if ((j & l) != 0)
- perm[i][j].b[k>>3] |= 1<<(k&07);
+ perm[i][j].b[k >> 3] |= 1 << (k & 07);
}
}
}
@@ -937,20 +1014,24 @@ init_perm(perm, p, chars_in, chars_out)
*/
int
setkey(key)
- const char *key;
+const char *key;
{
- int i, j, k;
- C_block keyblock;
+ int i,
+ j,
+ k;
+ C_block keyblock;
- for (i = 0; i < 8; i++) {
+ for (i = 0; i < 8; i++)
+ {
k = 0;
- for (j = 0; j < 8; j++) {
+ for (j = 0; j < 8; j++)
+ {
k <<= 1;
- k |= (unsigned char)*key++;
+ k |= (unsigned char) *key++;
}
keyblock.b[i] = k;
}
- return (des_setkey((char *)keyblock.b));
+ return (des_setkey((char *) keyblock.b));
}
/*
@@ -958,26 +1039,32 @@ setkey(key)
*/
static int
encrypt(block, flag)
- char *block;
- int flag;
+char *block;
+int flag;
{
- int i, j, k;
- C_block cblock;
+ int i,
+ j,
+ k;
+ C_block cblock;
- for (i = 0; i < 8; i++) {
+ for (i = 0; i < 8; i++)
+ {
k = 0;
- for (j = 0; j < 8; j++) {
+ for (j = 0; j < 8; j++)
+ {
k <<= 1;
- k |= (unsigned char)*block++;
+ k |= (unsigned char) *block++;
}
cblock.b[i] = k;
}
- if (des_cipher((char *)&cblock, (char *)&cblock, 0L, (flag ? -1: 1)))
+ if (des_cipher((char *) &cblock, (char *) &cblock, 0L, (flag ? -1 : 1)))
return (1);
- for (i = 7; i >= 0; i--) {
+ for (i = 7; i >= 0; i--)
+ {
k = cblock.b[i];
- for (j = 7; j >= 0; j--) {
- *--block = k&01;
+ for (j = 7; j >= 0; j--)
+ {
+ *--block = k & 01;
k >>= 1;
}
}
@@ -987,19 +1074,21 @@ encrypt(block, flag)
#ifdef DEBUG
STATIC
prtab(s, t, num_rows)
- char *s;
- unsigned char *t;
- int num_rows;
+char *s;
+unsigned char *t;
+int num_rows;
{
- int i, j;
-
- (void)printf("%s:\n", s);
- for (i = 0; i < num_rows; i++) {
- for (j = 0; j < 8; j++) {
- (void)printf("%3d", t[i*8+j]);
- }
- (void)printf("\n");
+ int i,
+ j;
+
+ (void) printf("%s:\n", s);
+ for (i = 0; i < num_rows; i++)
+ {
+ for (j = 0; j < 8; j++)
+ (void) printf("%3d", t[i * 8 + j]);
+ (void) printf("\n");
}
- (void)printf("\n");
+ (void) printf("\n");
}
+
#endif
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index 6d680a4150..9415517b16 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -1,8 +1,8 @@
/*
* These are replacement versions of unlink and rename that work on
- * Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me.
+ * Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me.
*/
-
+
#ifndef TEST_VERSION
#include "postgres.h"
@@ -13,14 +13,14 @@
int
pgrename(const char *from, const char *to)
{
- int loops = 0;
+ int loops = 0;
while (!MoveFileEx(from, to, MOVEFILE_REPLACE_EXISTING))
{
if (GetLastError() != ERROR_ACCESS_DENIED)
/* set errno? */
return -1;
- Sleep(100); /* ms */
+ Sleep(100); /* ms */
if (loops == 10)
#ifndef FRONTEND
elog(LOG, "could not rename \"%s\" to \"%s\", continuing to try",
@@ -45,14 +45,14 @@ pgrename(const char *from, const char *to)
int
pgunlink(const char *path)
{
- int loops = 0;
+ int loops = 0;
while (unlink(path))
{
if (errno != EACCES)
/* set errno? */
return -1;
- Sleep(100); /* ms */
+ Sleep(100); /* ms */
if (loops == 10)
#ifndef FRONTEND
elog(LOG, "could not unlink \"%s\", continuing to try",
@@ -78,13 +78,13 @@ pgunlink(const char *path)
/*
- * Illustrates problem with Win32 rename() and unlink()
+ * Illustrates problem with Win32 rename() and unlink()
* under concurrent access.
*
* Run with arg '1', then less than 5 seconds later, run with
* arg '2' (rename) or '3'(unlink) to see the problem.
*/
-
+
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
@@ -97,9 +97,9 @@ do { \
} while (0)
int
-main(int argc, char* argv[])
+main(int argc, char *argv[])
{
- FILE *fd;
+ FILE *fd;
if (argc != 2)
halt("Arg must be '1' (test), '2' (rename), or '3' (unlink)\n"
@@ -143,7 +143,7 @@ main(int argc, char* argv[])
}
halt("unlink successful\n");
}
- else
+ else
halt("invalid arg\n");
return 0;
diff --git a/src/port/fseeko.c b/src/port/fseeko.c
index 79a680f383..b280e3f2c7 100644
--- a/src/port/fseeko.c
+++ b/src/port/fseeko.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/port/fseeko.c,v 1.10 2003/01/11 19:38:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/port/fseeko.c,v 1.11 2003/08/04 00:43:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -40,7 +40,7 @@
int
fseeko(FILE *stream, off_t offset, int whence)
{
- off_t floc;
+ off_t floc;
struct stat filestat;
switch (whence)
@@ -79,7 +79,7 @@ fseeko(FILE *stream, off_t offset, int whence)
return 0;
break;
default:
- errno = EINVAL;
+ errno = EINVAL;
return -1;
}
@@ -94,10 +94,11 @@ failure:
off_t
ftello(FILE *stream)
{
- off_t floc;
+ off_t floc;
if (fgetpos(stream, &floc) != 0)
return -1;
return floc;
}
+
#endif
diff --git a/src/port/getaddrinfo.c b/src/port/getaddrinfo.c
index 011437bb9b..2466e760be 100644
--- a/src/port/getaddrinfo.c
+++ b/src/port/getaddrinfo.c
@@ -4,7 +4,7 @@
* Support getaddrinfo() on platforms that don't have it.
*
* We also supply getnameinfo() here, assuming that the platform will have
- * it if and only if it has getaddrinfo(). If this proves false on some
+ * it if and only if it has getaddrinfo(). If this proves false on some
* platform, we'll need to split this file and provide a separate configure
* test for getnameinfo().
*
@@ -12,7 +12,7 @@
* Copyright (c) 2003, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/port/getaddrinfo.c,v 1.10 2003/07/23 23:30:41 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/port/getaddrinfo.c,v 1.11 2003/08/04 00:43:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -40,23 +40,22 @@
*/
int
getaddrinfo(const char *node, const char *service,
- const struct addrinfo *hintp,
- struct addrinfo **res)
+ const struct addrinfo * hintp,
+ struct addrinfo ** res)
{
- struct addrinfo *ai;
- struct sockaddr_in sin, *psin;
- struct addrinfo hints;
+ struct addrinfo *ai;
+ struct sockaddr_in sin,
+ *psin;
+ struct addrinfo hints;
- if (hintp == NULL)
+ if (hintp == NULL)
{
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET;
hints.ai_socktype = SOCK_STREAM;
}
else
- {
memcpy(&hints, hintp, sizeof(hints));
- }
if (hints.ai_family != AF_INET && hints.ai_family != AF_UNSPEC)
return EAI_FAMILY;
@@ -78,20 +77,19 @@ getaddrinfo(const char *node, const char *service,
else if (hints.ai_flags & AI_NUMERICHOST)
{
if (!inet_aton(node, &sin.sin_addr))
- {
return EAI_FAIL;
- }
}
else
{
struct hostent *hp;
+
#ifdef FRONTEND
struct hostent hpstr;
- char buf[BUFSIZ];
- int herrno = 0;
+ char buf[BUFSIZ];
+ int herrno = 0;
pqGethostbyname(node, &hpstr, buf, sizeof(buf),
- &hp, &herrno);
+ &hp, &herrno);
#else
hp = gethostbyname(node);
#endif
@@ -132,9 +130,7 @@ getaddrinfo(const char *node, const char *service,
ai = malloc(sizeof(*ai));
if (!ai)
- {
return EAI_MEMORY;
- }
psin = malloc(sizeof(*psin));
if (!psin)
@@ -161,7 +157,7 @@ getaddrinfo(const char *node, const char *service,
void
-freeaddrinfo(struct addrinfo *res)
+freeaddrinfo(struct addrinfo * res)
{
if (res)
{
@@ -176,7 +172,7 @@ const char *
gai_strerror(int errcode)
{
#ifdef HAVE_HSTRERROR
- int hcode;
+ int hcode;
switch (errcode)
{
@@ -194,7 +190,7 @@ gai_strerror(int errcode)
return hstrerror(hcode);
-#else /* !HAVE_HSTRERROR */
+#else /* !HAVE_HSTRERROR */
switch (errcode)
{
@@ -206,71 +202,61 @@ gai_strerror(int errcode)
default:
return "Unknown server error";
}
-
-#endif /* HAVE_HSTRERROR */
+#endif /* HAVE_HSTRERROR */
}
/*
* Convert an ipv4 address to a hostname.
- *
+ *
* Bugs: - Only supports NI_NUMERICHOST and NI_NUMERICSERV
* It will never resolv a hostname.
* - No IPv6 support.
*/
int
-getnameinfo(const struct sockaddr *sa, int salen,
+getnameinfo(const struct sockaddr * sa, int salen,
char *node, int nodelen,
char *service, int servicelen, int flags)
{
/* Invalid arguments. */
if (sa == NULL || (node == NULL && service == NULL))
- {
return EAI_FAIL;
- }
/* We don't support those. */
if ((node && !(flags & NI_NUMERICHOST))
|| (service && !(flags & NI_NUMERICSERV)))
- {
return EAI_FAIL;
- }
#ifdef HAVE_IPV6
if (sa->sa_family == AF_INET6)
- {
- return EAI_FAMILY;
- }
+ return EAI_FAMILY;
#endif
if (node)
{
- int ret = -1;
+ int ret = -1;
if (sa->sa_family == AF_INET)
{
- char *p;
- p = inet_ntoa(((struct sockaddr_in *)sa)->sin_addr);
+ char *p;
+
+ p = inet_ntoa(((struct sockaddr_in *) sa)->sin_addr);
ret = snprintf(node, nodelen, "%s", p);
}
if (ret == -1 || ret > nodelen)
- {
return EAI_MEMORY;
- }
}
if (service)
{
- int ret = -1;
+ int ret = -1;
if (sa->sa_family == AF_INET)
{
ret = snprintf(service, servicelen, "%d",
- ntohs(((struct sockaddr_in *)sa)->sin_port));
+ ntohs(((struct sockaddr_in *) sa)->sin_port));
}
if (ret == -1 || ret > servicelen)
- {
return EAI_MEMORY;
- }
}
return 0;
diff --git a/src/port/getopt.c b/src/port/getopt.c
index 0d60673db5..0d697cbd89 100644
--- a/src/port/getopt.c
+++ b/src/port/getopt.c
@@ -94,7 +94,7 @@ const char *ostr;
++optind;
if (opterr && *ostr != ':')
(void) fprintf(stderr,
- "illegal option -- %c\n", optopt);
+ "illegal option -- %c\n", optopt);
return BADCH;
}
if (*++oli != ':')
diff --git a/src/port/getopt_long.c b/src/port/getopt_long.c
index bc6779e852..bddaa934ad 100644
--- a/src/port/getopt_long.c
+++ b/src/port/getopt_long.c
@@ -35,7 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Header: /cvsroot/pgsql/src/port/getopt_long.c,v 1.1 2003/01/06 18:53:25 petere Exp $
+ * $Header: /cvsroot/pgsql/src/port/getopt_long.c,v 1.2 2003/08/04 00:43:33 momjian Exp $
*/
#include <stdio.h>
@@ -49,9 +49,9 @@
#define EMSG ""
int
-getopt_long(int argc, char * const argv[],
+getopt_long(int argc, char *const argv[],
const char *optstring,
- const struct option *longopts, int *longindex)
+ const struct option * longopts, int *longindex)
{
static char *place = EMSG; /* option letter processing */
char *oli; /* option letter list index */
@@ -86,8 +86,8 @@ getopt_long(int argc, char * const argv[],
if (place[0] && place[0] == '-' && place[1])
{
/* long option */
- size_t namelen;
- int i;
+ size_t namelen;
+ int i;
place++;
@@ -101,7 +101,7 @@ getopt_long(int argc, char * const argv[],
{
if (place[namelen] == '=')
optarg = place + namelen + 1;
- else if (optind < argc-1)
+ else if (optind < argc - 1)
{
optind++;
optarg = argv[optind];
@@ -112,7 +112,7 @@ getopt_long(int argc, char * const argv[],
return BADARG;
if (opterr)
fprintf(stderr,
- "%s: option requires an argument -- %s\n",
+ "%s: option requires an argument -- %s\n",
argv[0], place);
place = EMSG;
optind++;
diff --git a/src/port/gettimeofday.c b/src/port/gettimeofday.c
index 3e2a6706d4..02eecd1e57 100644
--- a/src/port/gettimeofday.c
+++ b/src/port/gettimeofday.c
@@ -1,5 +1,5 @@
/*
- * $Header: /cvsroot/pgsql/src/port/gettimeofday.c,v 1.1 2003/05/16 04:59:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/port/gettimeofday.c,v 1.2 2003/08/04 00:43:33 momjian Exp $
*
* Copyright (c) 2003 SRA, Inc.
* Copyright (c) 2003 SKC, Inc.
@@ -34,20 +34,19 @@ static const unsigned __int64 epoch = 116444736000000000L;
* timezone information is stored outside the kernel so tzp isn't used anymore.
*/
int
-gettimeofday(struct timeval *tp, struct timezone *tzp)
+gettimeofday(struct timeval * tp, struct timezone * tzp)
{
- FILETIME file_time;
- SYSTEMTIME system_time;
- ULARGE_INTEGER ularge;
+ FILETIME file_time;
+ SYSTEMTIME system_time;
+ ULARGE_INTEGER ularge;
GetSystemTime(&system_time);
SystemTimeToFileTime(&system_time, &file_time);
ularge.LowPart = file_time.dwLowDateTime;
ularge.HighPart = file_time.dwHighDateTime;
- tp->tv_sec = (long)((ularge.QuadPart - epoch) / 10000000L);
- tp->tv_usec = (long)(system_time.wMilliseconds * 1000);
+ tp->tv_sec = (long) ((ularge.QuadPart - epoch) / 10000000L);
+ tp->tv_usec = (long) (system_time.wMilliseconds * 1000);
return 0;
}
-
diff --git a/src/port/path.c b/src/port/path.c
index 9cca1586f1..4bbe7960ec 100644
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -1,4 +1,4 @@
-/* $Id: path.c,v 1.1 2003/04/04 20:42:13 momjian Exp $ */
+/* $Id: path.c,v 1.2 2003/08/04 00:43:33 momjian Exp $ */
#include "c.h"
#include <ctype.h>
@@ -6,28 +6,32 @@
/*
* is_absolute_path
*/
-bool is_absolute_path(const char *filename)
+bool
+is_absolute_path(const char *filename)
{
return filename[0] == '/'
-#ifdef WIN32 /* WIN32 paths can either have forward or backward slashes */
+#ifdef WIN32 /* WIN32 paths can either have forward or
+ * backward slashes */
|| filename[0] == '\\'
|| (isalpha(filename[0]) && filename[1] == ':'
- && (filename[2] == '\\' || filename[2] == '/'))
+ && (filename[2] == '\\' || filename[2] == '/'))
#endif
;
}
-
+
/*
* first_path_separator
*/
-char *first_path_separator(const char *filename)
+char *
+first_path_separator(const char *filename)
{
#ifndef WIN32
return strchr(filename, '/');
#else
- char *slash, *bslash;
+ char *slash,
+ *bslash;
/* How should we handle "C:file.c"? */
slash = strchr(filename, '/');
@@ -45,12 +49,14 @@ char *first_path_separator(const char *filename)
/*
* last_path_separator
*/
-char *last_path_separator(const char *filename)
+char *
+last_path_separator(const char *filename)
{
#ifndef WIN32
return strrchr(filename, '/');
#else
- char *slash, *bslash;
+ char *slash,
+ *bslash;
/* How should we handle "C:file.c"? */
slash = strrchr(filename, '/');
diff --git a/src/port/threads.c b/src/port/threads.c
index 5012cac281..659f5cd100 100644
--- a/src/port/threads.c
+++ b/src/port/threads.c
@@ -7,7 +7,7 @@
*
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
*
- * $Id: threads.c,v 1.1 2003/06/14 14:35:42 momjian Exp $
+ * $Id: threads.c,v 1.2 2003/08/04 00:43:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -41,6 +41,7 @@ pqGetpwuid(uid_t uid, struct passwd * resultbuf, char *buffer,
size_t buflen, struct passwd ** result)
{
#if defined(USE_THREADS) && defined(HAVE_GETPWUID_R)
+
/*
* broken (well early POSIX draft) getpwuid_r() which returns 'struct
* passwd *'
@@ -65,6 +66,7 @@ pqGethostbyname(const char *name,
int *herrno)
{
#if defined(USE_THREADS) && defined(HAVE_GETHOSTBYNAME_R)
+
/*
* broken (well early POSIX draft) gethostbyname_r() which returns
* 'struct hostent *'
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-31 23:05:17 +0000