fiddlerwoaroof/crawl - Change KR655YT3I3U5DMN5NS3FPUGMDNT4BI56K3SFF2FNJ77C45NFKL5AC

Fixed source to build on Linux. Should still build on Mac OS, but this is

untested. Will probably not build out-of-the-box on other BSDs (we need an autoconf script to use the right dbm headers). DOS and Windows builds are still broken pending adding Berkeley DB 1.x sources to the Crawl tree, which I'll probably do sometime tomorrow.

Renamed descriptions.txt -> descript.txt to fit into DOS filename limits.

The descript.txt -> descript.db conversion is now performed automatically by Crawl on startup if descript.txt is newer than descript.db (or descript.db does not exist). descript.db is saved in the save directory which is a convenient directory that is guaranteed writable by Crawl.

The makedb.pl script is no longer necessary (and is unreliable anyway, because it's easy to have multiple dbm versions with incompatible db formats and have the installed Perl link with one while Crawl uses the other, leading to nasty segfaults).

Some .des file changes (Erik).

Deep elf sorcerers are M_EVIL.

Ghosts get mephitic cloud.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1337 c06c8d41-db1a-0410-9941-cceddc491573

Created by dshaligram on April 20, 2007

KR655YT3I3U5DMN5NS3FPUGMDNT4BI56K3SFF2FNJ77C45NFKL5AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-data.h at line 2852 [4.1826214]

B:BD[4.1895321] → [4.1895321:1895398]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_SPEAKS,

[4.1895321]

[5.519496]

    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_SPEAKS
        | M_EVIL,

Replacement in crawl-ref/source/mon-data.h at line 4429 [4.1826214]
B:BD[4.1928882] → [3.12606:12612]
```
#endif
```
[4.1928882]
```
#endif
```

Replacement in crawl-ref/source/makefile.unix at line 51 [5.604320]

B:BD[5.604891] → [2.985842:985882]

LIB = -lncurses -L$(LUASRC) -l$(LUALIB)

[5.604891]

[5.604907]

LIBDBM = $(shell [ "`ls /usr/lib/libdbm.* 2>/dev/null`" != "" ] \
			&& echo 'dbm' || echo 'db')
LIB = -lncurses -L$(LUASRC) -l$(LUALIB) -l$(LIBDBM)

Insertion in crawl-ref/source/ghost.cc at line 88 [6.9890]
[6.11877]
[6.11877]
```
    SPELL_MEPHITIC_CLOUD,
```
Insertion in crawl-ref/source/files.h at line 43 [4.3082298]
[7.1645]
[8.432076]
```
std::string get_savedir_path(const std::string &shortpath);
```

Insertion in crawl-ref/source/files.h at line 104 [4.3082298]

[6.27509]

[4.3084548]

#ifdef SHARED_FILES_CHMOD_PRIVATE
#define DO_CHMOD_PRIVATE(x) chmod( (x), SHARED_FILES_CHMOD_PRIVATE )
#else
#define DO_CHMOD_PRIVATE(x) // empty command

Insertion in crawl-ref/source/files.h at line 109 [4.3082298]

[4.3084555]


class file_lock
{
public:
    file_lock(const std::string &filename, const char *mode,
              bool die_on_fail = true);
    ~file_lock();
private:
    FILE *handle;
    const char *mode;
    std::string filename;
};
#endif

Deletion in crawl-ref/source/files.cc at line 83 [4.3084589]

B:BD[5.857132] → [5.857132:857293]

B:BD[4.3086303] → [4.3086303:3086304]

#ifdef SHARED_FILES_CHMOD_PRIVATE
#define DO_CHMOD_PRIVATE(x) chmod( (x), SHARED_FILES_CHMOD_PRIVATE )
#else
#define DO_CHMOD_PRIVATE(x) // empty command
#endif

Insertion in crawl-ref/source/files.cc at line 1641 [4.3084589]

[6.31624]

#endif
}
/////////////////////////////////////////////////////////////////////////////
// file_lock
//
// Locks a named file (usually an empty lock file), creating it if necessary.
file_lock::file_lock(const std::string &s, const char *_mode, bool die_on_fail)
    : handle(NULL), mode(_mode), filename(s)
{
#ifdef USE_FILE_LOCKING
    if (!(handle = lk_open(mode, filename)) && die_on_fail)
        end(1, true, "Unable to open lock file \"%s\"", filename.c_str());
#endif
}
file_lock::~file_lock()
{
#ifdef USE_FILE_LOCKING
    if (handle)
        lk_close(handle, mode, filename);

Replacement in crawl-ref/source/database.h at line 13 [3.13319]
B:BD[3.13446] → [3.13446:13482]
```
#undef DEBUG // hack
#define NDEBUG
```
[3.13446]
[3.13482]
```
#include "AppHdr.h"
```
Insertion in crawl-ref/source/database.h at line 15 [3.13319]
[3.13503]
[3.13503]
```
#include <list>
```
Deletion in crawl-ref/source/database.h at line 17 [3.13319]
B:BD[3.13504] → [3.13504:13523]
```
#ifdef __cplusplus
```

Insertion in crawl-ref/source/database.h at line 18 [3.13319]

[3.13536]

#ifdef DB_NDBM
#   include <ndbm.h>
#   define DPTR_COERCE void *
#else
#   define DB_DBM_HSEARCH 1
#   include <db.h>
#   define DPTR_COERCE char *

Insertion in crawl-ref/source/database.h at line 30 [3.13319]
[3.13543]
[3.13543]
```
}
```
Replacement in crawl-ref/source/database.h at line 32 [3.13319]
B:BD[3.13544] → [3.13544:13562]
```
#include <ndbm.h>
```
[3.13544]
[3.13562]
```
typedef std::list<DBM *> db_list;
```

Replacement in crawl-ref/source/database.h at line 34 [3.13319]

B:BD[3.13563] → [3.13563:13690]

// For convenience during shutdown.
typedef struct dbList_s dbList_t;
#ifdef __cplusplus
}
#endif
extern dbList_t *openDBList;

[3.13563]

[3.13690]

extern db_list openDBList;

Replacement in crawl-ref/source/database.h at line 39 [3.13319]
B:BD[3.13787] → [3.13787:13836]
```
datum *database_fetch(DBM *database, char *key);
```
[3.13787]
[3.13836]
```
datum database_fetch(DBM *database, const std::string &key);
```
Insertion in crawl-ref/source/database.h at line 41 [3.13319]
[3.13837]
[3.13837]
```
std::string getLongDescription(const std::string &key);
```
Deletion in crawl-ref/source/database.h at line 43 [3.13319]
B:BD[3.13838] → [3.13838:13888]
```
std::string getLongDescription(const char *key);
```
Replacement in crawl-ref/source/database.cc at line 17 [3.13932]
B:BD[3.14195] → [3.14195:14215]
```
#include <stdlib.h>
```
[3.14195]
[3.14215]
```
#include <cstdlib>
#include <fstream>
```
Insertion in crawl-ref/source/database.cc at line 21 [3.13932]
[3.14256]
[3.14256]
```
#include "libutil.h"
#include "stuff.h"
```
Replacement in crawl-ref/source/database.cc at line 27 [3.13932]
B:BD[3.14343] → [3.14343:14357]
```
#define nil 0
```
[3.14343]
[3.14357]
```
db_list openDBList;
DBM     *descriptionDB;
```

Replacement in crawl-ref/source/database.cc at line 30 [3.13932]

B:BD[3.14358] → [3.14358:14444]

static bool databaseIsInitted = false;
dbList_t *openDBList;
DBM      *descriptionDB;

[3.14358]

[3.14444]

#define DESC_BASE_NAME "descript"
#define DESC_TXT       (DESC_BASE_NAME ".txt")
#define DESC_DB        (DESC_BASE_NAME ".db")

Replacement in crawl-ref/source/database.cc at line 34 [3.13932]

B:BD[3.14445] → [3.14445:14522]

struct dbList_s {
    DBM         *dbPtr;
    dbList_s    *next;
} dbList_s;

[3.14445]

[3.14522]

static void generate_description_db();

Insertion in crawl-ref/source/database.cc at line 36 [3.13932]

[3.14523]

time_t file_modtime(const std::string &file)
{
    struct stat filestat;
    if (stat(file.c_str(), &filestat))
        return (0);

Replacement in crawl-ref/source/database.cc at line 42 [3.13932]

B:BD[3.14524] → [3.14524:14858]

void databaseSystemInit() {
    if (!databaseIsInitted) {
        databaseIsInitted = true;
        openDBList = nil;
        std::string descriptionPath = datafile_path("descriptions.db");
        descriptionPath.erase(descriptionPath.length() - 3, descriptionPath.length());
        descriptionDB = openDB(descriptionPath.c_str());

[3.14524]

[3.14858]

    return (filestat.st_mtime);
}
// Returns true if file a is newer than file b.
bool is_newer(const std::string &a, const std::string &b)
{
    return (file_modtime(a) > file_modtime(b));
}
void check_newer(const std::string &target,
                 const std::string &dependency,
                 void (*action)())
{
    if (is_newer(dependency, target))
        action();
}
void databaseSystemInit()
{
    if (!descriptionDB)
    {
        std::string descriptionPath = get_savedir_path(DESC_DB);
        check_newer(descriptionPath,
                    datafile_path(DESC_TXT),
                    generate_description_db);
        descriptionPath.erase(descriptionPath.length() - 3);
        if (!(descriptionDB = openDB(descriptionPath.c_str())))
            end(1, true, "Failed to open DB: %s", descriptionPath.c_str());

Replacement in crawl-ref/source/database.cc at line 73 [3.13932]

B:BD[3.14867] → [3.14867:14966]

void databaseSystemShutdown() {
    if (!databaseIsInitted) {
        // All done.
        return;

[3.14867]

[3.14966]

void databaseSystemShutdown()
{
    for (db_list::iterator i = openDBList.begin();
         i != openDBList.end(); ++i)
    {
        dbm_close(*i);

Replacement in crawl-ref/source/database.cc at line 80 [3.13932]

B:BD[3.14972] → [3.14972:15174]

    dbList_t *current = openDBList;
    dbList_t *prev = nil;
    while (current) {
        dbm_close(current->dbPtr);
        prev = current;
        current = current->next;
        free(prev);
    }

[3.14972]

[3.15174]

    openDBList.clear();
    descriptionDB = NULL;

Replacement in crawl-ref/source/database.cc at line 90 [3.13932]

B:BD[3.15534] → [3.15534:15630]

DBM   *openDB(const char *dbFilename) {
    if (!databaseIsInitted) {
        return nil;
    }

[3.15534]

[3.15630]

DBM   *openDB(const char *dbFilename)
{

Replacement in crawl-ref/source/database.cc at line 93 [3.13932]

B:BD[3.15690] → [3.15690:16313]

    if (dbToReturn) {
        if (openDBList) {
            dbList_t *endOfDBList = openDBList; 
            while (openDBList->next) {
                endOfDBList = openDBList->next;
            }
            endOfDBList->next = (dbList_t *)malloc(sizeof(dbList_t));
            endOfDBList = endOfDBList->next;
            endOfDBList->next = nil;
            endOfDBList->dbPtr = dbToReturn;
            
        } else {
            openDBList = (dbList_t *)malloc(sizeof(dbList_t));
            openDBList->next = nil;
            openDBList->dbPtr = dbToReturn;
        }
    } else {
        dbToReturn = nil;
    }

[3.15690]

[3.16313]

    if (dbToReturn)
        openDBList.push_front(dbToReturn);

Replacement in crawl-ref/source/database.cc at line 99 [3.13932]

B:BD[3.16339] → [3.16339:16394]

datum database_fetch(DBM *database, const char *key) {

[3.16339]

[3.16394]

datum database_fetch(DBM *database, const std::string &key)
{

Replacement in crawl-ref/source/database.cc at line 102 [3.13932]
B:BD[3.16412] → [3.16412:16435]
```
    result.dptr = nil;
```
[3.16412]
[3.16435]
```
    result.dptr = NULL;
```
Deletion in crawl-ref/source/database.cc at line 104 [3.13932]
B:BD[3.16457] → [3.16457:16516]
```
    if (!databaseIsInitted) {
        return result;
    }
```

Replacement in crawl-ref/source/database.cc at line 106 [3.13932]

B:BD[3.16538] → [3.16538:16600]

    dbKey.dptr = (void *)key;
    dbKey.dsize = strlen(key);

[3.16538]

[3.16600]

    dbKey.dptr = (DPTR_COERCE) key.c_str();
    dbKey.dsize = key.length();

Replacement in crawl-ref/source/database.cc at line 114 [3.13932]

B:BD[3.16673] → [3.16673:16823]

char *private_strlwr(char *string) {
    int i;
    for (i = 0; string[i]; i++) {
        string[i] = tolower(string[i]);
    }
    return string;
}

[3.16673]

[3.16823]

std::string getLongDescription(const char *key)
{
    if (!descriptionDB)
        return ("");

Deletion in crawl-ref/source/database.cc at line 119 [3.13932]

B:BD[3.16824] → [3.16824:16930]

std::string getLongDescription(const char *key) {
    if (!databaseIsInitted) {
        return nil;
    }

Replacement in crawl-ref/source/database.cc at line 121 [3.13932]

B:BD[3.17030] → [3.17030:17200]

    int len = strlen(key);
    char *lowercaseKey = (char *)malloc(len+1);
    (void) strncpy(lowercaseKey, key, len+1);
    lowercaseKey = private_strlwr(lowercaseKey);

[3.17030]

[3.17200]

    std::string canonical_key = key;
    lowercase(canonical_key);

Replacement in crawl-ref/source/database.cc at line 125 [3.13932]

B:BD[3.17226] → [3.17226:17304]

    datum result = database_fetch(descriptionDB, (const char *)lowercaseKey);

[3.17226]

[3.17304]

    datum result = database_fetch(descriptionDB, canonical_key);

Replacement in crawl-ref/source/database.cc at line 128 [3.13932]

B:BD[3.17379] → [3.17379:17534]

    std::string stringToReturn((const char *)result.dptr, result.dsize);
    // free the result...
    free(lowercaseKey);
    
    return stringToReturn;

[3.17379]

[3.17534]

    return std::string((const char *)result.dptr, result.dsize);
}
static void store_descriptions(const std::string &in, const std::string &out);
static void generate_description_db()
{
    std::string db_path = get_savedir_path(DESC_BASE_NAME);
    std::string txt_path = datafile_path(DESC_TXT);
    file_lock lock(get_savedir_path(DESC_BASE_NAME ".lk"), "wb");
    store_descriptions(txt_path, db_path);
    DO_CHMOD_PRIVATE(get_savedir_path(DESC_DB).c_str());
}
static void trim_right(std::string &s)
{
    s.erase(s.find_last_not_of(" \r\t\n") + 1);
}
static void trim_leading_newlines(std::string &s)
{
    s.erase(0, s.find_first_not_of("\n"));
}
static void add_entry(DBM *db, const std::string &k, std::string &v)
{
    trim_leading_newlines(v);
    datum key, value;
    key.dptr = (char *) k.c_str();
    key.dsize = k.length();
    value.dptr = (char *) v.c_str();
    value.dsize = v.length();
    if (dbm_store(db, key, value, DBM_REPLACE))
        end(1, true, "Error storing %s", k.c_str());
}
static void parse_descriptions(std::ifstream &inf, DBM *db)
{
    char buf[1000];
    std::string key;
    std::string value;
    bool in_entry = false;
    while (!inf.eof())
    {
        inf.getline(buf, sizeof buf);
        if (*buf == '#')
            continue;
        if (!strncmp(buf, "%%%%", 4))
        {
            if (!key.empty())
                add_entry(db, key, value);
            key.clear();
            value.clear();
            in_entry = true;
            continue;
        }
        if (!in_entry)
            continue;
        if (key.empty())
        {
            key = buf;
            trim_string(key);
            lowercase(key);
        }
        else
        {
            std::string line = buf;
            trim_right(line);
            value += line + "\n";
        }
    }
    if (!key.empty())
        add_entry(db, key, value);
}
static void store_descriptions(const std::string &in, const std::string &out)
{
    std::ifstream inf(in.c_str());
    if (!inf)
        end(1, true, "Unable to open input file: %s", in.c_str());
    if (DBM *db = dbm_open(out.c_str(), O_RDWR | O_CREAT, 0660))
    {
        parse_descriptions(inf, db);
        dbm_close(db);
    }
    else
        end(1, true, "Unable to open DB: %s", out.c_str());
    inf.close();

Replacement in crawl-ref/source/dat/vaults.des at line 3884 [5.1041446]
B:BD[9.7228] → [10.47093:47107]
```
SHUFFLE: {[( 
```
[9.7228]
[9.7230]
```
SHUFFLE: {[(
```
Replacement in crawl-ref/source/dat/vaults.des at line 3906 [5.1041446]
B:BD[9.7854] → [9.7854:7885]
```
x............................x
```
[9.7854]
[9.7885]
```
x>..........................>x
```
Replacement in crawl-ref/source/dat/splev.des at line 2939 [5.1090923]
B:BD[11.3116] → [11.3116:3146]
```
.wwxx........3.3.......wwcww.
```
[11.3116]
[11.3146]
```
.wwxx........3.3.......cccww.
```
Replacement in crawl-ref/source/dat/splev.des at line 2941 [5.1090923]
B:BD[11.3176] → [11.3176:3206]
```
.wwxx........3.3.......wwcww.
```
[11.3176]
[11.3206]
```
.wwxx........3.3.......cccww.
```
Deletion in crawl-ref/source/dat/splev.des at line 2949 [5.1090923]
B:BD[11.3364] → [11.3364:3365]
File move: descriptions.txt → descript.txt
BF:BFD[5.1041429] → [3.46800:46840]
BF:BF[3.46840] → [3.17579:17579]
[5.1041429]
[3.17579]
Deletion in crawl-ref/source/acr.cc at line 231 [4.4397395]
B:BD[12.8946] → [3.46882:46908]
```
    databaseSystemInit();
```
Insertion in crawl-ref/source/acr.cc at line 2880 [4.4397395]
[13.151803]
[14.188]
```
    // Initialise internal databases.
    databaseSystemInit();
```
Insertion in crawl-ref/source/AppHdr.h at line 75 [4.4573713]
[15.3111]
[15.3247]
```
    #define DB_NDBM
```
Insertion in crawl-ref/source/AppHdr.h at line 402 [4.4573713]
[16.2683]
[4.4588589]
```
#endif
#ifndef DB_NDBM
#define DB_DBH
```

Fixed source to build on Linux. Should still build on Mac OS, but this is

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mon-data.h at line 2852 [4.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4429 [4.1826214]

Replacement in crawl-ref/source/makefile.unix at line 51 [5.604320]

Insertion in crawl-ref/source/ghost.cc at line 88 [6.9890]

Insertion in crawl-ref/source/files.h at line 43 [4.3082298]

Insertion in crawl-ref/source/files.h at line 104 [4.3082298]

Insertion in crawl-ref/source/files.h at line 109 [4.3082298]

Deletion in crawl-ref/source/files.cc at line 83 [4.3084589]

Insertion in crawl-ref/source/files.cc at line 1641 [4.3084589]

Replacement in crawl-ref/source/database.h at line 13 [3.13319]

Insertion in crawl-ref/source/database.h at line 15 [3.13319]

Deletion in crawl-ref/source/database.h at line 17 [3.13319]

Insertion in crawl-ref/source/database.h at line 18 [3.13319]

Insertion in crawl-ref/source/database.h at line 30 [3.13319]

Replacement in crawl-ref/source/database.h at line 32 [3.13319]

Replacement in crawl-ref/source/database.h at line 34 [3.13319]

Replacement in crawl-ref/source/database.h at line 39 [3.13319]

Insertion in crawl-ref/source/database.h at line 41 [3.13319]

Deletion in crawl-ref/source/database.h at line 43 [3.13319]

Replacement in crawl-ref/source/database.cc at line 17 [3.13932]

Insertion in crawl-ref/source/database.cc at line 21 [3.13932]

Replacement in crawl-ref/source/database.cc at line 27 [3.13932]

Replacement in crawl-ref/source/database.cc at line 30 [3.13932]

Replacement in crawl-ref/source/database.cc at line 34 [3.13932]

Insertion in crawl-ref/source/database.cc at line 36 [3.13932]

Replacement in crawl-ref/source/database.cc at line 42 [3.13932]

Replacement in crawl-ref/source/database.cc at line 73 [3.13932]

Replacement in crawl-ref/source/database.cc at line 80 [3.13932]

Replacement in crawl-ref/source/database.cc at line 90 [3.13932]

Replacement in crawl-ref/source/database.cc at line 93 [3.13932]

Replacement in crawl-ref/source/database.cc at line 99 [3.13932]

Replacement in crawl-ref/source/database.cc at line 102 [3.13932]

Deletion in crawl-ref/source/database.cc at line 104 [3.13932]

Replacement in crawl-ref/source/database.cc at line 106 [3.13932]

Replacement in crawl-ref/source/database.cc at line 114 [3.13932]

Deletion in crawl-ref/source/database.cc at line 119 [3.13932]

Replacement in crawl-ref/source/database.cc at line 121 [3.13932]

Replacement in crawl-ref/source/database.cc at line 125 [3.13932]

Replacement in crawl-ref/source/database.cc at line 128 [3.13932]

Replacement in crawl-ref/source/dat/vaults.des at line 3884 [5.1041446]

Replacement in crawl-ref/source/dat/vaults.des at line 3906 [5.1041446]

Replacement in crawl-ref/source/dat/splev.des at line 2939 [5.1090923]

Replacement in crawl-ref/source/dat/splev.des at line 2941 [5.1090923]

Deletion in crawl-ref/source/dat/splev.des at line 2949 [5.1090923]

File move: descriptions.txt → descript.txt

Deletion in crawl-ref/source/acr.cc at line 231 [4.4397395]

Insertion in crawl-ref/source/acr.cc at line 2880 [4.4397395]

Insertion in crawl-ref/source/AppHdr.h at line 75 [4.4573713]

Insertion in crawl-ref/source/AppHdr.h at line 402 [4.4573713]