1996-11-13 11:56:28 +01:00
|
|
|
*** src/ir/sockets.c.old Wed Apr 26 12:18:43 1995
|
|
|
|
|
--- src/ir/sockets.c Tue Nov 12 23:20:17 1996
|
1994-09-23 22:14:57 +02:00
|
|
|
***************
|
1996-11-13 11:56:28 +01:00
|
|
|
*** 81,88 ****
|
|
|
|
|
#if (defined(ultrix) || defined(BSD) || defined(Mach))
|
|
|
|
|
extern int errno;
|
|
|
|
|
#endif /* ultrix BSD or Mach */
|
|
|
|
|
!
|
|
|
|
|
extern char *sys_errlist[];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* XXX
|
|
|
|
|
--- 81,90 ----
|
|
|
|
|
#if (defined(ultrix) || defined(BSD) || defined(Mach))
|
|
|
|
|
extern int errno;
|
1995-03-19 13:39:56 +01:00
|
|
|
#endif /* ultrix BSD or Mach */
|
1996-11-13 11:56:28 +01:00
|
|
|
!
|
|
|
|
|
! #ifndef __bsdi__
|
|
|
|
|
extern char *sys_errlist[];
|
|
|
|
|
+ #endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* XXX
|
|
|
|
|
***************
|
|
|
|
|
*** 203,209 ****
|
|
|
|
|
if(source.sin_family == AF_INET) {
|
|
|
|
|
struct hostent *peer = NULL;
|
1995-03-19 13:39:56 +01:00
|
|
|
|
1996-11-13 11:56:28 +01:00
|
|
|
! #if defined(__DGUX__) || defined(LINUX)
|
|
|
|
|
peer = gethostbyaddr((char *)&source.sin_addr.s_addr, 4, AF_INET);
|
|
|
|
|
#else
|
|
|
|
|
peer = gethostbyaddr((struct sockaddr_in*)&source.sin_addr, 4, AF_INET);
|
|
|
|
|
--- 205,211 ----
|
|
|
|
|
if(source.sin_family == AF_INET) {
|
|
|
|
|
struct hostent *peer = NULL;
|
1995-03-19 13:39:56 +01:00
|
|
|
|
1996-11-13 11:56:28 +01:00
|
|
|
! #if defined(__DGUX__) || defined(LINUX) || defined(__bsdi__) /* XXX */
|
|
|
|
|
peer = gethostbyaddr((char *)&source.sin_addr.s_addr, 4, AF_INET);
|
|
|
|
|
#else
|
|
|
|
|
peer = gethostbyaddr((struct sockaddr_in*)&source.sin_addr, 4, AF_INET);
|
|
|
|
|
*** src/ir/irfiles.c.old Wed Apr 26 12:18:41 1995
|
|
|
|
|
--- src/ir/irfiles.c Tue Nov 12 23:27:43 1996
|
1995-03-19 13:39:56 +01:00
|
|
|
***************
|
1996-11-13 11:56:28 +01:00
|
|
|
*** 297,303 ****
|
|
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
|
|
! if( utlk_using_lock_and_get_pid(db->database_file, LOCK_INDEX, (pid_t) &pid) &&
|
|
|
|
|
(pid != getpid()) ) {
|
|
|
|
|
waislog(WLOG_HIGH, WLOG_ERROR,
|
|
|
|
|
"an indexing is currently running on the database. Try again later.");
|
|
|
|
|
--- 297,303 ----
|
|
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
|
|
! if( utlk_using_lock_and_get_pid(db->database_file, LOCK_INDEX, (pid_t *) &pid) &&
|
|
|
|
|
(pid != getpid()) ) {
|
|
|
|
|
waislog(WLOG_HIGH, WLOG_ERROR,
|
|
|
|
|
"an indexing is currently running on the database. Try again later.");
|
|
|
|
|
*** src/client/x/scommands.c.old Wed Apr 26 12:18:39 1995
|
|
|
|
|
--- src/client/x/scommands.c Wed Nov 13 01:41:42 1996
|
1995-03-19 13:39:56 +01:00
|
|
|
***************
|
1996-11-13 11:56:28 +01:00
|
|
|
*** 159,165 ****
|
|
|
|
|
edit_source->maintainer = s_strdup(GetString(maintainerwid));
|
|
|
|
|
|
|
|
|
|
if (edit_source->description != NULL) s_free(edit_source->description);
|
|
|
|
|
! edit_source->description = s_strdup(GetAsciiString(descwid));
|
|
|
|
|
|
|
|
|
|
strncpy(edit_source->server, GetString(serverwid), STRINGSIZE);
|
|
|
|
|
strncpy(edit_source->service, GetString(servicewid), STRINGSIZE);
|
|
|
|
|
--- 159,165 ----
|
|
|
|
|
edit_source->maintainer = s_strdup(GetString(maintainerwid));
|
|
|
|
|
|
|
|
|
|
if (edit_source->description != NULL) s_free(edit_source->description);
|
|
|
|
|
! edit_source->description = s_strdup((String)GetAsciiString(descwid));
|
|
|
|
|
|
|
|
|
|
strncpy(edit_source->server, GetString(serverwid), STRINGSIZE);
|
|
|
|
|
strncpy(edit_source->service, GetString(servicewid), STRINGSIZE);
|
|
|
|
|
*** src/client/x/catalog.c.old Wed Apr 26 12:18:39 1995
|
|
|
|
|
--- src/client/x/catalog.c Wed Nov 13 01:45:20 1996
|
|
|
|
|
***************
|
|
|
|
|
*** 27,32 ****
|
|
|
|
|
--- 27,34 ----
|
|
|
|
|
#include "xwais.h"
|
|
|
|
|
#include "cat.h"
|
|
|
|
|
|
|
|
|
|
+ #undef index
|
|
|
|
|
+
|
|
|
|
|
static Boolean busy = FALSE;
|
|
|
|
|
static long last_doc = -1;
|
|
|
|
|
static Catbuff scat = NULL;
|
