summaryrefslogtreecommitdiff
path: root/src/tools/db-merger.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/db-merger.c')
-rw-r--r--src/tools/db-merger.c74
1 files changed, 51 insertions, 23 deletions
diff --git a/src/tools/db-merger.c b/src/tools/db-merger.c
index 9116e9ac0..e09a993c2 100644
--- a/src/tools/db-merger.c
+++ b/src/tools/db-merger.c
@@ -264,8 +264,10 @@ int mystricmp(const char *s1, const char *s2);
int delnick(NickAlias *na, int donttouchthelist);
int write_string(const char *s, dbFILE * f);
int write_ptr(const void *ptr, dbFILE * f);
-int read_int16(uint16 * ret, dbFILE * f);
-int read_int32(uint32 * ret, dbFILE * f);
+int read_int16(int16 * ret, dbFILE * f);
+int read_int32(int32 * ret, dbFILE * f);
+int read_uint16(uint16 * ret, dbFILE * f);
+int read_uint32(uint32 * ret, dbFILE * f);
int read_string(char **ret, dbFILE * f);
int write_int16(uint16 val, dbFILE * f);
int write_int32(uint32 val, dbFILE * f);
@@ -344,10 +346,10 @@ int main(int argc, char *argv[])
READ(read_string(&nc->pass, f));
READ(read_string(&nc->email, f));
READ(read_string(&nc->greet, f));
- READ(read_int32(&nc->icq, f));
+ READ(read_uint32(&nc->icq, f));
READ(read_string(&nc->url, f));
READ(read_int32(&nc->flags, f));
- READ(read_int16(&nc->language, f));
+ READ(read_uint16(&nc->language, f));
READ(read_int16(&nc->accesscount, f));
if (nc->accesscount) {
char **access;
@@ -363,7 +365,7 @@ int main(int argc, char *argv[])
memos = calloc(sizeof(Memo) * nc->memos.memocount, 1);
nc->memos.memos = memos;
for (j = 0; j < nc->memos.memocount; j++, memos++) {
- READ(read_int32(&memos->number, f));
+ READ(read_uint32(&memos->number, f));
READ(read_int16(&memos->flags, f));
READ(read_int32(&tmp32, f));
memos->time = tmp32;
@@ -371,7 +373,7 @@ int main(int argc, char *argv[])
READ(read_string(&memos->text, f));
}
}
- READ(read_int16(&nc->channelcount, f));
+ READ(read_uint16(&nc->channelcount, f));
READ(read_int16(&tmp16, f));
} /* getc_db() */
*nclast = NULL;
@@ -458,10 +460,10 @@ int main(int argc, char *argv[])
nclists[index] = nc;
READ(read_string(&nc->greet, f));
- READ(read_int32(&nc->icq, f));
+ READ(read_uint32(&nc->icq, f));
READ(read_string(&nc->url, f));
READ(read_int32(&nc->flags, f));
- READ(read_int16(&nc->language, f));
+ READ(read_uint16(&nc->language, f));
READ(read_int16(&nc->accesscount, f));
if (nc->accesscount) {
char **access;
@@ -477,7 +479,7 @@ int main(int argc, char *argv[])
memos = calloc(sizeof(Memo) * nc->memos.memocount, 1);
nc->memos.memos = memos;
for (j = 0; j < nc->memos.memocount; j++, memos++) {
- READ(read_int32(&memos->number, f));
+ READ(read_uint32(&memos->number, f));
READ(read_int16(&memos->flags, f));
READ(read_int32(&tmp32, f));
memos->time = tmp32;
@@ -485,7 +487,7 @@ int main(int argc, char *argv[])
READ(read_string(&memos->text, f));
}
}
- READ(read_int16(&nc->channelcount, f));
+ READ(read_uint16(&nc->channelcount, f));
READ(read_int16(&tmp16, f));
} /* getc_db() */
} /* for() loop */
@@ -719,7 +721,7 @@ int main(int argc, char *argv[])
READ(read_buffer(ci->last_topic_setter, f));
READ(read_int32(&tmp32, f));
ci->last_topic_time = tmp32;
- READ(read_int32(&ci->flags, f));
+ READ(read_uint32(&ci->flags, f));
/* Temporary flags cleanup */
ci->flags &= ~0x80000000;
READ(read_string(&ci->forbidby, f));
@@ -790,9 +792,9 @@ int main(int argc, char *argv[])
} else {
ci->akick = NULL;
}
- READ(read_int32(&ci->mlock_on, f));
- READ(read_int32(&ci->mlock_off, f));
- READ(read_int32(&ci->mlock_limit, f));
+ READ(read_uint32(&ci->mlock_on, f));
+ READ(read_uint32(&ci->mlock_off, f));
+ READ(read_uint32(&ci->mlock_limit, f));
READ(read_string(&ci->mlock_key, f));
READ(read_string(&ci->mlock_flood, f));
READ(read_string(&ci->mlock_redirect, f));
@@ -803,7 +805,7 @@ int main(int argc, char *argv[])
memos = calloc(sizeof(Memo) * ci->memos.memocount, 1);
ci->memos.memos = memos;
for (j = 0; j < ci->memos.memocount; j++, memos++) {
- READ(read_int32(&memos->number, f));
+ READ(read_uint32(&memos->number, f));
READ(read_int16(&memos->flags, f));
READ(read_int32(&tmp32, f));
memos->time = tmp32;
@@ -901,7 +903,7 @@ int main(int argc, char *argv[])
READ(read_buffer(ci->last_topic_setter, f));
READ(read_int32(&tmp32, f));
ci->last_topic_time = tmp32;
- READ(read_int32(&ci->flags, f));
+ READ(read_uint32(&ci->flags, f));
/* Temporary flags cleanup */
ci->flags &= ~0x80000000;
READ(read_string(&ci->forbidby, f));
@@ -972,9 +974,9 @@ int main(int argc, char *argv[])
} else {
ci->akick = NULL;
}
- READ(read_int32(&ci->mlock_on, f));
- READ(read_int32(&ci->mlock_off, f));
- READ(read_int32(&ci->mlock_limit, f));
+ READ(read_uint32(&ci->mlock_on, f));
+ READ(read_uint32(&ci->mlock_off, f));
+ READ(read_uint32(&ci->mlock_limit, f));
READ(read_string(&ci->mlock_key, f));
READ(read_string(&ci->mlock_flood, f));
READ(read_string(&ci->mlock_redirect, f));
@@ -985,7 +987,7 @@ int main(int argc, char *argv[])
memos = calloc(sizeof(Memo) * ci->memos.memocount, 1);
ci->memos.memos = memos;
for (j = 0; j < ci->memos.memocount; j++, memos++) {
- READ(read_int32(&memos->number, f));
+ READ(read_uint32(&memos->number, f));
READ(read_int16(&memos->flags, f));
READ(read_int32(&tmp32, f));
memos->time = tmp32;
@@ -1676,7 +1678,19 @@ void close_db(dbFILE * f)
free(f);
}
-int read_int16(uint16 * ret, dbFILE * f)
+int read_int16(int16 * ret, dbFILE * f)
+{
+ int c1, c2;
+
+ c1 = fgetc(f->fp);
+ c2 = fgetc(f->fp);
+ if (c1 == EOF || c2 == EOF)
+ return -1;
+ *ret = c1 << 8 | c2;
+ return 0;
+}
+
+int read_uint16(uint16 * ret, dbFILE * f)
{
int c1, c2;
@@ -1697,7 +1711,21 @@ int write_int16(uint16 val, dbFILE * f)
}
-int read_int32(uint32 * ret, dbFILE * f)
+int read_int32(int32 * ret, dbFILE * f)
+{
+ int c1, c2, c3, c4;
+
+ c1 = fgetc(f->fp);
+ c2 = fgetc(f->fp);
+ c3 = fgetc(f->fp);
+ c4 = fgetc(f->fp);
+ if (c1 == EOF || c2 == EOF || c3 == EOF || c4 == EOF)
+ return -1;
+ *ret = c1 << 24 | c2 << 16 | c3 << 8 | c4;
+ return 0;
+}
+
+int read_uint32(uint32 * ret, dbFILE * f)
{
int c1, c2, c3, c4;
@@ -1749,7 +1777,7 @@ int read_string(char **ret, dbFILE * f)
char *s;
uint16 len;
- if (read_int16(&len, f) < 0)
+ if (read_uint16(&len, f) < 0)
return -1;
if (len == 0) {
*ret = NULL;
generated by cgit (git 2.34.1) at 2025-06-18 18:04:43 +0000