From 35ebca8c8ba77d7286c8206a9ee37bd0a6356e71 Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Mon, 28 May 2012 11:54:23 +0000 Subject: Indentation fixes --- Datafile/Main.cpp | 711 +++++++++++++++++++++++++----------------------------- 1 file changed, 332 insertions(+), 379 deletions(-) diff --git a/Datafile/Main.cpp b/Datafile/Main.cpp index 0a4bb72..5920300 100644 --- a/Datafile/Main.cpp +++ b/Datafile/Main.cpp @@ -1,10 +1,10 @@ /* Project nGen - John DiCamillo Software Consulting - Copyright © 1997. All Rights Reserved. +John DiCamillo Software Consulting +Copyright © 1997. All Rights Reserved. - SUBSYSTEM: DataFile.exe - FILE: main.cpp - AUTHOR: John DiCamillo +SUBSYSTEM: DataFile.exe +FILE: main.cpp +AUTHOR: John DiCamillo */ @@ -23,106 +23,104 @@ void insertFile(DataArchive& a, const char* sPath, WIN32_FIND_DATA* find) { - char sFile[256]; - char sFlat[256]; - char sTemp[256]; - DWORD find_attrib_forbidden = - FILE_ATTRIBUTE_DIRECTORY | - FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_OFFLINE; - - if (sPath && *sPath) - sprintf(sFile, "%s/%s", sPath, find->cFileName); - else { - sprintf(sTemp, "%s", find->cFileName); - strcpy(sFile, sTemp); - } - - 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); - } + char sFile[256]; + char sFlat[256]; + char sTemp[256]; + DWORD find_attrib_forbidden = + FILE_ATTRIBUTE_DIRECTORY | + FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_OFFLINE; + + if (sPath && *sPath) + sprintf(sFile, "%s/%s", sPath, find->cFileName); + else { + sprintf(sTemp, "%s", find->cFileName); + strcpy(sFile, sTemp); + } + + 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]); - } - } + 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]); + } + } } // +--------------------------------------------------------------------+ @@ -131,22 +129,18 @@ 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]; - if (sPath && *sPath) - sprintf(subdir, "%s/%s", sPath, find.cFileName); - else - sprintf(subdir, "%s", find.cFileName); - - build(a, subdir); - } - - else { - insertFile(a, sPath, &find); - } + if (find.cFileName[0] == '.') { + } else if (find.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + char subdir[256]; + if (sPath && *sPath) + sprintf(subdir, "%s/%s", sPath, find.cFileName); + else + sprintf(subdir, "%s", find.cFileName); + + build(a, subdir); + } else { + insertFile(a, sPath, &find); + } } std::wstring ToWideString(const std::string& str) @@ -159,36 +153,33 @@ std::wstring ToWideString(const std::string& str) 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; + 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); + if (h != INVALID_HANDLE_VALUE) { + do buildFile(a, sPath, find); + while (FindNextFile(h, &find)); - while (FindNextFile(h, &find)); - - FindClose(h); - } + FindClose(h); + } } void mak(DataArchive& a) { - build(a, 0); + build(a, 0); } // +--------------------------------------------------------------------+ @@ -196,206 +187,183 @@ void mak(DataArchive& a) 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(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; + 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(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); - } - } - } - - // if we are extracting from the main directory, - else { - // 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]); - } - } - } - } - } - } - - // full archive extraction: - else { - for (int i = 0; i < (int)a.NumFiles(); i++) - a.Extract(a.GetFile(i)->name); - } + { + 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); - } - } - } - - // if we are deleting from the main directory, - else { - // 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]); - } - } + 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]); + } + } } @@ -403,14 +371,14 @@ void del(DataArchive& a, int argc, char* argv[]) void Usage() { - printf("Usage: datafile -option \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"); + printf("Usage: datafile -option \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); + exit(-1); } #define OPT_NONE 0 @@ -422,48 +390,33 @@ void Usage() int main(int argc, char* argv[]) { -#ifdef MOD_MAKER - printf("MODFILE\n"); - - if (argc < 2) { - printf("Usage: modfile \n"); - return 0; - } - - ::unlink(argv[1]); - DataArchive a(argv[1]); - mak(a); - - return 0; -#else - 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; - } -#endif - - return 0; + 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; } -- cgit v1.1