diff --git a/JALOG_CONV.dev b/JALOG_CONV.dev index 5cbfb66..aa90986 100644 --- a/JALOG_CONV.dev +++ b/JALOG_CONV.dev @@ -41,9 +41,9 @@ BuildCmd= [VersionInfo] Major=1 -Minor=0 +Minor=1 Release=0 -Build=84 +Build=88 LanguageID=1033 CharsetID=1252 CompanyName=Steven Mattera diff --git a/JALOG_CONV_private.h b/JALOG_CONV_private.h index 0ff6756..cbf1bf1 100644 --- a/JALOG_CONV_private.h +++ b/JALOG_CONV_private.h @@ -5,11 +5,11 @@ #define JALOG_CONV_PRIVATE_H /* VERSION DEFINITIONS */ -#define VER_STRING "1.0.0.84" +#define VER_STRING "1.1.0.89" #define VER_MAJOR 1 -#define VER_MINOR 0 +#define VER_MINOR 1 #define VER_RELEASE 0 -#define VER_BUILD 84 +#define VER_BUILD 89 #define COMPANY_NAME "Steven Mattera" #define FILE_VERSION "1.0" #define FILE_DESCRIPTION "" diff --git a/JALOG_CONV_private.rc b/JALOG_CONV_private.rc index fde3c07..c1c8080 100644 --- a/JALOG_CONV_private.rc +++ b/JALOG_CONV_private.rc @@ -10,8 +10,8 @@ A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "JALOG_CONV.ico" // TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS... // 1 VERSIONINFO -FILEVERSION 1,0,0,84 -PRODUCTVERSION 1,0,0,84 +FILEVERSION 1,1,0,89 +PRODUCTVERSION 1,1,0,89 FILETYPE VFT_APP { BLOCK "StringFileInfo" diff --git a/JALOG_CONV_private.res b/JALOG_CONV_private.res index 6b4a205..ed15ccf 100644 Binary files a/JALOG_CONV_private.res and b/JALOG_CONV_private.res differ diff --git a/main.c b/main.c index e44a653..176b464 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ // main.c -// Jedi Academy Server Log Converter - Version 1.0 +// Jedi Academy Server Log Converter - Version 1.1 // // Created By Steven Mattera on August 30th 2010. // Copyright (c) 2010 Steven Mattera @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) { convFile = openConvFile(argv); if (convFile == NULL) return -1; - fputs("\n\n", convFile); + fputs("", convFile); char * line; char * lineProcessing; @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) { fgets(line, 512, logFile); if(color != 7) { - fputs("", convFile); + fputs("", convFile); color = 7; } @@ -85,49 +85,49 @@ int main(int argc, char *argv[]) { case 1: if(color != 1) { color = 1; - fputs("", convFile); + fputs("", convFile); } break; case 2: if(color != 2) { color = 2; - fputs("", convFile); + fputs("", convFile); } break; case 3: if(color != 3) { color = 3; - fputs("", convFile); + fputs("", convFile); } break; case 4: if(color != 4) { color = 4; - fputs("", convFile); + fputs("", convFile); } break; case 5: if(color != 5) { color = 5; - fputs("", convFile); + fputs("", convFile); } break; case 6: if(color != 6) { color = 6; - fputs("", convFile); + fputs("", convFile); } break; case 7: if(color != 7) { color = 7; - fputs("", convFile); + fputs("", convFile); } break; case 0: if(color != 8) { color = 8; - fputs("", convFile); + fputs("", convFile); } break; default: @@ -138,33 +138,41 @@ int main(int argc, char *argv[]) { n++; } else if (line[n] == ':' && color != 7) { - fputs("", convFile); + fputs("", convFile); fputc(':', convFile); } else if (line[n] == '\\' && color != 7) { - fputs("", convFile); + fputs("", convFile); fputc('\\', convFile); } else if (line[n] == ' ' && line[n+1] == 'k' && line[n+2] == 'i' && line[n+3] == 'l' && line[n+4] == 'l' && line[n+5] == 'e' && line[n+6] == 'd' && line[n+7] == ' ' && color != 7) { - fputs("", convFile); + fputs("", convFile); fputc(' ', convFile); } else if (line[n] == ' ' && line[n+1] == 'b' && line[n+2] == 'y' && line[n+3] == ' ' && color != 7) { - fputs("", convFile); + fputs("", convFile); fputc(' ', convFile); } - else { + else if (line[n] == '<') { + fputs("<", convFile); + } + else if (line[n] == '>') { + fputs(">", convFile); + } + else if (line[n] == '&') { + fputs("&", convFile); + } + else if (line[n] != '\n' || line[n] != '\r') { fputc(line[n], convFile); } } - fputs("
\n", convFile); + fputs("
", convFile); free(line); } - fputs("\n", convFile); - fputs("", convFile); + fputs("", convFile); fclose(convFile); fclose(logFile);