Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[COMP]

Browse source 
- The comparison buffers contain bytes, not (T)CHARs. Pointed out by Stefan Fulea in CORE-11060.
- Remove a now unnecessary comment header "history" line since we have SVN for that instead.

svn path=/trunk/; revision=71599
This commit is contained in:
Hermès Bélusca-Maïto 2016-06-09 18:43:36 +00:00
parent e37fafee2c
commit a014055837
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
reactos/base/applications/cmdutils/comp/comp.c
View file

@ -22,9 +22,6 @@
* FILE: base/applications/cmdutils/comp/comp.c * FILE: base/applications/cmdutils/comp/comp.c
* PURPOSE: Compares the contents of two files * PURPOSE: Compares the contents of two files
* PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com) * PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com)
* REVISIONS:
* GM 25/09/05 Created
*
*/ */
#include <windows.h> #include <windows.h>
@ -37,9 +34,9 @@
#define STRBUF 1024 #define STRBUF 1024
/* getline: read a line, return length */ /* getline: read a line, return length */
INT GetBuff(char *buff, FILE *in) INT GetBuff(PBYTE buff, FILE *in)
{ {
return fread(buff, 1, STRBUF, in); return fread(buff, sizeof(BYTE), STRBUF, in);
} }
INT FileSize(FILE * fd) INT FileSize(FILE * fd)
@ -74,8 +71,8 @@ int _tmain (int argc, TCHAR *argv[])
FILE *fp2 = NULL; FILE *fp2 = NULL;
INT BufLen1, BufLen2; INT BufLen1, BufLen2;
PTCHAR Buff1 = NULL; PBYTE Buff1 = NULL;
PTCHAR Buff2 = NULL; PBYTE Buff2 = NULL;
TCHAR File1[_MAX_PATH + 1], // File paths TCHAR File1[_MAX_PATH + 1], // File paths
File2[_MAX_PATH + 1]; File2[_MAX_PATH + 1];
BOOL bAscii = FALSE, // /A switch BOOL bAscii = FALSE, // /A switch
@ -128,14 +125,15 @@ int _tmain (int argc, TCHAR *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
Buff1 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); Buff1 = (PBYTE)malloc(STRBUF);
if (Buff1 == NULL) if (Buff1 == NULL)
{ {
_tprintf(_T("Can't get free memory for Buff1\n")); _tprintf(_T("Can't get free memory for Buff1\n"));
return EXIT_FAILURE; Status = EXIT_FAILURE;
goto Cleanup;
} }
Buff2 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); Buff2 = (PBYTE)malloc(STRBUF);
if (Buff2 == NULL) if (Buff2 == NULL)
{ {
_tprintf(_T("Can't get free memory for Buff2\n")); _tprintf(_T("Can't get free memory for Buff2\n"));
@ -239,15 +237,15 @@ int _tmain (int argc, TCHAR *argv[])
_tprintf(_T("Files compare OK\n")); _tprintf(_T("Files compare OK\n"));
Cleanup: Cleanup:
if (fp1)
fclose(fp1);
if (fp2) if (fp2)
fclose(fp2); fclose(fp2);
if (fp1)
fclose(fp1);
if (Buff1)
free(Buff1);
if (Buff2) if (Buff2)
free(Buff2); free(Buff2);
if (Buff1)
free(Buff1);
return Status; return Status;
} }