debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtinfo other files

Browse Source
This commit is contained in:
Ulrich Wilkens
2013-08-28 21:16:39 +02:00
committed by Jon Trulson
parent acdae62484
commit 4ec9658299
42 changed files with 1415 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/lib/DtSearch/Imakefile
View File

@@ -13,6 +13,10 @@ EXTRA_DEFINES = -DBYTE_SWAP -D_OSF_SOURCE
EXTRA_DEFINES = -DBYTE_SWAP
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
EXTRA_DEFINES = -DBYTE_SWAP
#endif
MakeSubdirs($(SUBDIRS))
ForceSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))

6
cde/lib/DtSearch/dberr.c
View File

@@ -79,8 +79,10 @@ static int vista_syserrno = 0;
static char vista_errmsg[1024];
void (*dberr_exit) (int) = exit;
extern nl_catd dtsearch_catd; /* non AusText user should #define to -1 */
extern FILE *aa_stderr; /* non AusText user should #define to stderr */
/* non AusText user should #define to -1 */
#define dtsearch_catd -1
/* non AusText user should #define to stderr */
#define aa_stderr stderr
/****************************************/
/* */

4
cde/lib/DtSearch/raima/Imakefile
View File

@@ -23,6 +23,10 @@ EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE
EXTRA_DEFINES = -D_XOPEN_SOURCE
#endif
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700
#endif
#define DoNormalLib NormalLibDtSearch
#define DoSharedLib SharedLibDtSearch
#define DoDebugLib DebugLibDtSearch

4
cde/lib/DtSearch/raima/dblfcns.c
View File

@@ -949,10 +949,10 @@ TASK_DECL
#ifndef NO_TRANS
if ( use_ovfl ) o_free();
#endif
termfree();
/* termfree();
key_close();
sk_free();
dio_free();
dio_free(); */
#ifndef SINGLE_USER
if ( db_lockmgr ) {
termses();

18
cde/lib/DtSearch/raima/dio.c
View File

@@ -1056,7 +1056,7 @@ INT *rid;
page = (sno - 1)/spp + 1;
offset = PGHDRSIZE + page*file_ptr->ft_pgsize +
(sno - 1 - (page - 1)*spp)*file_ptr->ft_slsize;
DB_LSEEK(file_ptr->ft_desc, offset, 0);
DB_LSEEK(file_ptr->ft_desc, (off_t)offset, 0);
if ( DB_READ(file_ptr->ft_desc, (char FAR *)rid, sizeof(INT))
!= sizeof(INT) ) {
dberr(S_BADREAD);
@@ -1118,7 +1118,7 @@ INT rid;
offset += page*file_ptr->ft_pgsize;
/* read rid from disk, and set/clear rlb accordingly */
DB_LSEEK(file_ptr->ft_desc, offset, 0);
DB_LSEEK(file_ptr->ft_desc, (off_t)offset, 0);
if ( DB_READ(file_ptr->ft_desc, (char FAR *)&trid, sizeof(INT))
!= sizeof(INT) ) {
dberr(S_BADREAD);
@@ -1128,7 +1128,7 @@ INT rid;
/* write original rid out with modified rlb */
trid = htons (rid); /* make a copy in trid for byte swap */
DB_LSEEK(file_ptr->ft_desc, offset, 0); /* reseek */
DB_LSEEK(file_ptr->ft_desc, (off_t)offset, 0); /* reseek */
if ( DB_WRITE(file_ptr->ft_desc, (char FAR *)&trid, sizeof(INT)) !=
sizeof(INT) )
dberr(S_BADWRITE);
@@ -1507,7 +1507,7 @@ LOOKUP_ENTRY FAR *lu_ptr; /* corresponding lookup table entry */
if ( dio_open(fno) == S_OKAY ) {
swab_page (pg_ptr->buff, &file_table[fno], HTON);
desc = file_table[fno].ft_desc;
DB_LSEEK( desc, addr, 0 );
DB_LSEEK( desc, (off_t)addr, 0 );
if (DB_WRITE( desc, pg_ptr->buff, pgsize ) != pgsize) dberr(S_BADWRITE);
}
MEM_UNLOCK(&pg_ptr->Buff);
@@ -1565,14 +1565,14 @@ BOOLEAN db_cache; /* TRUE if pg_ptr in db cache */
#endif
if ( dio_open(fno) == S_OKAY ) {
desc = file_ptr->ft_desc;
DB_LSEEK(desc, addr, 0);
DB_LSEEK(desc, (off_t)addr, 0);
MEM_LOCK(&pg_ptr->Buff);
if ((r = DB_READ( desc, pg_ptr->buff, pgsize )) < pgsize) {
byteset(&pg_ptr->buff[r], '\0', pgsize - r);
DB_LSEEK(desc, addr, 0);
DB_LSEEK(desc, (off_t)addr, 0);
if (DB_WRITE( desc, pg_ptr->buff, pgsize ) != pgsize) {
/* clean up and return out of space */
DB_LSEEK(desc, addr, 0);
DB_LSEEK(desc, (off_t)addr, 0);
DB_WRITE(desc, "", 0);
pgzero_ptr = &pgzero[fno];
pgzero_ptr->pz_next--;
@@ -1713,7 +1713,7 @@ static int dio_pzflush()
memcpy (cptr, &align_LONG, sizeof(LONG));
}
desc = file_ptr->ft_desc;
DB_LSEEK(desc, 0L, 0);
DB_LSEEK(desc, (off_t)0L, 0);
if (DB_WRITE(desc, (char FAR *)pgzero_ptr, PGZEROSZ) != PGZEROSZ)
return( dberr(S_BADWRITE) );
pgzero_ptr->pz_modified = FALSE;
@@ -1761,7 +1761,7 @@ FILE_NO fno; /* file number */
}
/* seek to and read page zero */
DB_LSEEK(file_ptr->ft_desc, 0L, 0);
DB_LSEEK(file_ptr->ft_desc, (off_t)0L, 0);
if ( DB_READ(file_ptr->ft_desc, (char FAR *)pgzero_ptr, PGZEROSZ)
!= PGZEROSZ ) {
return( dberr(S_BADREAD) );

2
cde/lib/DtSearch/raima/inittab.c
View File

@@ -275,7 +275,7 @@ goodver:
* so opening .dbd file read-only is still ok.
*/
dbf = open_b (dbfile, O_RDONLY);
DB_LSEEK(dbf, DBD_COMPAT_LEN + 8L*sizeof(INT), 0);
DB_LSEEK(dbf, (off_t)(DBD_COMPAT_LEN + 8L*sizeof(INT)), 0);
/*----------------- FILE TABLE -------------------*/
DB_READ(dbf, (char FAR *)&file_table[ORIGIN(ft_offset)],

2
cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c
View File

@@ -49,9 +49,9 @@ static char rcs_id[] = "$XConsortium: TermPrimGetPty-bsd.c /main/4 1996/11/21 19
#define XOS_USE_XT_LOCKING
#include <X11/Xos_r.h>
#include "TermPrim.h"
#include "TermHeader.h"
#include "TermPrimDebug.h"
#include "TermPrimUtil.h"
#include "TermHeader.h"
typedef struct _ptyInfo {
char *ptyName;

1
cde/lib/DtTerm/TermPrim/TermPrimParser.c
View File

@@ -37,6 +37,7 @@ static char rcs_id[] = "$TOG: TermPrimParser.c /main/2 1999/10/15 12:23:41 mgree
*/
#include <Xm/Xm.h>
#include "TermHeader.h"
#include "TermPrimDebug.h"
#include "TermPrimP.h"
#include "TermPrimParserP.h"