Permalink
Browse files

improve documentation of .pst format.

remove decrypt option from getidblock - we always decrypt.
  • Loading branch information...
1 parent 9b794e1 commit d064dc837577cc4959d1c32afbb2d6e557adf46e Carl Byington committed Feb 28, 2009
Showing with 101 additions and 63 deletions.
  1. +5 −0 ChangeLog
  2. +17 −0 Makefile.coverity
  3. +1 −0 NEWS
  4. +1 −1 configure.in
  5. +2 −12 src/getidblock.c
  6. +2 −1 src/libpst.c
  7. +73 −49 xml/libpst.in
View
@@ -1,3 +1,8 @@
+LibPST 0.6.30 (2009-xx-xx)
+===============================
+ * improve documentation of .pst format.
+ * remove decrypt option from getidblock - we always decrypt.
+
LibPST 0.6.29 (2009-02-24)
===============================
* fix for 64bit on Fedora 11
View
@@ -0,0 +1,17 @@
+default: all
+
+all:
+ rm -rf emit output
+ export PATH=$(PATH):$(PWD)/coverity/prevent-linux-2.4.6/bin; \
+ cov-configure -co /usr/bin/gcc; \
+ ./configure && make clean; \
+ cov-build -e emit -o output make
+ mv README README.save
+ mv README.COVERITY README
+ tar czvf libpst.tgz README emit output
+ mv README README.COVERITY
+ mv README.save README
+ rm -rf emit output
+ echo mv libpst.tgz /home/httpd/html/510sg
+ echo fixup-510 ns1 --dry-run
+
View
1 NEWS
@@ -1,3 +1,4 @@
+0.6.30 2009-xx-xx improve documentation of .pst format.
0.6.29 2009-02-24 fix for 64bit on Fedora 11
0.6.28 2009-02-24 improve decoding of multipart/report and message/rfc822 mime types.
0.6.27 2009-02-07 fix for const correctness on Fedora 11
View
@@ -1,5 +1,5 @@
AC_PREREQ(2.59)
-AC_INIT(libpst,0.6.29,carl@five-ten-sg.com)
+AC_INIT(libpst,0.6.30,carl@five-ten-sg.com)
AC_CONFIG_SRCDIR([src/libpst.c])
AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE
View
@@ -1,7 +1,7 @@
#include "define.h"
-int decrypt = 0, process = 0, binary = 0;
+int process = 0, binary = 0;
pst_file pstfile;
@@ -12,7 +12,6 @@ void usage()
printf("\tfilename - name of the file to access\n");
printf("\tid - ID of the block to fetch (0 to fetch all) - can begin with 0x for hex\n");
printf("\toptions\n");
- printf("\t\t-d\tDecrypt the block before printing\n");
printf("\t\t-p\tProcess the block before finishing.\n");
printf("\t\t\tView the debug log for information\n");
}
@@ -27,15 +26,10 @@ void dumper(uint64_t id)
DEBUG_MAIN(("\n\n\nLooking at block index1 id %#"PRIx64"\n", id));
- if ((readSize = pst_ff_getIDblock(&pstfile, id, &buf)) <= 0 || buf == 0) {
+ if ((readSize = pst_ff_getIDblock_dec(&pstfile, id, &buf)) <= 0 || buf == 0) {
DIE(("Error loading block\n"));
}
- if (decrypt)
- if (pst_decrypt(id, buf, readSize, (int) pstfile.encryption) != 0) {
- DIE(("Error decrypting block\n"));
- }
-
DEBUG_MAIN(("Printing block id %#"PRIx64", size %#"PRIx64"\n", id, (uint64_t)readSize));
if (binary) {
if (fwrite(buf, 1, readSize, stdout) != 0) {
@@ -98,10 +92,6 @@ int main(int argc, char* const* argv)
// enable binary output
binary = 1;
break;
- case 'd':
- //enable decrypt
- decrypt = 1;
- break;
case 'p':
// enable procesing of block
process = 1;
View
@@ -749,7 +749,7 @@ static size_t pst_decode_index(pst_file *pf, pst_index *index, char *buf) {
LE64_CPU(index->offset);
LE16_CPU(index->size);
LE16_CPU(index->u0);
- LE16_CPU(index->u1);
+ LE32_CPU(index->u1);
r = sizeof(pst_index);
} else {
pst_index32 index32;
@@ -763,6 +763,7 @@ static size_t pst_decode_index(pst_file *pf, pst_index *index, char *buf) {
index->id = index32.id;
index->offset = index32.offset;
index->size = index32.size;
+ index->u0 = 0;
index->u1 = index32.u1;
r = sizeof(pst_index32);
}
Oops, something went wrong.

0 comments on commit d064dc8

Please sign in to comment.