dmlib: tools/packed.c annotate

annotate tools/packed.c @ 2479:c1cae47cd410

Rename DMPackEntry::length to csize (compressed size).

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 27 Apr 2020 21:33:29 +0300
parents	d18fd4866650
children	c7a0913e1032

rev	line source
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * PACKed - PACKfile EDitor
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * Programmed and designed by Matti 'ccr' Hamalainen
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	4 * (C) Copyright 2011, 2018 Tecnic Software productions (TNSP)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 */
1432 a9516570cc26 Improve build, so that we can build the tools and tests with minimal Matti Hamalainen <ccr@tnsp.org> parents: 1407 diff changeset	6 #include "dmtool.h"
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 #include "dmlib.h"
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 #include "dmargs.h"
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 #include "dmpack.h"
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	10 #include "dmfile.h"
115 23e03defa759 Prettify pack content listing output. Matti Hamalainen <ccr@tnsp.org> parents: 31 diff changeset	11 #include "dmres.h"
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	12 #include <zlib.h>
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	13
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15 #define SET_MAX_FILES (4096)
1977 33c29e7d1861 Increase the zlib compression buffer size to 1MB to improve the efficiency. Matti Hamalainen <ccr@tnsp.org> parents: 1742 diff changeset	16 #define SET_TMPBUF_SIZE (1024 * 1024)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	17
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18 enum
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	19 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20 CMD_NONE = 0,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	21 CMD_CREATE,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22 CMD_ADD,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23 CMD_LIST,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	24 CMD_EXTRACT
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25 } DCOMMAND;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	27 enum
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	29 PACK_EXTRACTED = 0x0001,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	30 };
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31
752 2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	32 int nsrcFilenames = 0, nexcFilenames = 0;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33 char * srcFilenames[SET_MAX_FILES];
752 2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	34 char * excFilenames[SET_MAX_FILES];
2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	35
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36 char * optPackFilename = NULL;
1120 c1583a2278ec Fix '-n' option handling for packed. Matti Hamalainen <ccr@tnsp.org> parents: 1108 diff changeset	37 BOOL optDoCompress = TRUE;
1027 d29058e93799 Add option for setting the zlib compression level. Matti Hamalainen <ccr@tnsp.org> parents: 1026 diff changeset	38 int optCompressLevel = Z_BEST_COMPRESSION;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 int optCommand = CMD_NONE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40 int optDefResFlags = 0;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	43 static const DMOptArg cmdList[] =
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	44 {
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	45 { CMD_CREATE , 'c', "create", "Create and add files to PACK", OPT_NONE },
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	46 { CMD_ADD , 'a', "add", "Add files to PACK", OPT_NONE },
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	47 { CMD_LIST , 'l', "list", "List files in PACK", OPT_NONE },
2440 5b8cb850f5ab Rename extract short from 'e' to 'x'. Matti Hamalainen <ccr@tnsp.org> parents: 2439 diff changeset	48 { CMD_EXTRACT , 'x', "extract", "Extract files from PACK", OPT_NONE },
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	49 };
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	50
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	51 static const int cmdListN = sizeof(cmdList) / sizeof(cmdList[0]);
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	52
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	53
860 daebbf28953d The argument handling API in dmargs* was synced with th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 752 diff changeset	54 static const DMOptArg optList[] =
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	55 {
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	56 { 0, '?', "help" , "Show this help", OPT_NONE },
2410 bc05bcfc4598 Add a C file with the generic BSD license text and a function for Matti Hamalainen <ccr@tnsp.org> parents: 2408 diff changeset	57 { 1, 0, "license" , "Print out this program's license agreement", OPT_NONE },
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	58 { 2, 'v', "verbose" , "Be more verbose", OPT_NONE },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	59
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	60 { 3, 'n', "nocompress" , "No compression / decompression", OPT_NONE },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	61 { 4, 'C', "level" , "Set zlib compression level 1-9", OPT_ARGREQ },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	62 { 5, 'f', "resflags" , "Set default resource flags (-f 0xff)", OPT_ARGREQ },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	63 { 6, 'x', "exclude" , "Exclude name/glob pattern", OPT_ARGREQ },
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	64 };
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	65
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	66 static const int optListN = sizeof(optList) / sizeof(optList[0]);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	68
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69 void argShowHelp()
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70 {
2438 0b18f597351a Cosmetics in help. Matti Hamalainen <ccr@tnsp.org> parents: 2414 diff changeset	71 FILE *fh = stdout;
0b18f597351a Cosmetics in help. Matti Hamalainen <ccr@tnsp.org> parents: 2414 diff changeset	72
0b18f597351a Cosmetics in help. Matti Hamalainen <ccr@tnsp.org> parents: 2414 diff changeset	73 dmPrintBanner(fh, dmProgName, "<command> [options] <packfile> [<filename(s)>]");
0b18f597351a Cosmetics in help. Matti Hamalainen <ccr@tnsp.org> parents: 2414 diff changeset	74
0b18f597351a Cosmetics in help. Matti Hamalainen <ccr@tnsp.org> parents: 2414 diff changeset	75 fprintf(fh, "\n");
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	76
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	77 for (int i = 0; i < cmdListN; i++)
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	78 {
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	79 const DMOptArg *cmd = &cmdList[i];
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	80 char tmpStr[128];
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	81 snprintf(tmpStr, sizeof(tmpStr), "%c / %s",
1742 ddec147d1f90 Bring in changes from the th-libs version of commandline argument handling. Matti Hamalainen <ccr@tnsp.org> parents: 1642 diff changeset	82 cmd->o_short, cmd->o_long);
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	83
2438 0b18f597351a Cosmetics in help. Matti Hamalainen <ccr@tnsp.org> parents: 2414 diff changeset	84 fprintf(fh, " %-15s %s\n", tmpStr, cmd->desc);
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	85 }
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	86
2438 0b18f597351a Cosmetics in help. Matti Hamalainen <ccr@tnsp.org> parents: 2414 diff changeset	87 fprintf(fh, "\n");
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	88
2438 0b18f597351a Cosmetics in help. Matti Hamalainen <ccr@tnsp.org> parents: 2414 diff changeset	89 dmArgsPrintHelp(fh, optList, optListN, 0, 80 - 2);
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	90
2438 0b18f597351a Cosmetics in help. Matti Hamalainen <ccr@tnsp.org> parents: 2414 diff changeset	91 fprintf(fh,
1406 cb9865a49134 Indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1267 diff changeset	92 "\n"
cb9865a49134 Indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1267 diff changeset	93 "Examples:\n"
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	94 "$ %s l test.pak -- list files in test.pak\n"
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	95 "$ %s c test.pak foobar.jpg -- create test.pak and add foobar.jpg in it\n"
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	96 "$ %s e test.pak foobar.jpg -- extract foobar.jpg from test.pak\n",
1406 cb9865a49134 Indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1267 diff changeset	97 dmProgName, dmProgName, dmProgName);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101 BOOL argHandleOpt(const int optN, char optArg, char currArg)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	102 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	103 switch (optN)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	104 {
211 3dc35ce354f7 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	105 case 0:
3dc35ce354f7 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	106 argShowHelp();
3dc35ce354f7 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	107 exit(0);
3dc35ce354f7 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	108 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109
2410 bc05bcfc4598 Add a C file with the generic BSD license text and a function for Matti Hamalainen <ccr@tnsp.org> parents: 2408 diff changeset	110 case 1:
bc05bcfc4598 Add a C file with the generic BSD license text and a function for Matti Hamalainen <ccr@tnsp.org> parents: 2408 diff changeset	111 dmPrintLicense(stdout);
bc05bcfc4598 Add a C file with the generic BSD license text and a function for Matti Hamalainen <ccr@tnsp.org> parents: 2408 diff changeset	112 exit(0);
bc05bcfc4598 Add a C file with the generic BSD license text and a function for Matti Hamalainen <ccr@tnsp.org> parents: 2408 diff changeset	113 break;
bc05bcfc4598 Add a C file with the generic BSD license text and a function for Matti Hamalainen <ccr@tnsp.org> parents: 2408 diff changeset	114
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	115 case 2:
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	116 dmVerbosity++;
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	117 break;
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	118
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	119 case 3:
1120 c1583a2278ec Fix '-n' option handling for packed. Matti Hamalainen <ccr@tnsp.org> parents: 1108 diff changeset	120 optDoCompress = FALSE;
211 3dc35ce354f7 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	121 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	123 case 4:
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	124 optCompressLevel = atoi(optArg);
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	125 if (optCompressLevel < 1 \|\| optCompressLevel > 9)
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	126 {
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	127 dmErrorMsg("Invalid compression level argument '%s', must be 1 .. 9.\n", optArg);
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	128 return FALSE;
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	129 }
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	130 break;
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	131
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	132 case 5:
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	133 {
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1977 diff changeset	134 unsigned int tmpUI;
161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1977 diff changeset	135 if (!dmGetIntVal(optArg, &tmpUI, NULL))
211 3dc35ce354f7 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	136 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 952 diff changeset	137 dmErrorMsg("Invalid flags value '%s'.\n", optArg);
211 3dc35ce354f7 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	138 return FALSE;
3dc35ce354f7 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	139 }
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1977 diff changeset	140 optDefResFlags = tmpUI;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141 }
211 3dc35ce354f7 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	142 break;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	143
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	144 case 6:
752 2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	145 if (nexcFilenames < SET_MAX_FILES)
2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	146 {
1267 ad13510c8e41 Fix handling of -x option in packed. Matti Hamalainen <ccr@tnsp.org> parents: 1238 diff changeset	147 excFilenames[nexcFilenames++] = optArg;
752 2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	148 }
2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	149 else
2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	150 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 952 diff changeset	151 dmErrorMsg("Maximum number of exclusion patterns (%d) exceeded!\n",
752 2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	152 SET_MAX_FILES);
2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	153 return FALSE;
2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	154 }
2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	155 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156
211 3dc35ce354f7 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	157 default:
2183 e3f0eaf23f4f Change the error message for unimplemented option argument. Matti Hamalainen <ccr@tnsp.org> parents: 2105 diff changeset	158 dmErrorMsg("Unimplemented option argument '%s'.\n", currArg);
211 3dc35ce354f7 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	159 return FALSE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162 return TRUE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	165
2443 d18fd4866650 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2441 diff changeset	166 BOOL argHandleNonOpt(char *arg)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167 {
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	168 if (optCommand == CMD_NONE)
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	169 {
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	170 for (int n = 0; n < cmdListN; n++)
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	171 {
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	172 const DMOptArg *cmd = &cmdList[n];
2443 d18fd4866650 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2441 diff changeset	173 if ((arg[0] == cmd->o_short && arg[1] == 0) \|\|
d18fd4866650 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2441 diff changeset	174 (arg[0] == cmd->o_long[0] && arg[1] == 0) \|\|
d18fd4866650 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2441 diff changeset	175 strcmp(arg, cmd->o_long) == 0)
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	176 {
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	177 optCommand = cmd->id;
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	178 break;
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	179 }
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	180 }
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	181 if (optCommand == CMD_NONE)
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	182 {
2443 d18fd4866650 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2441 diff changeset	183 dmErrorMsg("Invalid command '%s'.\n", arg);
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	184 return FALSE;
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	185 }
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	186 }
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	187 else
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	188 if (optPackFilename == NULL)
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	189 {
2443 d18fd4866650 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2441 diff changeset	190 optPackFilename = arg;
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	191 }
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	192 else
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	193 if (nsrcFilenames < SET_MAX_FILES)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	194 {
2443 d18fd4866650 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2441 diff changeset	195 srcFilenames[nsrcFilenames++] = arg;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	196 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	197 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	198 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 952 diff changeset	199 dmErrorMsg("Maximum number of input files (%d) exceeded!\n",
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	200 SET_MAX_FILES);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	201 return FALSE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	203 return TRUE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	204 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	205
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	206
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	207 DMPackEntry dmPackEntryCopy(const DMPackEntry src)
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	208 {
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	209 DMPackEntry *node = dmPackEntryNew();
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	210 if (node == NULL)
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	211 return NULL;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	212
1033 c353e6bcb733 Change handling of filename field in PACKs. Matti Hamalainen <ccr@tnsp.org> parents: 1032 diff changeset	213 strncpy(node->filename, src->filename, DMRES_NAME_LEN);
c353e6bcb733 Change handling of filename field in PACKs. Matti Hamalainen <ccr@tnsp.org> parents: 1032 diff changeset	214 node->filename[DMRES_NAME_LEN] = 0;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	215
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	216 node->size = src->size;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	217 node->offset = src->offset;
2479 c1cae47cd410 Rename DMPackEntry::length to csize (compressed size). Matti Hamalainen <ccr@tnsp.org> parents: 2443 diff changeset	218 node->csize = src->csize;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	219 node->flags = src->flags;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	220
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	221 return node;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	222 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	223
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	224
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	225 int dmPackWrite(DMPackFile * pack)
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	226 {
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	227 DMPackEntry *node;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	228 DMPackFileHeader hdr;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	229
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	230 if (pack == NULL)
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	231 return DMERR_OK;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	232
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	233 if (pack->file == NULL)
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	234 return DMERR_FOPEN;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	235
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	236 // Compute directory offset and number of entries
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	237 memcpy(&hdr.ident, DPACK_IDENT, sizeof(hdr.ident));
2321 9360a693d8af Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	238 hdr.version = DPACK_VERSION;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	239 hdr.dirEntries = 0;
2321 9360a693d8af Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	240 hdr.dirOffset =
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	241 sizeof(hdr.ident) + sizeof(hdr.version) +
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	242 sizeof(hdr.dirEntries) + sizeof(hdr.dirOffset);
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	243
2105 eebe338b3c39 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2037 diff changeset	244 for (node = pack->entries; node != NULL; node = node->next)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	245 {
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	246 hdr.dirEntries++;
2479 c1cae47cd410 Rename DMPackEntry::length to csize (compressed size). Matti Hamalainen <ccr@tnsp.org> parents: 2443 diff changeset	247 hdr.dirOffset += node->csize;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	248 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	249
2391 d1992206765a Fix some format specifiers, was erraneously using DM_PRI_SIZE_T instead of DM_PRI64. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	250 dmMsg(1, "%d entries in PACK, dir at offset 0x%08" DM_PRIx64 ".\n",
1128 0194c8a26aa8 Add informative message to packed. Matti Hamalainen <ccr@tnsp.org> parents: 1120 diff changeset	251 hdr.dirEntries, hdr.dirOffset);
0194c8a26aa8 Add informative message to packed. Matti Hamalainen <ccr@tnsp.org> parents: 1120 diff changeset	252
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	253 // Write PACK header
1108 5a8d29b88431 More fixes. Matti Hamalainen <ccr@tnsp.org> parents: 1041 diff changeset	254 if (fseeko(pack->file, 0, SEEK_SET) != 0)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	255 return DMERR_FSEEK;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	256
2321 9360a693d8af Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	257 if (!dm_fwrite_str(pack->file, (Uint8 *) &hdr.ident, sizeof(hdr.ident)) \|\|
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	258 !dm_fwrite_le16(pack->file, hdr.version) \|\|
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	259 !dm_fwrite_le32(pack->file, hdr.dirEntries) \|\|
1037 d674ddc0fc82 Change PACK file format to use 64 bit fileoffsets. Also switch some Matti Hamalainen <ccr@tnsp.org> parents: 1036 diff changeset	260 !dm_fwrite_le64(pack->file, hdr.dirOffset))
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	261 return DMERR_FWRITE;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	262
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	263 // Write the directory
1108 5a8d29b88431 More fixes. Matti Hamalainen <ccr@tnsp.org> parents: 1041 diff changeset	264 if (fseeko(pack->file, hdr.dirOffset, SEEK_SET) != 0)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	265 return DMERR_FSEEK;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	266
2105 eebe338b3c39 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2037 diff changeset	267 for (node = pack->entries; node != NULL; node = node->next)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	268 {
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	269 // Write one entry
1033 c353e6bcb733 Change handling of filename field in PACKs. Matti Hamalainen <ccr@tnsp.org> parents: 1032 diff changeset	270 if (!dm_fwrite_str(pack->file, node->filename, DMRES_NAME_LEN) \|\|
1037 d674ddc0fc82 Change PACK file format to use 64 bit fileoffsets. Also switch some Matti Hamalainen <ccr@tnsp.org> parents: 1036 diff changeset	271 !dm_fwrite_le64(pack->file, node->offset) \|\|
2479 c1cae47cd410 Rename DMPackEntry::length to csize (compressed size). Matti Hamalainen <ccr@tnsp.org> parents: 2443 diff changeset	272 !dm_fwrite_le32(pack->file, node->csize) \|\|
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	273 !dm_fwrite_le32(pack->file, node->size) \|\|
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	274 !dm_fwrite_le32(pack->file, node->flags))
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	275 return DMERR_FWRITE;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	276 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	277
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	278 return DMERR_OK;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	279 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	280
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	281
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	282 int dmPackCreate(const char filename, DMPackFile * pack)
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	283 {
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	284 // Allocate packfile-structure
1024 66b01739e5d3 Use dmMalloc0() instead of dmCalloc(1, ...) Matti Hamalainen <ccr@tnsp.org> parents: 1023 diff changeset	285 pack = (DMPackFile ) dmMalloc0(sizeof(DMPackFile));
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	286 if (*pack == NULL)
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	287 return DMERR_MALLOC;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	288
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	289 // Open the file
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	290 (*pack)->file = fopen(filename, "wb");
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	291 if ((*pack)->file == NULL)
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	292 {
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	293 dmFree(*pack);
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	294 return DMERR_FOPEN;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	295 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	296
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	297 (*pack)->filename = dm_strdup(filename);
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	298
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	299 // Set the result
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	300 return DMERR_OK;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	301 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	302
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	303
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	304 int dmPackAddFile(DMPackFile * pack, const char *filename,
1041 d0f80f6a0c65 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1039 diff changeset	305 const Uint32 flags, const BOOL compress, int level,
d0f80f6a0c65 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1039 diff changeset	306 DMPackEntry ** ppEntry)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	307 {
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	308 Uint64 startOffs, outSize;
994 e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	309 Uint8 inBuffer = NULL, outBuffer = NULL;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	310 DMPackEntry entry, *node;
1031 f7863608d84c Cleanup, remove debug code. Matti Hamalainen <ccr@tnsp.org> parents: 1029 diff changeset	311 FILE *inFile = NULL;
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	312 int ret = DMERR_OK;
994 e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	313 BOOL zinit = FALSE;
1031 f7863608d84c Cleanup, remove debug code. Matti Hamalainen <ccr@tnsp.org> parents: 1029 diff changeset	314 z_stream zstr;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	315
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	316 *ppEntry = NULL;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	317
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	318 if (pack == NULL)
994 e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	319 return DMERR_NULLPTR;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	320
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	321 if (pack->file == NULL)
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	322 return DMERR_FOPEN;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	323
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	324 // Compute starting offset
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	325 outSize = 0;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	326 startOffs = sizeof(DMPackFileHeader);
2105 eebe338b3c39 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2037 diff changeset	327 for (node = pack->entries; node != NULL; node = node->next)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	328 {
2479 c1cae47cd410 Rename DMPackEntry::length to csize (compressed size). Matti Hamalainen <ccr@tnsp.org> parents: 2443 diff changeset	329 startOffs += node->csize;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	330 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	331
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	332 // Seek to the position
1108 5a8d29b88431 More fixes. Matti Hamalainen <ccr@tnsp.org> parents: 1041 diff changeset	333 if (fseeko(pack->file, startOffs, SEEK_SET) != 0)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	334 return DMERR_INVALID;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	335
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	336 // Read file data
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	337 if ((inFile = fopen(filename, "rb")) == NULL)
994 e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	338 return DMERR_FOPEN;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	339
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	340 // Allocate temporary buffer
996 acda8cfc9119 Also here. Matti Hamalainen <ccr@tnsp.org> parents: 994 diff changeset	341 if ((inBuffer = (Uint8 *) dmMalloc(SET_TMPBUF_SIZE)) == NULL \|\|
acda8cfc9119 Also here. Matti Hamalainen <ccr@tnsp.org> parents: 994 diff changeset	342 (outBuffer = (Uint8 *) dmMalloc(SET_TMPBUF_SIZE)) == NULL)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	343 {
994 e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	344 ret = DMERR_MALLOC;
e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	345 goto out;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	346 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	347
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	348 // Read (and possibly compress) the data
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	349 if (compress)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	350 {
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	351 int zret;
2439 f81b42dd600d Adjust few comments. Matti Hamalainen <ccr@tnsp.org> parents: 2438 diff changeset	352
f81b42dd600d Adjust few comments. Matti Hamalainen <ccr@tnsp.org> parents: 2438 diff changeset	353 // Initialize compression streams
2414 69a5af2eb1ea Remove useless dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 2410 diff changeset	354 memset(&zstr, 0, sizeof(zstr));
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	355 if (deflateInit(&zstr, level) != Z_OK)
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	356 {
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	357 ret = DMERR_COMPRESSION;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	358 goto out;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	359 }
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	360 zinit = TRUE;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	361
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	362 zret = Z_OK;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	363 while (!feof(inFile) && zret == Z_OK)
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	364 {
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	365 zstr.avail_in = fread(inBuffer, sizeof(Uint8), SET_TMPBUF_SIZE, inFile);
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	366
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	367 zstr.next_in = inBuffer;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	368 zstr.next_out = outBuffer;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	369 zstr.avail_out = SET_TMPBUF_SIZE;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	370 zstr.total_out = 0;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	371 zret = deflate(&zstr, Z_FULL_FLUSH);
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	372
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	373 if (zret == Z_OK && zstr.total_out > 0)
994 e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	374 {
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	375 outSize += zstr.total_out;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	376 if (fwrite(outBuffer, sizeof(Uint8), zstr.total_out, pack->file) != zstr.total_out)
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	377 {
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	378 ret = DMERR_FWRITE;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	379 goto out;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	380 }
994 e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	381 }
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	382 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	383 }
1032 f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	384 else
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	385 {
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	386 while (!feof(inFile))
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	387 {
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	388 size_t read = fread(inBuffer, sizeof(Uint8), SET_TMPBUF_SIZE, inFile);
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	389 if (read > 0)
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	390 {
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	391 outSize += read;
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	392 if (fwrite(inBuffer, sizeof(Uint8), read, pack->file) != read)
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	393 {
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	394 ret = DMERR_FWRITE;
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	395 goto out;
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	396 }
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	397 }
f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	398 }
1039 54970cd5acf0 Remember to set the "compressed" size field for raw nodes too, as we check Matti Hamalainen <ccr@tnsp.org> parents: 1037 diff changeset	399 zstr.total_in = outSize;
1032 f8d75a51de2c Implement raw uncompressed data copy. Matti Hamalainen <ccr@tnsp.org> parents: 1031 diff changeset	400 }
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	401
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	402 // Create directory entry
1035 d2fa4f6d6117 Oops, add a missing semicolon. Matti Hamalainen <ccr@tnsp.org> parents: 1033 diff changeset	403 strncpy(entry.filename, filename, DMRES_NAME_LEN);
1033 c353e6bcb733 Change handling of filename field in PACKs. Matti Hamalainen <ccr@tnsp.org> parents: 1032 diff changeset	404 entry.filename[DMRES_NAME_LEN] = 0;
1018 782a2a3a3707 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1011 diff changeset	405 entry.offset = startOffs;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	406 entry.size = zstr.total_in;
2479 c1cae47cd410 Rename DMPackEntry::length to csize (compressed size). Matti Hamalainen <ccr@tnsp.org> parents: 2443 diff changeset	407 entry.csize = outSize;
1029 c88b879c735c Add DMF_COMPRESSED flag to compressed entry node flags. Matti Hamalainen <ccr@tnsp.org> parents: 1028 diff changeset	408 entry.flags = flags \| (compress ? DMF_COMPRESSED : 0);
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	409
994 e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	410 // Add directory entry
e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	411 if ((*ppEntry = dmPackEntryCopy(&entry)) == NULL)
e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	412 {
e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	413 ret = DMERR_MALLOC;
e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	414 goto out;
e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	415 }
e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	416
e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	417 dmPackEntryInsert(&pack->entries, *ppEntry);
e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	418
e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	419 out:
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	420 // Cleanup
994 e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	421 if (zinit)
e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	422 deflateEnd(&zstr);
e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	423
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	424 dmFree(inBuffer);
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	425 dmFree(outBuffer);
994 e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	426 if (inFile != NULL)
e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	427 fclose(inFile);
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	428
994 e8de4fbc03b6 Clean up packed a bit. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	429 return ret;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	430 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	431
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	432
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	433 /*
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	434 * EXTRACT a file from the PACK
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	435 */
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	436 int dmPackExtractFile(DMPackFile pack, DMPackEntry entry, BOOL decompress)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	437 {
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	438 z_stream zstr;
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	439 FILE *outFile = NULL;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	440 Uint8 inBuffer = NULL, outBuffer = NULL;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	441 size_t remaining;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	442 int zret, ret = DMERR_OK;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	443 BOOL zinit = FALSE;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	444
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	445 if (pack == NULL)
1018 782a2a3a3707 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1011 diff changeset	446 return DMERR_NULLPTR;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	447
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	448 if (pack->file == NULL)
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	449 return DMERR_FOPEN;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	450
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	451 // Seek to the position
1108 5a8d29b88431 More fixes. Matti Hamalainen <ccr@tnsp.org> parents: 1041 diff changeset	452 if (fseeko(pack->file, entry->offset, SEEK_SET) != 0)
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	453 return DMERR_FSEEK;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	454
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	455 // Open destination file
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	456 if ((outFile = fopen(entry->filename, "wb")) == NULL)
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	457 return DMERR_FOPEN;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	458
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	459 // Allocate temporary buffer
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	460 if ((inBuffer = (Uint8 *) dmMalloc(SET_TMPBUF_SIZE)) == NULL \|\|
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	461 (outBuffer = (Uint8 *) dmMalloc(SET_TMPBUF_SIZE)) == NULL)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	462 {
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	463 ret = DMERR_MALLOC;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	464 goto out;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	465 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	466
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	467 // Read and uncompress the data, if needed
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	468 if (decompress \|\| (entry->flags & DMF_COMPRESSED) == 0)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	469 {
2439 f81b42dd600d Adjust few comments. Matti Hamalainen <ccr@tnsp.org> parents: 2438 diff changeset	470 // Initialize compression streams
2414 69a5af2eb1ea Remove useless dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 2410 diff changeset	471 memset(&zstr, 0, sizeof(zstr));
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	472 if (inflateInit(&zstr) != Z_OK)
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	473 {
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	474 ret = DMERR_COMPRESSION;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	475 goto out;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	476 }
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	477 zinit = TRUE;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	478 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	479
2479 c1cae47cd410 Rename DMPackEntry::length to csize (compressed size). Matti Hamalainen <ccr@tnsp.org> parents: 2443 diff changeset	480 remaining = entry->csize;
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	481 zret = Z_OK;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	482 while (remaining > 0 && zret == Z_OK)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	483 {
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	484 size_t needed = remaining > SET_TMPBUF_SIZE ? SET_TMPBUF_SIZE : remaining;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	485 zstr.avail_in = fread(inBuffer, sizeof(Uint8), needed, pack->file);
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	486 if (zstr.avail_in < needed)
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	487 {
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	488 ret = DMERR_FREAD;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	489 goto out;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	490 }
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	491
1018 782a2a3a3707 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1011 diff changeset	492 remaining -= zstr.avail_in;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	493 zstr.next_in = inBuffer;
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	494
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	495 if (!decompress)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	496 {
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	497 if (fwrite(inBuffer, sizeof(Uint8), zstr.avail_in, outFile) != zstr.avail_in)
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	498 {
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	499 ret = DMERR_FWRITE;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	500 goto out;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	501 }
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	502 }
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	503 else
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	504 while (zstr.avail_in > 0 && zret == Z_OK)
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	505 {
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	506 zstr.next_out = outBuffer;
996 acda8cfc9119 Also here. Matti Hamalainen <ccr@tnsp.org> parents: 994 diff changeset	507 zstr.avail_out = SET_TMPBUF_SIZE;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	508 zstr.total_out = 0;
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	509 zret = inflate(&zstr, Z_FULL_FLUSH);
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	510 if (zstr.total_out > 0 &&
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	511 fwrite(outBuffer, sizeof(Uint8), zstr.total_out, outFile) != zstr.total_out)
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	512 {
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	513 ret = DMERR_FWRITE;
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	514 goto out;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	515 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	516 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	517 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	518
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	519 out:
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	520 // Cleanup
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	521 if (zinit)
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	522 inflateEnd(&zstr);
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	523
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	524 dmFree(inBuffer);
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	525 dmFree(outBuffer);
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	526
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	527 if (outFile != NULL)
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	528 fclose(outFile);
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	529
16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	530 return ret;
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	531 }
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	532
ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	533
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	534 /* Compare a string to a pattern. Case-SENSITIVE version.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	535 * The matching pattern can consist of any normal characters plus
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536 * wildcards ? and . "?" matches any character and "" matches
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	537 * any number of characters.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	538 */
1407 4bca92dd7280 Rename dm_strmatch() to dmStrMatch(). Matti Hamalainen <ccr@tnsp.org> parents: 1406 diff changeset	539 BOOL dmStrMatch(const char str, const char pattern)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540 {
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	541 BOOL matched = TRUE, any = FALSE, end = FALSE;
8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	542 const char *tmp = NULL;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	543
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544 // Check given pattern and string
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545 if (str == NULL \|\| pattern == NULL)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	546 return FALSE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548 // Start comparision
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	549 do {
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	550 matched = FALSE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 switch (*pattern)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	553 case '?':
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	554 // Any single character matches
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	555 if (*str)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	556 {
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	557 matched = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	558 pattern++;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	559 str++;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	560 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 case '*':
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	564 matched = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 pattern++;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566 if (!*pattern)
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	567 end = TRUE;
8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	568 any = TRUE;
8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	569 tmp = pattern;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	570 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	571
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	572 case 0:
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	573 if (any)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	574 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	575 if (*str)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576 str++;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577 else
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	578 end = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582 if (*str)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	583 {
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	584 if (tmp)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585 {
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	586 any = TRUE;
8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	587 pattern = tmp;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	588 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	589 else
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	590 matched = FALSE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	591 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	592 else
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	593 end = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	594 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	595 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	596 default:
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	597 if (any)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	598 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	599 if (pattern == str)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	600 {
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	601 any = FALSE;
8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	602 matched = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	603 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	604 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	605 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606 if (*str)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607 {
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	608 matched = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	609 str++;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	610 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	611 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	612 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	613 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	614 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	615 if (pattern == str)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	616 {
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	617 matched = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	618 if (*pattern)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619 pattern++;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	620 if (*str)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	621 str++;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	622 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	623 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	624 {
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	625 if (tmp)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	626 {
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	627 matched = TRUE;
8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	628 any = TRUE;
8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	629 pattern = tmp;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	630 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	631 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	632 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	633
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	634 if (!str && !pattern)
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	635 end = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	636 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	637
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	638 } // switch
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	639
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	640 } while (matched && !end);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	641
1019 8cf8a8035438 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1018 diff changeset	642 return matched;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	643 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	644
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	645
752 2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	646 BOOL dmCheckExcluded(const char *filename)
2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	647 {
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	648 for (int i = 0; i < nexcFilenames; i++)
752 2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	649 {
1407 4bca92dd7280 Rename dm_strmatch() to dmStrMatch(). Matti Hamalainen <ccr@tnsp.org> parents: 1406 diff changeset	650 if (dmStrMatch(filename, excFilenames[i]))
752 2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	651 return TRUE;
2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	652 }
2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	653 return FALSE;
2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	654 }
2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	655
2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	656
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	657 int main(int argc, char *argv[])
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	658 {
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	659 int res = 0;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	660 DMPackFile *pack = NULL;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	662 // Parse arguments
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	663 dmInitProg("packed", "TNSP Pack File Editor", "0.7", NULL, NULL);
1011 aa745d31612e Set default verbosity of 'packed' to none. Matti Hamalainen <ccr@tnsp.org> parents: 1008 diff changeset	664 dmVerbosity = 0;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	665
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	666 if (!dmArgsProcess(argc, argv, optList, optListN,
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	667 argHandleOpt, argHandleNonOpt, OPTH_BAILOUT))
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	668 exit(1);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	669
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	670 if (optCommand == CMD_NONE)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	671 {
2441 275374725598 Show help when no arguments. Matti Hamalainen <ccr@tnsp.org> parents: 2440 diff changeset	672 argShowHelp();
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	673 goto error;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	674 }
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	675
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	676 if (optPackFilename == NULL)
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	677 {
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	678 dmErrorMsg("No PACK file specified.\n");
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	679 goto error;
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	680 }
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	681
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	682 dmMsg(1, "Processing PACK '%s' ...\n", optPackFilename);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	683
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	684 // Execute command
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	685 switch (optCommand)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	686 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	687 case CMD_CREATE:
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	688 case CMD_ADD:
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	689 switch (optCommand)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	690 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	691 case CMD_CREATE:
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	692 dmMsg(1, "Creating new PACK\n");
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	693 res = dmPackCreate(optPackFilename, &pack);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	694 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	695
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	696 case CMD_ADD:
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	697 dmMsg(1, "Opening existing PACK\n");
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	698 res = dmPackOpen(optPackFilename, &pack, FALSE);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	699 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	700 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	701
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	702 // Add files into PACK
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	703 if (res == DMERR_OK)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	704 {
752 2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	705 dmMsg(1, "Adding files...\n");
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	706
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	707 for (int i = 0; i < nsrcFilenames; i++)
752 2b9dd22f01e9 Improve packed by adding file exclusion option. Matti Hamalainen <ccr@tnsp.org> parents: 721 diff changeset	708 if (!dmCheckExcluded(srcFilenames[i]))
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	709 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	710 DMPackEntry *node = NULL;
1026 16e63811d0c2 Clean up the pack file node adding/extracting. Matti Hamalainen <ccr@tnsp.org> parents: 1025 diff changeset	711 int res = dmPackAddFile(pack, srcFilenames[i],
1120 c1583a2278ec Fix '-n' option handling for packed. Matti Hamalainen <ccr@tnsp.org> parents: 1108 diff changeset	712 optDefResFlags, optDoCompress,
1027 d29058e93799 Add option for setting the zlib compression level. Matti Hamalainen <ccr@tnsp.org> parents: 1026 diff changeset	713 optCompressLevel, &node);
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	714
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	715 if (res != DMERR_OK)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	716 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	717 dmPrint(1, "%-32s [ERROR:%d]\n",
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	718 srcFilenames[i], res);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	719 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	720 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	721 {
2391 d1992206765a Fix some format specifiers, was erraneously using DM_PRI_SIZE_T instead of DM_PRI64. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	722 dmPrint(1, "%-32s ['%s', s=%d, c=%d, o=%" DM_PRId64 ", f=0x%04x]\n",
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	723 srcFilenames[i], node->filename,
2479 c1cae47cd410 Rename DMPackEntry::length to csize (compressed size). Matti Hamalainen <ccr@tnsp.org> parents: 2443 diff changeset	724 node->size, node->csize, node->offset, node->flags);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	725 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	726 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	727
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	728 dmMsg(2, "w=%d\n", dmPackWrite(pack));
8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	729 dmMsg(2, "c=%d\n", dmPackClose(pack));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	730 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	731 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	732 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 952 diff changeset	733 dmErrorMsg("Could not open packfile, error #%d: %s\n", res,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	734 dmErrorStr(res));
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	735 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	736 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	737
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	738 case CMD_LIST:
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	739 // List files in PACK
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	740 res = dmPackOpen(optPackFilename, &pack, TRUE);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	741 if (res == DMERR_OK)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	742 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	743 DMPackEntry *node;
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	744 int i;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	745 for (i = 0, node = pack->entries; node; i++)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	746 node = node->next;
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	747
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	748 dmMsg(1, "%d files total\n", i);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	749
115 23e03defa759 Prettify pack content listing output. Matti Hamalainen <ccr@tnsp.org> parents: 31 diff changeset	750 dmPrint(0, "%-32s \| %8s \| %8s \| %8s \| %s\n",
23e03defa759 Prettify pack content listing output. Matti Hamalainen <ccr@tnsp.org> parents: 31 diff changeset	751 "Name", "Size", "CSize", "Offset", "ResFlags");
23e03defa759 Prettify pack content listing output. Matti Hamalainen <ccr@tnsp.org> parents: 31 diff changeset	752
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	753 for (node = pack->entries; node != NULL; node = node->next)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	754 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	755 BOOL match;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	756
1025 b43885dd3d1a Comments, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1024 diff changeset	757 // Check for matches in specified filenames/patterns
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	758 if (nsrcFilenames > 0)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	759 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	760 match = FALSE;
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	761 for (int i = 0; i < nsrcFilenames && !match; i++)
1407 4bca92dd7280 Rename dm_strmatch() to dmStrMatch(). Matti Hamalainen <ccr@tnsp.org> parents: 1406 diff changeset	762 match = dmStrMatch(node->filename, srcFilenames[i]);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	763 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	764 else
1025 b43885dd3d1a Comments, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1024 diff changeset	765 // No filenames specified, everything shown
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	766 match = TRUE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	767
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	768 if (match)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	769 {
2391 d1992206765a Fix some format specifiers, was erraneously using DM_PRI_SIZE_T instead of DM_PRI64. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	770 dmPrint(0, "%-32s \| %8d \| %8d \| %08" DM_PRIx64 " \| %04x\n",
2479 c1cae47cd410 Rename DMPackEntry::length to csize (compressed size). Matti Hamalainen <ccr@tnsp.org> parents: 2443 diff changeset	771 node->filename, node->size, node->csize,
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	772 node->offset, node->flags);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	773 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	774 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	775
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	776 dmMsg(2, "c=%d\n", dmPackClose(pack));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	777 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	778 else
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 952 diff changeset	779 dmErrorMsg("Could not open packfile, error #%d: %s\n", res,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	780 dmErrorStr(res));
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	781 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	782
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	783 case CMD_EXTRACT:
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	784 // Extract files from PACK
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	785 res = dmPackOpen(optPackFilename, &pack, TRUE);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	786 if (res == DMERR_OK)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	787 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	788 DMPackEntry *node;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	789 FILE *resFile = fopen(DMRES_RES_FILE, "w");
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	790 if (resFile == NULL)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	791 {
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	792 int err = dmGetErrno();
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 952 diff changeset	793 dmErrorMsg("Could not create resource output file '%s' #%d: %s\n",
952 ffdae9cd81de Remove the dmpackutil module, move the code to packed utility Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	794 DMRES_RES_FILE, err, dmErrorStr(err));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	795 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	796
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	797 for (node = pack->entries; node != NULL; node = node->next)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	798 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	799 BOOL match;
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	800
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	801 // Check for matches
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	802 if (nsrcFilenames > 0)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	803 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	804 match = FALSE;
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	805 for (int i = 0; i < nsrcFilenames && !match; i++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	806 {
1407 4bca92dd7280 Rename dm_strmatch() to dmStrMatch(). Matti Hamalainen <ccr@tnsp.org> parents: 1406 diff changeset	807 if (dmStrMatch(node->filename, srcFilenames[i]) &&
1267 ad13510c8e41 Fix handling of -x option in packed. Matti Hamalainen <ccr@tnsp.org> parents: 1238 diff changeset	808 !dmCheckExcluded(node->filename))
ad13510c8e41 Fix handling of -x option in packed. Matti Hamalainen <ccr@tnsp.org> parents: 1238 diff changeset	809 match = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	810 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	811 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	812 else
1267 ad13510c8e41 Fix handling of -x option in packed. Matti Hamalainen <ccr@tnsp.org> parents: 1238 diff changeset	813 {
ad13510c8e41 Fix handling of -x option in packed. Matti Hamalainen <ccr@tnsp.org> parents: 1238 diff changeset	814 match = !dmCheckExcluded(node->filename);
ad13510c8e41 Fix handling of -x option in packed. Matti Hamalainen <ccr@tnsp.org> parents: 1238 diff changeset	815 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	816
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	817 if (match && (node->privFlags & PACK_EXTRACTED) == 0)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	818 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	819 // Mark as done
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	820 node->privFlags \|= PACK_EXTRACTED;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	821
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	822 // Print one entry
2391 d1992206765a Fix some format specifiers, was erraneously using DM_PRI_SIZE_T instead of DM_PRI64. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	823 dmPrint(0, "Extracting: %-32s [siz=%d, cmp=%d, offs=0x%08" DM_PRIx64 ", flags=0x%04x]\n",
2479 c1cae47cd410 Rename DMPackEntry::length to csize (compressed size). Matti Hamalainen <ccr@tnsp.org> parents: 2443 diff changeset	824 node->filename, node->size, node->csize,
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	825 node->offset, node->flags);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	826
1120 c1583a2278ec Fix '-n' option handling for packed. Matti Hamalainen <ccr@tnsp.org> parents: 1108 diff changeset	827 dmPackExtractFile(pack, node, optDoCompress);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	828 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	829 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	830
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	831 dmMsg(2, "c=%d\n", dmPackClose(pack));
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	832
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	833 if (resFile != NULL)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	834 fclose(resFile);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	835 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	836 else
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 952 diff changeset	837 dmErrorMsg("Could not open packfile, error #%d: %s\n", res,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	838 dmErrorStr(res));
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	839 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	840 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	841
1642 8fb4e8c825d6 Refactor "packed" utility. This breaks commandline backwards compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	842 error:
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	843 return 0;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	844 }

Mercurial > hg > dmlib

annotate tools/packed.c @ 2479:c1cae47cd410