Fossil

Check-in [3e0efc38]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge the solaris10 branch into the trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 3e0efc38279da750feba830bc72ceea3a5d03789
User & Date: drh 2011-05-23 15:06:39
Context
2011-05-23
15:11
Merge the ben-security branch into the trunk. check-in: 474850cf user: drh tags: trunk, release
15:06
Merge the solaris10 branch into the trunk. check-in: 3e0efc38 user: drh tags: trunk
2011-05-22
07:53
Fix for passwords > 8 chars long on Solaris. getpass() silently truncates to 8 chars, use getpassphrase() instead. Closed-Leaf check-in: 3e61ada7 user: ben tags: solaris10
2011-05-21
16:57
If at the tip of the current branch but there are children in other branches, the "fossil up" command should do nothing. check-in: 1343cfad user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Makefile.

56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
#
TCLSH = tclsh

# You should not need to change anything below this line
###############################################################################
#
# Automatic platform-specific options.
HOST_OS!= uname -s

LIB.SunOS= -lsocket -lnsl
LIB += $(LIB.$(HOST_OS))

TCC.DragonFly += -DUSE_PREAD
TCC.FreeBSD += -DUSE_PREAD
TCC.NetBSD += -DUSE_PREAD
TCC.OpenBSD += -DUSE_PREAD
TCC += $(TCC.$(HOST_OS))

include $(SRCDIR)/main.mk







|











56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
#
TCLSH = tclsh

# You should not need to change anything below this line
###############################################################################
#
# Automatic platform-specific options.
HOST_OS :sh = uname -s

LIB.SunOS= -lsocket -lnsl
LIB += $(LIB.$(HOST_OS))

TCC.DragonFly += -DUSE_PREAD
TCC.FreeBSD += -DUSE_PREAD
TCC.NetBSD += -DUSE_PREAD
TCC.OpenBSD += -DUSE_PREAD
TCC += $(TCC.$(HOST_OS))

include $(SRCDIR)/main.mk

Changes to src/config.h.

80
81
82
83
84
85
86







87
88
89
90
91
92
93
#  endif
#endif

#ifndef _RC_COMPILE_

#include "sqlite3.h"








/*
** Typedef for a 64-bit integer
*/
typedef sqlite3_int64 i64;
typedef sqlite3_uint64 u64;

/*







>
>
>
>
>
>
>







80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
#  endif
#endif

#ifndef _RC_COMPILE_

#include "sqlite3.h"

/*
** On Solaris, getpass() will only return up to 8 characters. getpassphrase() returns up to 257.
*/
#if defined(__sun__) || defined(sun)
  #define getpass getpassphrase
#endif

/*
** Typedef for a 64-bit integer
*/
typedef sqlite3_int64 i64;
typedef sqlite3_uint64 u64;

/*