diff --git a/src/actionfilenode.c b/src/actionfilenode.c index b3e2603..d24af48 100644 --- a/src/actionfilenode.c +++ b/src/actionfilenode.c @@ -387,8 +387,8 @@ int ActionFileNode_RunList(ActionFileNode actionFileNode, char *pathLeft, return numActions; } -// ---------------------------------------------------------------------------- -// Common utilities + // ---------------------------------------------------------------------------- + // Common utilities #define QueueNode(queue, node) \ (queue)->next = (node); \ diff --git a/src/actionfilenodecopy.c b/src/actionfilenodecopy.c index d6edf0b..b9197d8 100644 --- a/src/actionfilenodecopy.c +++ b/src/actionfilenodecopy.c @@ -2,12 +2,12 @@ #include #include -#include "util.h" -#include "crc.h" -#include "fileutil.h" -#include "filenode.h" #include "actionfilenode.h" #include "actionfilenodecopy.h" +#include "crc.h" +#include "filenode.h" +#include "fileutil.h" +#include "util.h" #define MaxDeltaTime 0 diff --git a/src/actionfilenodecopy.h b/src/actionfilenodecopy.h index 15ad6e6..3fe328d 100644 --- a/src/actionfilenodecopy.h +++ b/src/actionfilenodecopy.h @@ -1,8 +1,8 @@ #ifndef _ACTIONFILENODECOPY_H_ #define _ACTIONFILENODECOPY_H_ -#include "filenode.h" #include "actionfilenode.h" +#include "filenode.h" ActionFileNode ActionFileNode_BuildCopy(FileNode fileNodeLeft, FileNode fileNodeRight); diff --git a/src/actionfilenodesync.h b/src/actionfilenodesync.h index fd0a5ed..b422a97 100644 --- a/src/actionfilenodesync.h +++ b/src/actionfilenodesync.h @@ -1,8 +1,8 @@ #ifndef _ACTIONFILENODESYNC_H_ #define _ACTIONFILENODESYNC_H_ -#include "filenode.h" #include "actionfilenode.h" +#include "filenode.h" ActionFileNode ActionFileNode_BuildSync(FileNode fileNodeLeft, FileNode fileNodeRight); diff --git a/src/filenode.c b/src/filenode.c index c0734bc..02bee03 100644 --- a/src/filenode.c +++ b/src/filenode.c @@ -2,10 +2,10 @@ #include #include -#include "util.h" #include "crc.h" -#include "fileutil.h" #include "filenode.h" +#include "fileutil.h" +#include "util.h" FileNode _freeFileNode = NULL; int _n_filenode = 0; @@ -105,7 +105,7 @@ FileNode FileNode_GetRoot(FileNode fileNode) { void FileNode_SetStatusRec(FileNode fileNode, FileStatus status) { FileNode fileNodeChild; - + fileNode->status = status; fileNodeChild = fileNode->child; while (fileNodeChild) { @@ -492,7 +492,7 @@ FileNode FileNode_Refresh(FileNode fileNode, char *filePath) { if (File_IsDirectory(filePath)) { FileNode fileNodeChild; - // Check directory data + // Check directory data fileTime = FileTime_Get(filePath); if (fileNode->status == FileStatus_Deleted) { fileNode->status = FileStatus_Undeleted; @@ -504,7 +504,7 @@ FileNode FileNode_Refresh(FileNode fileNode, char *filePath) { fileNode->flags &= ~FileFlag_Normal; } if (fileTime != fileNode->fileTime) { - fileNode->status = FileStatus_Modified; + fileNode->status = FileStatus_Modified; fileNode->fileTime = fileTime; } @@ -544,7 +544,7 @@ FileNode FileNode_Refresh(FileNode fileNode, char *filePath) { fileNode->size = size; } if (fileTime != fileNode->fileTime) { - fileNode->status = FileStatus_Modified; + fileNode->status = FileStatus_Modified; fileNode->fileTime = fileTime; } if (fileNode->status == FileStatus_Modified) { diff --git a/src/fileutil.c b/src/fileutil.c index ab0c643..6d3f097 100644 --- a/src/fileutil.c +++ b/src/fileutil.c @@ -2,29 +2,29 @@ #ifdef WIN32 #define _WIN32_WINNT 0x0501 #include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include #else +#include +#include #include #include -#include #include +#include #include -#include -#include #include -#include +#include #endif -#include "util.h" #include "fileutil.h" +#include "util.h" #ifdef WIN32 long long FileTime_to_POSIX(FILETIME fileTime) { diff --git a/src/main.c b/src/main.c index 3450358..9e474e2 100644 --- a/src/main.c +++ b/src/main.c @@ -2,14 +2,14 @@ #include #include -#include "util.h" +#include "actionfilenode.h" +#include "actionfilenodecopy.h" +#include "actionfilenodesync.h" #include "crc.h" +#include "filenode.h" #include "fileutil.h" #include "parameteroperation.h" -#include "filenode.h" -#include "actionfilenode.h" -#include "actionfilenodesync.h" -#include "actionfilenodecopy.h" +#include "util.h" FileNode CheckDir(char *path, int recheck) { char dirNodesFile[MaxPath]; @@ -42,7 +42,8 @@ FileNode CheckDir(char *path, int recheck) { return fileNode; } -void PrintStatistics(ActionFileNode actionFileNode, ActionFileNodeResult result) { +void PrintStatistics(ActionFileNode actionFileNode, + ActionFileNodeResult result) { ActionQueueStatistics statistics; if (ActionFileNode_Statistics(actionFileNode, &statistics, result) == 0) { Print("Noting to do.\n"); @@ -165,7 +166,8 @@ int Copy(char *pathLeft, char *pathRight, int reCheck, int dryRun) { return (1); } -typedef struct SApplicationConfiguration TApplicationConfiguration, *ApplicationConfiguration; +typedef struct SApplicationConfiguration TApplicationConfiguration, + *ApplicationConfiguration; struct SApplicationConfiguration { char *Dirs[10]; bool NoScan; @@ -175,7 +177,8 @@ struct SApplicationConfiguration { bool NoAction; char *Log; }; -TApplicationConfiguration defaultConfig = { {NULL}, false, false, false, false, false, NULL }; +TApplicationConfiguration defaultConfig = {{NULL}, false, false, false, + false, false, NULL}; bool SetParam_Dir(int argc, char *argv[], void *data) { ApplicationConfiguration config = (ApplicationConfiguration)data; @@ -184,7 +187,9 @@ bool SetParam_Dir(int argc, char *argv[], void *data) { return false; } char **destDir = config->Dirs; - while (destDir[0] != NULL) { destDir++; } + while (destDir[0] != NULL) { + destDir++; + } destDir[0] = argv[0]; destDir++; destDir = NULL; @@ -287,25 +292,26 @@ bool Func_Check(int argc, char *argv[], void *data) { } TParameterOperation _parameterOperations[] = { - { "dir", 1, "Specify a directory", SetParam_Dir }, - { "nocheck", 0, "Do not check for changes on directories", SetParam_NoCheck }, - { "dummy", 0, "Do not perform operations", SetParam_Dummy }, - { "copy", 0, "Copy first directory to second directory", SetParam_Copy }, - { "sync", 0, "Synchronize between two directories", SetParam_Sync }, - { "log", 1, "Log actions to file", SetParam_Log }, + {"dir", 1, "Specify a directory", SetParam_Dir}, + {"nocheck", 0, "Do not check for changes on directories", SetParam_NoCheck}, + {"dummy", 0, "Do not perform operations", SetParam_Dummy}, + {"copy", 0, "Copy first directory to second directory", SetParam_Copy}, + {"sync", 0, "Synchronize between two directories", SetParam_Sync}, + {"log", 1, "Log actions to file", SetParam_Log}, - { "scan", 2, "Scan directory and save to filenode file", Func_Rescan }, - { "rescan", 2, "Rescan directory and save to filenode file", Func_Rescan }, - { "read", 1, "Read filenode file", Func_Read }, - { "check", 1, "Check changes on a directory", Func_Check }, + {"scan", 2, "Scan directory and save to filenode file", Func_Rescan}, + {"rescan", 2, "Rescan directory and save to filenode file", Func_Rescan}, + {"read", 1, "Read filenode file", Func_Read}, + {"check", 1, "Check changes on a directory", Func_Check}, - { NULL, 0, NULL, NULL }, + {NULL, 0, NULL, NULL}, }; int main(int argc, char *argv[]) { TApplicationConfiguration config = defaultConfig; - int parameterParsingResult = ParameterOperation_Parse(argc, argv, _parameterOperations, &config); + int parameterParsingResult = + ParameterOperation_Parse(argc, argv, _parameterOperations, &config); if (parameterParsingResult <= 0) { ParameterOperation_PrintHelp(_parameterOperations); return 0; @@ -314,7 +320,8 @@ int main(int argc, char *argv[]) { return 0; } - Print("\n================================ FileSync ===================================\n"); + Print("\n================================ FileSync " + "===================================\n"); if (config.Copy == false && config.Sync == false) { Print("Error: Action not specified.\n"); @@ -325,12 +332,13 @@ int main(int argc, char *argv[]) { return 0; } if (config.Copy) { - Copy(config.Dirs[0], config.Dirs[1], (config.NoScan == false), config.Dummy); + Copy(config.Dirs[0], config.Dirs[1], (config.NoScan == false), + config.Dummy); } if (config.Sync) { - Sync(config.Dirs[0], config.Dirs[1], (config.NoScan == false), config.Dummy); + Sync(config.Dirs[0], config.Dirs[1], (config.NoScan == false), + config.Dummy); } return 0; } - diff --git a/src/parameteroperation.c b/src/parameteroperation.c index bda1420..75c47b5 100644 --- a/src/parameteroperation.c +++ b/src/parameteroperation.c @@ -1,14 +1,17 @@ -#include "util.h" #include "parameteroperation.h" +#include "util.h" -int ParameterOperation_Parse(int argumentCount, char *arguments[], TParameterOperation parameterOperations[], void *data) { +int ParameterOperation_Parse(int argumentCount, char *arguments[], + TParameterOperation parameterOperations[], + void *data) { int processedParams = 0; char **currentArguments = arguments + 1; for (int i = 1; i < argumentCount; i++) { char *currentArgument = currentArguments[0]; currentArguments++; if (currentArgument[0] != '-') { - Print("Error: Garbage found \"%s\" in position %d.\n", arguments[i], i + 1); + Print("Error: Garbage found \"%s\" in position %d.\n", arguments[i], + i + 1); return -1; } while (currentArgument[0] == '-') { @@ -18,14 +21,19 @@ int ParameterOperation_Parse(int argumentCount, char *arguments[], TParameterOpe int j = 0; while (parameterOperations[j].Name != NULL) { ParameterOperation parameterOperation = ¶meterOperations[j]; - if (String_CompareCaseInsensitive(currentArgument, parameterOperation->Name) == 0) { + if (String_CompareCaseInsensitive(currentArgument, + parameterOperation->Name) == 0) { if ((i + parameterOperation->NumItems) >= argumentCount) { - Print("Error: Parsing parameter \"-%s\" in position %d, missig parameter data.\n", parameterOperations[j].Name, i + 1); + Print("Error: Parsing parameter \"-%s\" in position %d, " + "missig parameter data.\n", + parameterOperations[j].Name, i + 1); return -1; } - bool result = parameterOperation->SetFunc(parameterOperation->NumItems, currentArguments, data); + bool result = parameterOperation->SetFunc( + parameterOperation->NumItems, currentArguments, data); if (result == false) { - Print("Error: Parsing parameter \"-%s\" in position %d.\n", parameterOperations[j].Name, i + 1); + Print("Error: Parsing parameter \"-%s\" in position %d.\n", + parameterOperations[j].Name, i + 1); return -1; } currentArguments += parameterOperation->NumItems; @@ -37,7 +45,8 @@ int ParameterOperation_Parse(int argumentCount, char *arguments[], TParameterOpe j++; } if (processed == false) { - Print("Error: Unknow parameter \"%s\" in position %d.\n", arguments[i], i + 1); + Print("Error: Unknow parameter \"%s\" in position %d.\n", + arguments[i], i + 1); return -1; } } diff --git a/src/parameteroperation.h b/src/parameteroperation.h index c9f27b5..76215c1 100644 --- a/src/parameteroperation.h +++ b/src/parameteroperation.h @@ -8,10 +8,12 @@ struct SParameterOperation { char *Name; int NumItems; char *Description; - bool(*SetFunc)(int argumentCount, char *arguments[], void *data); + bool (*SetFunc)(int argumentCount, char *arguments[], void *data); }; -int ParameterOperation_Parse(int argumentCount, char *arguments[], TParameterOperation parameterOperations[], void *data); +int ParameterOperation_Parse(int argumentCount, char *arguments[], + TParameterOperation parameterOperations[], + void *data); void ParameterOperation_PrintHelp(TParameterOperation parameterOperations[]); diff --git a/src/util.c b/src/util.c index a4d219a..0773c21 100644 --- a/src/util.c +++ b/src/util.c @@ -1,9 +1,9 @@ #include +#include #include #include #include #include -#include #include "util.h" @@ -27,7 +27,7 @@ char *String_Copy(char *str) { // // Compares a string case insensitive int String_CompareCaseInsensitive(char *str0, char *str1) { - for (int i = 0; ; i++) { + for (int i = 0;; i++) { char c0 = tolower(str0[i]); char c1 = tolower(str1[i]); if (c0 != c1) { @@ -158,18 +158,18 @@ int PrintDataSize(long long size) { return Print("% 8.3f TiB", tibSize); } - FILE *outFile = NULL; ///////////////////////////// // Print_SetOutFile // void Print_SetOutFile(char *fileOut) { - if (fileOut == NULL) { return; } + if (fileOut == NULL) { + return; + } outFile = fopen(fileOut, "a"); } - #define Print_BuferSize 4096 ///////////////////////////// // Print @@ -182,7 +182,7 @@ int Print(char *fmt, ...) { // Print va_start(ap, fmt); - //n = vprintf(fmt, ap); + // n = vprintf(fmt, ap); n = vsnprintf(buffer, Print_BuferSize, fmt, ap); va_end(ap); @@ -191,7 +191,7 @@ int Print(char *fmt, ...) { fflush(stdout); // Output to outFile - if(outFile != NULL){ + if (outFile != NULL) { fputs(buffer, outFile); fflush(outFile); } diff --git a/src/util.h b/src/util.h index e8fbaee..19405c0 100644 --- a/src/util.h +++ b/src/util.h @@ -1,10 +1,12 @@ #ifndef _UTIL_ #define _UTIL_ -#include #include +#include +#ifndef bool typedef int bool; +#endif #define true 1 #define false 0