diff options
Diffstat (limited to 'Datafile')
-rw-r--r-- | Datafile/Archive.cpp | 506 | ||||
-rw-r--r-- | Datafile/Archive.h | 110 | ||||
-rw-r--r-- | Datafile/CMakeLists.txt | 11 | ||||
-rw-r--r-- | Datafile/Datafile.vcxproj | 217 | ||||
-rw-r--r-- | Datafile/Datafile.vcxproj.filters | 30 | ||||
-rw-r--r-- | Datafile/Main.cpp | 448 |
6 files changed, 1322 insertions, 0 deletions
diff --git a/Datafile/Archive.cpp b/Datafile/Archive.cpp new file mode 100644 index 0000000..a33422c --- /dev/null +++ b/Datafile/Archive.cpp @@ -0,0 +1,506 @@ +/* Starshatter OpenSource Distribution + Copyright (c) 1997-2004, Destroyer Studios LLC. + All Rights Reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name "Destroyer Studios" nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + SUBSYSTEM: DataFile.exe + FILE: Archive.cpp + AUTHOR: John DiCamillo + +*/ + +#include <string> +#include <stdlib.h> +#include <fcntl.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <io.h> +#include <stdio.h> +#include <math.h> +#include <time.h> +#include <windows.h> +#include <windowsx.h> + +#include "zlib.h" +#include <mmsystem.h> +#include "Archive.h" + +int verbose = 1; +int err; + +#define CHECK_ERR(err, msg) { \ + if (err != Z_OK) { \ + fprintf(stderr, "%s error: %d\n", msg, err); \ + exit(1); \ + } \ +} + +// +--------------------------------------------------------------------+ + +DataArchive::DataArchive(const char* name) +{ + ZeroMemory(this, sizeof(DataArchive)); + + if (name) + LoadDatafile(name); +} + +DataArchive::~DataArchive() +{ + delete [] block_map; +} + +// +--------------------------------------------------------------------+ + +void DataArchive::WriteEntry(int index, BYTE* buf) +{ + int f = _open(datafile, _O_RDWR|_O_CREAT|_O_BINARY, _S_IREAD|_S_IWRITE); + + if (f != -1) { + header.dir_size_comp = DirBlocks() * BLOCK_SIZE; + dirbuf = new BYTE[header.dir_size_comp]; + + err = compress(dirbuf, &header.dir_size_comp, + (BYTE*) directory, header.nfiles * sizeof(DataEntry)); + CHECK_ERR(err, "compress"); + + header.dir_blocks = Blocks(header.dir_size_comp) * BLOCK_SIZE; + + _lseek(f, 0, SEEK_SET); + _write(f, &header, sizeof(DataHeader)); + _lseek(f, sizeof(DataHeader) + header.dir_offset, SEEK_SET); + _write(f, dirbuf, header.dir_blocks); + + delete [] dirbuf; + + if (buf && directory[index].size_comp) { + _lseek(f, sizeof(DataHeader) + directory[index].offset, SEEK_SET); + _write(f, buf, directory[index].size_comp); + } + _close(f); + } + else + perror("WriteEntry"); +} + +// +--------------------------------------------------------------------+ + +DWORD DataArchive::Blocks(DWORD raw_size) +{ + int full_blocks = raw_size / BLOCK_SIZE; + int part_blocks = (raw_size % BLOCK_SIZE) > 0; + + return full_blocks + part_blocks; +} + +DWORD DataArchive::DirBlocks() +{ + DWORD result = Blocks(header.nfiles * sizeof(DataEntry)); + if (result == 0) result = 1; + return result; +} + +DWORD DataArchive::FileBlocks(int index) +{ + return Blocks(directory[index].size_comp); +} + +// +--------------------------------------------------------------------+ + +void DataArchive::CreateBlockMap() +{ + delete [] block_map; + block_map = 0; + + if (header.nfiles == 0) return; + + DWORD i,j; + DWORD dir_usage = header.dir_offset + DirBlocks() * BLOCK_SIZE; + DWORD max_usage = dir_usage; + + for (i = 0; i < header.nfiles; i++) { + DWORD last_block = directory[i].offset + FileBlocks(i) * BLOCK_SIZE; + if (last_block > max_usage) + max_usage = last_block; + } + + nblocks = max_usage/BLOCK_SIZE; + block_map = new DWORD[nblocks]; + ZeroMemory(block_map, nblocks*sizeof(DWORD)); + + DWORD first_block = header.dir_offset/BLOCK_SIZE + + (header.dir_offset%BLOCK_SIZE > 0); + + for (j = 0; j < DirBlocks(); j++) + block_map[first_block+j] = 1; + + for (i = 0; i < header.nfiles; i++) { + DWORD first_block = directory[i].offset/BLOCK_SIZE + + (directory[i].offset%BLOCK_SIZE > 0); + + for (j = 0; j < FileBlocks(i); j++) + block_map[first_block+j] = i+2; + } +} + +// +--------------------------------------------------------------------+ + +int DataArchive::FindDataBlocks(int need) +{ + if ((int) (nblocks)-need > 0) { + DWORD start; + int i; + + for (start = 0; start < nblocks-need; start++) { + for (i = 0; block_map[start+i] == 0 && i < need; i++); + + if (i == need) return start*BLOCK_SIZE; + + start += i; + } + } + + return nblocks*BLOCK_SIZE; +} + +// +--------------------------------------------------------------------+ + +void DataArchive::LoadDatafile(const char* name) +{ + strncpy(datafile, name, NAMELEN-1); + header.nfiles = 0; + + FILE* f = fopen(datafile, "rb"); + if (f) { + fread(&header, sizeof(DataHeader), 1, f); + + if (header.version != VERSION) { + printf("ERROR: datafile '%s' invalid version '%d'\n", //-V576 + datafile, header.version); + fclose(f); + exit(-2); + } + + DWORD len = DirBlocks() * BLOCK_SIZE; + + dirbuf = new BYTE[len]; + fseek(f, sizeof(DataHeader) + header.dir_offset, SEEK_SET); + fread(dirbuf, header.dir_size_comp, 1, f); + + int err = uncompress((BYTE*) directory, &len, + dirbuf, header.dir_size_comp); + if (err != Z_OK) + ZeroMemory(directory, sizeof(directory)); + + delete [] dirbuf; + CreateBlockMap(); + } + else { + printf("Creating Archive '%s'...\n", datafile); + + header.version = VERSION; + header.nfiles = 0; + header.dir_blocks = 0; + header.dir_size_comp = 0; + header.dir_offset = 0; + + nblocks = DirBlocks(); + + delete [] block_map; + block_map = 0; + } +} + +// +--------------------------------------------------------------------+ + +int DataArchive::FindEntry(const char* req_name) +{ + int entry = -1; + + for (DWORD i = 0; i < header.nfiles; i++) + if (!_stricmp(directory[i].name, req_name)) + return i; + + return entry; +} + +// +--------------------------------------------------------------------+ + +BYTE* DataArchive::CompressEntry(int i) +{ + char* name = directory[i].name; + + FILE* f = fopen(name, "rb"); + + if (f) { + fseek(f, 0, SEEK_END); + DWORD len = ftell(f); + fseek(f, 0, SEEK_SET); + + BYTE* buf = new BYTE[len]; + + fread(buf, len, 1, f); + fclose(f); + + directory[i].size_orig = len; + + directory[i].size_comp = (int) (len * 1.1); + BYTE* cbuf = new BYTE[directory[i].size_comp]; + + err = compress(cbuf, &directory[i].size_comp, buf, len); + CHECK_ERR(err, "compress"); + + delete [] buf; + return cbuf; + } + + return 0; +} + +// +--------------------------------------------------------------------+ + +int DataArchive::ExpandEntry(int i, BYTE*& buf) +{ + DWORD len = 0; + + FILE* f = fopen(datafile, "rb"); + + if (f) { + DWORD clen = directory[i].size_comp; + BYTE* cbuf = new BYTE[clen]; + + fseek(f, sizeof(DataHeader) + directory[i].offset, SEEK_SET); + fread(cbuf, clen, 1, f); + + len = directory[i].size_orig; + buf = new BYTE[len]; + + int err = uncompress(buf, &len, cbuf, clen); + if (err != Z_OK) { + delete [] buf; + buf = 0; + } + + delete [] cbuf; + fclose(f); + } + + return len; +} + +// +--------------------------------------------------------------------+ + +int DataArchive::InsertEntry(const char* name) +{ + if (!name) return -1; + + DWORD len = strlen(name); + + for (int i = 0; i < MAX_FILES; i++) { + if (directory[i].size_orig == 0) { + strncpy(directory[i].name, name, NAMELEN); + directory[i].name[NAMELEN-1] = '\0'; + directory[i].size_orig = 1; + + return i; + } + } + + return -1; +} + +// +--------------------------------------------------------------------+ + +void DataArchive::RemoveEntry(int index) +{ + ZeroMemory(&directory[index], sizeof(DataEntry)); +} + +// +--------------------------------------------------------------------+ + +void DataArchive::Insert(const char* name) +{ + DWORD old_blocks = 0, old_offset = 0, new_blocks = 0; + DWORD old_dir_blocks = 0, old_dir_offset = 0, new_dir_blocks = 0; + int added = 0; + + int index = FindEntry(name); + + if (index < 0) { + old_dir_blocks = DirBlocks(); + old_dir_offset = header.dir_offset; + + index = InsertEntry(name); + + if (index >= (int) header.nfiles) { + header.nfiles = index+1; + added = 1; + } + + new_dir_blocks = DirBlocks(); + + if (new_dir_blocks > old_dir_blocks) { + header.dir_offset = FindDataBlocks(new_dir_blocks); + CreateBlockMap(); + } + } + else { + old_blocks = FileBlocks(index); + old_offset = directory[index].offset; + } + + if (index >= 0) { + DataEntry& e = directory[index]; + + if (verbose) printf(" Inserting: %-48s ", e.name); + + BYTE* buf = CompressEntry(index); + + if (!buf) { + // this is (almost) unrecoverable, + // so we quit before screwing things up: + printf("ERROR: Could not compress %d:%s\n", index, directory[index].name); + exit(1); + } + + new_blocks = FileBlocks(index); + + // the file is new, or got bigger, + // need to find room for the data: + if (new_blocks > old_blocks) { + directory[index].offset = FindDataBlocks(new_blocks); + CreateBlockMap(); + } + + WriteEntry(index, buf); + delete [] buf; + + if (verbose) { + int ratio = (int) (100.0 * (double) e.size_comp / (double) e.size_orig); + printf("%9d => %9d (%2d%%)\n", e.size_orig, e.size_comp, ratio); //-V576 + } + } + else if (added) + header.nfiles--; +} + +// +--------------------------------------------------------------------+ + +std::wstring ToWideString(const std::string& str) +{ + int stringLength = MultiByteToWideChar(CP_ACP, 0, str.data(), str.length(), 0, 0); + std::wstring wstr(stringLength, 0); + MultiByteToWideChar(CP_ACP, 0, str.data(), str.length(), &wstr[0], stringLength); + return wstr; +} + +void DataArchive::Extract(const char* name) +{ + int index = FindEntry(name); + + if (index < 0) { + printf("Could not extract '%s', not found\n", name); + return; + } + + BYTE* buf; + ExpandEntry(index, buf); + + std::string dirname = directory[index].name; + bool create_subdir = (dirname.find_first_of('/', 0) != std::string::npos); + std::wstring wdirname = ToWideString(dirname.substr(0, dirname.find_first_of('/'))); + if (create_subdir) + CreateDirectory(wdirname.c_str(), NULL); + size_t offset = wdirname.length(); + while (dirname.find_first_of('/', offset + 1) != std::string::npos) { + wdirname.push_back('/'); + wdirname += ToWideString(dirname.substr(offset + 1, dirname.find_first_of('/', offset + 1) - offset - 1)); + CreateDirectory(wdirname.c_str(), NULL); + offset = wdirname.length(); + } + + FILE* f = fopen(directory[index].name, "w+b"); + if (f) { + fwrite(buf, directory[index].size_orig, 1, f); + fclose(f); + } + else + printf("Could not extract '%s', could not open file for writing\n", name); + + delete [] buf; + + if (verbose) printf(" Extracted: %s\n", name); +} + +// +--------------------------------------------------------------------+ + +void DataArchive::Remove(const char* name) +{ + int index = FindEntry(name); + + if (index < 0) { + printf("Could not remove '%s', not found\n", name); + return; + } + + RemoveEntry(index); + WriteEntry(index, 0); + + if (verbose) printf(" Removed: %s\n", name); +} + +// +--------------------------------------------------------------------+ + +void DataArchive::List() +{ + int total_orig = 0; + int total_comp = 0; + + printf("DATAFILE: %s\n", datafile); + printf("Files: %d\n", header.nfiles); //-V576 + printf("\n"); + printf("Index Orig Size Comp Size Ratio Name\n"); + printf("----- --------- --------- ----- ----------------\n"); + + for (DWORD i = 0; i < header.nfiles; i++) { + DataEntry& e = directory[i]; + int ratio = (int) (100.0 * (double) e.size_comp / (double) e.size_orig); + + printf("%5d %9d %9d %2d%% %s\n", i+1, e.size_orig, e.size_comp, ratio, e.name); //-V576 + + total_orig += e.size_orig; + total_comp += e.size_comp; + } + + int total_ratio = (int) (100.0 * (double) total_comp / (double) total_orig); + + printf("----- --------- --------- -----\n"); + printf("TOTAL %9d %9d %2d%%\n\n", total_orig, total_comp, total_ratio); +} + + +// +--------------------------------------------------------------------+ + diff --git a/Datafile/Archive.h b/Datafile/Archive.h new file mode 100644 index 0000000..7b3982d --- /dev/null +++ b/Datafile/Archive.h @@ -0,0 +1,110 @@ +/* Starshatter OpenSource Distribution + Copyright (c) 1997-2004, Destroyer Studios LLC. + All Rights Reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name "Destroyer Studios" nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + SUBSYSTEM: DataFile.exe + FILE: Archive.hpp + AUTHOR: John DiCamillo + +*/ + +#ifndef ARCHIVE_HPP +#define ARCHIVE_HPP + +// +------------------------------------------------------------------+ + +#define VERSION 0x0010 +#define BLOCK_SIZE 1024 +#define MAX_FILES 8192 +#define FILE_BLOCK 1024 +#define NAMELEN 64 + +// +------------------------------------------------------------------+ + +struct DataHeader +{ + DWORD version; + DWORD nfiles; + DWORD dir_blocks; + DWORD dir_size_comp; + DWORD dir_offset; +}; + +struct DataEntry +{ + char name[NAMELEN]; + DWORD size_orig; + DWORD size_comp; + DWORD offset; +}; + +class DataArchive +{ +public: + // ctor: + DataArchive(const char* name = 0); + ~DataArchive(); + + // operations: + void LoadDatafile(const char* name); + void Insert(const char* name); + void Extract(const char* name); + void Remove(const char* name); + void List(); + + void WriteEntry(int index, BYTE* buf); + int FindEntry(const char* req_name); + int ExpandEntry(int index, BYTE*& buf); + BYTE* CompressEntry(int index); + int InsertEntry(const char* name); + void RemoveEntry(int index); + DWORD Blocks(DWORD raw_size); + DWORD DirBlocks(); + DWORD FileBlocks(int index); + int FindDataBlocks(int blocks_needed); + void CreateBlockMap(); + + DWORD NumFiles() { return header.nfiles; } + DataEntry* GetFile(int i) { if (i>=0 && i<(int)header.nfiles) return &directory[i]; return 0; } + +private: + // persistent data members: + DataHeader header; + DataEntry directory[MAX_FILES]; + BYTE* dirbuf; + + // transient members: + char datafile[NAMELEN]; + + DWORD* block_map; + DWORD nblocks; +}; + +extern std::wstring ToWideString(const std::string& str); + + +#endif diff --git a/Datafile/CMakeLists.txt b/Datafile/CMakeLists.txt new file mode 100644 index 0000000..28df007 --- /dev/null +++ b/Datafile/CMakeLists.txt @@ -0,0 +1,11 @@ +project(Datafile) +add_executable( + Datafile + Archive.cpp + Main.cpp + ) +target_include_directories( + Datafile + PUBLIC . + ) +# TODO: target_link_libraries(Datafile PRIVATE zlib) diff --git a/Datafile/Datafile.vcxproj b/Datafile/Datafile.vcxproj new file mode 100644 index 0000000..99bd8ad --- /dev/null +++ b/Datafile/Datafile.vcxproj @@ -0,0 +1,217 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug VS2012|Win32">
+ <Configuration>Debug VS2012</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release VS2012|Win32">
+ <Configuration>Release VS2012</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="Archive.cpp" />
+ <ClCompile Include="Main.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="Archive.h" />
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{ADBA4106-AFE3-43D2-88D9-308A7D75E372}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>Datafile</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v141</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <TargetName>$(ProjectName)_D</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <TargetName>$(ProjectName)_D</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>../zlib;</AdditionalIncludeDirectories>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>..\zlib\debug\zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreSpecificDefaultLibraries>LIBCMTD</IgnoreSpecificDefaultLibraries>
+ </Link>
+ <CustomBuildStep>
+ <Command>copy /y "$(TargetPath)" "$(STARSHATTERPATH)\$(TargetFileName)"</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Copying Build...</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>$(STARSHATTERPATH)\$(TargetFileName);%(Outputs)</Outputs>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Inputs>$(TargetFileName)</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VS2012|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>../zlib;</AdditionalIncludeDirectories>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>..\zlib\debug\zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreSpecificDefaultLibraries>LIBCMTD</IgnoreSpecificDefaultLibraries>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+ </Link>
+ <CustomBuildStep>
+ <Command>copy /y "$(TargetPath)" "$(STARSHATTERPATH)data\$(TargetFileName)"</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Copying Build...</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>$(STARSHATTERPATH)\$(TargetFileName);%(Outputs)</Outputs>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Inputs>$(TargetFileName)</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>../zlib;</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>..\zlib\release\zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
+ </Link>
+ <CustomBuildStep>
+ <Command>copy /y "$(TargetPath)" "$(STARSHATTERPATH)\$(TargetFileName)"</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Copying Build...</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>$(STARSHATTERPATH)\$(TargetFileName);%(Outputs)</Outputs>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Inputs>$(TargetFileName)</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VS2012|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>../zlib;</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>..\zlib\release\zlib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
+ </Link>
+ <CustomBuildStep>
+ <Command>copy /y "$(TargetPath)" "$(STARSHATTERPATH)\$(TargetFileName)"</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Copying Build...</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>$(STARSHATTERPATH)\$(TargetFileName);%(Outputs)</Outputs>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Inputs>$(TargetFileName)</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file diff --git a/Datafile/Datafile.vcxproj.filters b/Datafile/Datafile.vcxproj.filters new file mode 100644 index 0000000..0333b95 --- /dev/null +++ b/Datafile/Datafile.vcxproj.filters @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="Archive.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="Archive.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
\ No newline at end of file diff --git a/Datafile/Main.cpp b/Datafile/Main.cpp new file mode 100644 index 0000000..8b37e27 --- /dev/null +++ b/Datafile/Main.cpp @@ -0,0 +1,448 @@ +/* Starshatter OpenSource Distribution + Copyright (c) 1997-2004, Destroyer Studios LLC. + All Rights Reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name "Destroyer Studios" nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +SUBSYSTEM: DataFile.exe +FILE: main.cpp +AUTHOR: John DiCamillo + +*/ + +#include <stdlib.h> +#include <stdio.h> +#include <string> +#include <math.h> +#include <time.h> +#include <windows.h> +#include <windowsx.h> +#include "Archive.h" + +//#define MOD_MAKER 1 + +// +------------------------------------------------------------------+ + +void insertFile(DataArchive& a, const char* sPath, WIN32_FIND_DATA* find) +{ + char sFile[256]; + char sFlat[256]; + std::string sTemp; + DWORD find_attrib_forbidden = + FILE_ATTRIBUTE_DIRECTORY | + FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_OFFLINE; + + if (sPath && *sPath) { + sTemp = sPath; + sTemp += '/'; + WideCharToMultiByte(CP_ACP,0,find->cFileName,-1, sFile,260, NULL, NULL); + sTemp += sFile; + strcpy(sFile, sTemp.c_str()); + } else { + WideCharToMultiByte(CP_ACP,0,find->cFileName,-1, sFile,260, NULL, NULL); + } + + + if (find->dwFileAttributes & find_attrib_forbidden) { + printf(" Skipping: %-48s \n", sFile); + return; + } + + int n = strlen(sFile); + + if (n >= NAMELEN) { + printf(" Skipping: %-48s (NAME TOO LONG!)\n", sFile); + return; + } + + for (int i = 0; i < n; i++) + sFlat[i] = tolower(sFile[i]); + + if (strstr(sFlat, ".exe")) { + printf(" Skipping: %-48s (executable file)\n", sFile); + } + else if (strstr(sFlat, ".cmd")) { + printf(" Skipping: %-48s (executable file)\n", sFile); + } + else if (strstr(sFlat, ".bat")) { + printf(" Skipping: %-48s (executable file)\n", sFile); + } + else if (strstr(sFlat, ".bin")) { + printf(" Skipping: %-48s (unknown file)\n", sFile); + } + else if (strstr(sFlat, ".db")) { + printf(" Skipping: %-48s (unknown file)\n", sFile); + } + else if (strstr(sFlat, ".dat")) { + printf(" Skipping: %-48s (data file)\n", sFile); + } + else if (strstr(sFlat, ".zip")) { + printf(" Skipping: %-48s (zip file)\n", sFile); + } + else if (strstr(sFlat, ".arc")) { + printf(" Skipping: %-48s (archive file)\n", sFile); + } + else if (strstr(sFlat, ".psd")) { + printf(" Skipping: %-48s (PSD file)\n", sFile); + } + else { + a.Insert(sFile); + } +} + +// +------------------------------------------------------------------+ + +void ins(DataArchive& a, int argc, char* argv[]) +{ + char sPath[256]; + char* pDirSep = 0; + + for (int i = 0; i < argc; i++) { + if (strchr(argv[i], '*')) { + strcpy(sPath, argv[i]); + + if ((pDirSep = strrchr(sPath, '\\')) != 0) + *pDirSep = 0; + else if ((pDirSep = strrchr(sPath, '/')) != 0) + *pDirSep = 0; + else + sPath[0] = 0; + + WIN32_FIND_DATA find; + LPCWSTR tmp = (LPCWSTR)argv[i]; + HANDLE h = FindFirstFile(tmp, &find); + if (h != INVALID_HANDLE_VALUE) { + insertFile(a, sPath, &find); + + while (FindNextFile(h,&find)) { + insertFile(a, sPath, &find); + } + + FindClose(h); + } + } + else { + a.Insert(argv[i]); + } + } +} + +// +--------------------------------------------------------------------+ + +void build(DataArchive& a, const char* sBasePath); + +void buildFile(DataArchive& a, const char* sPath, WIN32_FIND_DATA& find) +{ + if (find.cFileName[0] == '.') { + } else if (find.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + char subdir[256]; + std::string sTemp; + if (sPath && *sPath) { + sTemp = sPath; + sTemp += '/'; + WideCharToMultiByte(CP_ACP,0,find.cFileName,-1, subdir,260, NULL, NULL); + sTemp += subdir; + strcpy(subdir, sTemp.c_str()); + } + else + WideCharToMultiByte(CP_ACP,0,find.cFileName,-1, subdir,256, NULL, NULL); + + build(a, subdir); + } else { + insertFile(a, sPath, &find); + } +} + +void build(DataArchive& a, const char* sBasePath) +{ + char sPath[256]; + char sFind[256]; + + if (sBasePath && *sBasePath) { + strcpy(sPath, sBasePath); + sprintf(sFind, "%s\\*.*", sPath); + } else { + sPath[0] = 0; + strcpy(sFind, "*.*"); + } + + WIN32_FIND_DATA find; + std::wstring sTemp; + std::string sStd = sFind; + sTemp = ToWideString(sStd); + HANDLE h = FindFirstFile(sTemp.c_str(), &find); + if (h != INVALID_HANDLE_VALUE) { + do buildFile(a, sPath, find); + while (FindNextFile(h, &find)); + + FindClose(h); + } +} + +void mak(DataArchive& a) +{ + build(a, 0); +} + +// +--------------------------------------------------------------------+ +// for now, pattern must be either "*" or "*.???" + +int match(const char* sFile, const char* sPattern) +{ + int nPatternType = 0; + char* sExt = 0; + + const int PATTERN_NOWILD = 0; + const int PATTERN_STAR = 1; + const int PATTERN_STAR_DOT_STAR = 2; + const int PATTERN_STAR_DOT_EXT = 3; + + // what kind of pattern matching? + if (strchr(sPattern, '*')) { + if (strchr(sPattern, '.')) { + if (strcmp(sPattern, "*.*") == 0) { + nPatternType = PATTERN_STAR_DOT_STAR; + } else { + nPatternType = PATTERN_STAR_DOT_EXT; + sExt = const_cast<char*>(strchr(sPattern, '.')); + } + } else { + nPatternType = PATTERN_STAR; + } + } + + int file_matches_pattern = 0; + + switch (nPatternType) { + case PATTERN_NOWILD: + default: + file_matches_pattern = (_stricmp(sFile, sPattern) == 0); + break; + + case PATTERN_STAR: + case PATTERN_STAR_DOT_STAR: + file_matches_pattern = 1; + break; + + case PATTERN_STAR_DOT_EXT: + file_matches_pattern = (strstr(sFile, sExt) != 0); + break; + } + + return file_matches_pattern; +} + +void ext(DataArchive& a, int argc, char* argv[]) +{ + if (argc) { + char sPath[256]; + char sPatt[256]; + char* pDirSep; + int nPath; + + for (int i = 0; i < argc; i++) { + if (strchr(argv[i], '*')) { + strcpy(sPath, argv[i]); + + if ((pDirSep = strrchr(sPath, '\\')) != 0) { + strcpy(sPatt, pDirSep+1); + *pDirSep = 0; + nPath = strlen(sPath); + } else if ((pDirSep = strrchr(sPath, '/')) != 0) { + strcpy(sPatt, pDirSep+1); + *pDirSep = 0; + nPath = strlen(sPath); + } else { + strcpy(sPatt, sPath); + sPath[0] = 0; + nPath = 0; + } + + // for each file in the archive: + for (unsigned j = 0; j < a.NumFiles(); j++) { + DataEntry* pde = a.GetFile(j); + + if (pde) { + // if we are extracting from a sub-directory, + if (nPath) { + // and this file is in the sub-directory, + if (_strnicmp(pde->name, sPath, nPath) == 0) { + // and this file matches the pattern: + if (match(pde->name+nPath+1, sPatt)) { + char sName[256]; + strcpy(sName, pde->name); + a.Extract(sName); + } + } + } else { + // if we are extracting from the main directory, + // and this file is in the main directory, + if (strchr(pde->name, '/') == 0) { + // and this file matches the pattern: + if (match(pde->name, sPatt)) { + char sName[256]; + strcpy(sName, pde->name); + a.Extract(sName); + } + } + } + } + } + } else { + // for each file in the archive: + for (unsigned j = 0; j < a.NumFiles(); j++) { + DataEntry* pde = a.GetFile(j); + + if (pde) { + if (_stricmp(pde->name, argv[i]) == 0) { + a.Extract(argv[i]); + } + } + } + } + } + } else { // full archive extraction: + for (int i = 0; i < (int)a.NumFiles(); i++) + a.Extract(a.GetFile(i)->name); + } +} + +void del(DataArchive& a, int argc, char* argv[]) +{ + char sPath[256]; + char sPatt[256]; + char* pDirSep; + int nPath; + + for (int i = 0; i < argc; i++) { + if (strchr(argv[i], '*')) { + strcpy(sPath, argv[i]); + + if ((pDirSep = strrchr(sPath, '\\')) != 0) { + strcpy(sPatt, pDirSep+1); + *pDirSep = 0; + nPath = strlen(sPath); + } else if ((pDirSep = strrchr(sPath, '/')) != 0) { + strcpy(sPatt, pDirSep+1); + *pDirSep = 0; + nPath = strlen(sPath); + } else { + strcpy(sPatt, sPath); + sPath[0] = 0; + nPath = 0; + } + + // for each file in the archive: + for (unsigned j = 0; j < a.NumFiles(); j++) { + DataEntry* pde = a.GetFile(j); + + if (pde) { + // if we are deleting from a sub-directory, + if (nPath) { + // and this file is in the sub-directory, + if (_strnicmp(pde->name, sPath, nPath) == 0) { + // and this file matches the pattern: + if (match(pde->name+nPath+1, sPatt)) { + char sName[256]; + strcpy(sName, pde->name); + a.Remove(sName); + } + } + } else { + // if we are deleting from the main directory, + // and this file is in the main directory, + if (strchr(pde->name, '/') == 0) { + // and this file matches the pattern: + if (match(pde->name, sPatt)) { + char sName[256]; + strcpy(sName, pde->name); + a.Remove(sName); + } + } + } + } + } + } else { + a.Remove(argv[i]); + } + } +} + + +// +--------------------------------------------------------------------+ + +void Usage() +{ + printf("Usage: datafile <dat-file> -option <file list>\n"); + printf("options: -ins (insert files into datafile)\n"); + printf(" -ext (extract files from datafile)\n"); + printf(" -del (delete files from datafile)\n"); + printf(" -mak (insert all files in current directory and all subdirectories)\n"); + printf(" -list (display list of entries in datafile)\n"); + + exit(-1); +} + +#define OPT_NONE 0 +#define OPT_INS 1 +#define OPT_EXT 2 +#define OPT_DEL 3 +#define OPT_MAK 4 +#define OPT_LIST 5 + +int main(int argc, char* argv[]) +{ + printf("DATAFILE\n"); + + if (argc < 3) + Usage(); + + DataArchive a(argv[1]); + int option = OPT_NONE; + + if (!_stricmp(argv[2], "-ins")) option = OPT_INS; + else if (!_stricmp(argv[2], "-ext")) option = OPT_EXT; + else if (!_stricmp(argv[2], "-del")) option = OPT_DEL; + else if (!_stricmp(argv[2], "-mak")) option = OPT_MAK; + else if (!_stricmp(argv[2], "-list")) option = OPT_LIST; + + argc -= 3; + argv += 3; + + switch (option) { + default: + case OPT_NONE: Usage(); break; + case OPT_INS: ins(a, argc, argv); break; + case OPT_EXT: ext(a, argc, argv); break; + case OPT_DEL: del(a, argc, argv); break; + case OPT_MAK: mak(a); break; + case OPT_LIST: a.List(); break; + } + + return 0; +} + |