diff --git a/mozilla/htmlparser/tests/logparse/logparse.cpp b/mozilla/htmlparser/tests/logparse/logparse.cpp
index ce95431a678..576fd3bc09c 100644
--- a/mozilla/htmlparser/tests/logparse/logparse.cpp
+++ b/mozilla/htmlparser/tests/logparse/logparse.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: NPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -14,7 +14,7 @@
  *
  * The Original Code is Mozilla Communicator client code.
  *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
@@ -63,94 +63,94 @@ static const char* kWorkingDir = "./";
 
 nsresult GenerateBaselineFile(const char* aSourceFilename,const char* aBaselineFilename)
 {
-    if (!aSourceFilename || !aBaselineFilename)
-       return NS_ERROR_INVALID_ARG;
+  if (!aSourceFilename || !aBaselineFilename)
+     return NS_ERROR_INVALID_ARG;
 
-    nsresult rv;
-
-    // Create a parser
-    nsCOMPtr<nsIParser> parser(do_CreateInstance(kParserCID, &rv));
-    if (NS_FAILED(rv)) {
-        cout << "Unable to create a parser (" << rv << ")" <<endl;
-        return rv;
-    }
-
-    // Create a sink
-    nsCOMPtr<nsILoggingSink> sink(do_CreateInstance(kLoggingSinkCID, &rv));
-    if (NS_FAILED(rv)) {
-        cout << "Unable to create a sink (" << rv << ")" <<endl;
-        return rv;
-    }
-
-    nsCOMPtr<nsILocalFile> localfile (do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv));
-    if (NS_FAILED(rv))
-       return rv;
-
-    localfile->InitWithNativePath(nsDependentCString(aSourceFilename));
-    nsCOMPtr<nsIURI> inputURI;
-    {
-        nsCOMPtr<nsIIOService> ioService(do_GetService(kIOServiceCID, &rv));
-        if (NS_FAILED(rv))
-           return rv;
-        rv = ioService->NewFileURI(localfile, getter_AddRefs(inputURI));
-        if (NS_FAILED(rv))
-           return rv;
-    }
-    localfile->InitWithNativePath(nsDependentCString(aBaselineFilename));
-    PRFileDesc *outputfile;
-    localfile->OpenNSPRFileDesc(0660, PR_WRONLY | PR_CREATE_FILE, &outputfile);
-    sink->SetOutputStream(outputfile);
-
-    // Parse the document, having the sink write the data to fp
-    nsIDTD* dtd = nsnull;
-    NS_NewNavHTMLDTD(&dtd);
-    parser->RegisterDTD(dtd);
-    parser->SetContentSink(sink);
-
-    rv = parser->Parse(inputURI, 0, PR_FALSE, 0, eDTDMode_unknown);
+  nsresult rv;
 
+  // Create a parser
+  nsCOMPtr<nsIParser> parser(do_CreateInstance(kParserCID, &rv));
+  if (NS_FAILED(rv)) {
+    cout << "Unable to create a parser (" << rv << ")" <<endl;
     return rv;
+  }
+
+  // Create a sink
+  nsCOMPtr<nsILoggingSink> sink(do_CreateInstance(kLoggingSinkCID, &rv));
+  if (NS_FAILED(rv)) {
+    cout << "Unable to create a sink (" << rv << ")" <<endl;
+    return rv;
+  }
+
+  nsCOMPtr<nsILocalFile> localfile (do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv));
+  if (NS_FAILED(rv))
+    return rv;
+
+  localfile->InitWithNativePath(nsDependentCString(aSourceFilename));
+  nsCOMPtr<nsIURI> inputURI;
+  {
+    nsCOMPtr<nsIIOService> ioService(do_GetService(kIOServiceCID, &rv));
+    if (NS_FAILED(rv))
+      return rv;
+    rv = ioService->NewFileURI(localfile, getter_AddRefs(inputURI));
+    if (NS_FAILED(rv))
+      return rv;
+  }
+  localfile->InitWithNativePath(nsDependentCString(aBaselineFilename));
+  PRFileDesc *outputfile;
+  localfile->OpenNSPRFileDesc(0660, PR_WRONLY | PR_CREATE_FILE, &outputfile);
+  sink->SetOutputStream(outputfile);
+
+  // Parse the document, having the sink write the data to fp
+  nsIDTD* dtd = nsnull;
+  NS_NewNavHTMLDTD(&dtd);
+  parser->RegisterDTD(dtd);
+  parser->SetContentSink(sink);
+
+  rv = parser->Parse(inputURI, 0, PR_FALSE, 0, eDTDMode_unknown);
+
+  return rv;
 }
 
 //----------------------------------------------------------------------
 
 PRBool CompareFiles(const char* aFilename1, const char* aFilename2) {
-    PRBool result=PR_TRUE;
+  PRBool result=PR_TRUE;
 
-    fstream theFirstStream(aFilename1,ios::in | ios::nocreate);
-    fstream theSecondStream(aFilename2,ios::in | ios::nocreate);
-    
-    PRBool done=PR_FALSE;        
-    char   ch1,ch2;
+  fstream theFirstStream(aFilename1,ios::in | ios::nocreate);
+  fstream theSecondStream(aFilename2,ios::in | ios::nocreate);
 
-    while(!done) {
-        theFirstStream >> ch1;
-        theSecondStream >> ch2;
-        if(ch1!=ch2) {
-            result=PR_FALSE;
-            break;
-        }
-        done=PRBool((theFirstStream.ipfx(1)==0) || (theSecondStream.ipfx(1)==0));
+  PRBool done=PR_FALSE;
+  char   ch1,ch2;
+
+  while(!done) {
+    theFirstStream >> ch1;
+    theSecondStream >> ch2;
+    if(ch1!=ch2) {
+      result=PR_FALSE;
+      break;
     }
-    return result;
+    done=PRBool((theFirstStream.ipfx(1)==0) || (theSecondStream.ipfx(1)==0));
+  }
+  return result;
 }
 
 //----------------------------------------------------------------------
 
 void ComputeTempFilename(const char* anIndexFilename, char* aTempFilename) {
-    if(anIndexFilename) {
-        strcpy(aTempFilename,anIndexFilename);            
-        char* pos=strrchr(aTempFilename,'\\');
-        if(!pos)
-            pos=strrchr(aTempFilename,'/');
-        if(pos) {
-            (*pos)=0;
-            strcat(aTempFilename,"/temp.blx");
-            return;
-        }
+  if(anIndexFilename) {
+    strcpy(aTempFilename,anIndexFilename);
+    char* pos=strrchr(aTempFilename,'\\');
+    if(!pos)
+      pos=strrchr(aTempFilename,'/');
+    if(pos) {
+      (*pos)=0;
+      strcat(aTempFilename,"/temp.blx");
+      return;
     }
-    //fall back to our last resort...
-    strcpy(aTempFilename,"c:/windows/temp/temp.blx");
+  }
+  //fall back to our last resort...
+  strcpy(aTempFilename,"c:/windows/temp/temp.blx");
 }
 
 //----------------------------------------------------------------------
@@ -162,33 +162,33 @@ static const char* kResultMsg[2] = {" failed!"," ok."};
 
 void ValidateBaselineFiles(const char* anIndexFilename) {
 
-    fstream theIndexFile(anIndexFilename,ios::in | ios::nocreate);
-    char    theFilename[500];
-    char    theBaselineFilename[500];
-    char    theTempFilename[500];
-    PRBool  done=PR_FALSE;
+  fstream theIndexFile(anIndexFilename,ios::in | ios::nocreate);
+  char    theFilename[500];
+  char    theBaselineFilename[500];
+  char    theTempFilename[500];
+  PRBool  done=PR_FALSE;
 
-    ComputeTempFilename(anIndexFilename,theTempFilename);
+  ComputeTempFilename(anIndexFilename,theTempFilename);
 
-    while(!done) {
-        theIndexFile >> theFilename;
-        theIndexFile >> theBaselineFilename;
-        if(theFilename[0] && theBaselineFilename[0]) {
-            if(NS_SUCCEEDED(GenerateBaselineFile(theFilename,theTempFilename))) {
-                PRBool matches=CompareFiles(theTempFilename,theBaselineFilename);
-                cout << theFilename << kResultMsg[matches] << endl;
-            }
-        }
-        theFilename[0]=0;
-        theBaselineFilename[0]=0;
-        done=PRBool(theIndexFile.ipfx(1)==0);
+  while(!done) {
+    theIndexFile >> theFilename;
+    theIndexFile >> theBaselineFilename;
+    if(theFilename[0] && theBaselineFilename[0]) {
+      if(NS_SUCCEEDED(GenerateBaselineFile(theFilename,theTempFilename))) {
+        PRBool matches=CompareFiles(theTempFilename,theBaselineFilename);
+        cout << theFilename << kResultMsg[matches] << endl;
+      }
     }
+    theFilename[0]=0;
+    theBaselineFilename[0]=0;
+    done=PRBool(theIndexFile.ipfx(1)==0);
+  }
 
 
-    // Now it's time to compare our output to the baseline...
-//    if(!CompareFiles(aBaselineFilename,aBaselineFilename)){
-//        cout << "File: \"" << aSourceFilename << "\" does not match baseline." << endl;
-//    }
+  // Now it's time to compare our output to the baseline...
+//  if(!CompareFiles(aBaselineFilename,aBaselineFilename)){
+//    cout << "File: \"" << aSourceFilename << "\" does not match baseline." << endl;
+//  }
 
 }
 
@@ -197,46 +197,46 @@ void ValidateBaselineFiles(const char* anIndexFilename) {
 
 int main(int argc, char** argv)
 {
-    if (argc < 2) {
-        cout << "Usage: " << kAppName << " [options] [filename]" << endl; 
-        cout << "       -c [filelist]   " << kOption1 << endl;
-        cout << "       -g [in] [out]   " << kOption2 << endl; 
-        return -1;
-    }
+  if (argc < 2) {
+    cout << "Usage: " << kAppName << " [options] [filename]" << endl;
+    cout << "     -c [filelist]   " << kOption1 << endl;
+    cout << "     -g [in] [out]   " << kOption2 << endl;
+    return -1;
+  }
 
-    int result=0;
+  int result=0;
 
-    nsresult rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
-    if (NS_FAILED(rv)) {
-        printf("NS_InitXPCOM2 failed\n");
-        return 1;
-    }
+  nsresult rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
+  if (NS_FAILED(rv)) {
+    printf("NS_InitXPCOM2 failed\n");
+    return 1;
+  }
 
-    if(0==strcmp("-c",argv[1])) {
+  if(0==strcmp("-c",argv[1])) {
 
-        if(argc>2) {
-            cout << kOption1 << "..." << endl;
+    if(argc>2) {
+      cout << kOption1 << "..." << endl;
 
-            //Open the master filelist, and read the filenames.
-            //Each line contains a source filename and a baseline filename, separated by a space.
-            ValidateBaselineFiles(argv[2]);
-        }
-        else {
-            cout << kAppName << ": Filelist missing for -c option -- nothing to do." << endl;
-        }
-
-    }
-    else if(0==strcmp("-g",argv[1])) {
-        if(argc>3) {
-            cout << kOption2 << argv[3] << " from " << argv[2] << "..." << endl;
-            GenerateBaselineFile(argv[2],argv[3]);
-        }
-        else {
-            cout << kAppName << ": Filename(s) missing for -g option -- nothing to do." << endl;
-        }
+      //Open the master filelist, and read the filenames.
+      //Each line contains a source filename and a baseline filename, separated by a space.
+      ValidateBaselineFiles(argv[2]);
     }
     else {
-        cout << kAppName << ": Unknown options -- nothing to do." << endl;
+      cout << kAppName << ": Filelist missing for -c option -- nothing to do." << endl;
     }
-    return result;
+
+  }
+  else if(0==strcmp("-g",argv[1])) {
+    if(argc>3) {
+      cout << kOption2 << argv[3] << " from " << argv[2] << "..." << endl;
+      GenerateBaselineFile(argv[2],argv[3]);
+    }
+    else {
+      cout << kAppName << ": Filename(s) missing for -g option -- nothing to do." << endl;
+    }
+  }
+  else {
+    cout << kAppName << ": Unknown options -- nothing to do." << endl;
+  }
+  return result;
 }
diff --git a/mozilla/parser/htmlparser/tests/logparse/logparse.cpp b/mozilla/parser/htmlparser/tests/logparse/logparse.cpp
index ce95431a678..576fd3bc09c 100644
--- a/mozilla/parser/htmlparser/tests/logparse/logparse.cpp
+++ b/mozilla/parser/htmlparser/tests/logparse/logparse.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: NPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -14,7 +14,7 @@
  *
  * The Original Code is Mozilla Communicator client code.
  *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
@@ -63,94 +63,94 @@ static const char* kWorkingDir = "./";
 
 nsresult GenerateBaselineFile(const char* aSourceFilename,const char* aBaselineFilename)
 {
-    if (!aSourceFilename || !aBaselineFilename)
-       return NS_ERROR_INVALID_ARG;
+  if (!aSourceFilename || !aBaselineFilename)
+     return NS_ERROR_INVALID_ARG;
 
-    nsresult rv;
-
-    // Create a parser
-    nsCOMPtr<nsIParser> parser(do_CreateInstance(kParserCID, &rv));
-    if (NS_FAILED(rv)) {
-        cout << "Unable to create a parser (" << rv << ")" <<endl;
-        return rv;
-    }
-
-    // Create a sink
-    nsCOMPtr<nsILoggingSink> sink(do_CreateInstance(kLoggingSinkCID, &rv));
-    if (NS_FAILED(rv)) {
-        cout << "Unable to create a sink (" << rv << ")" <<endl;
-        return rv;
-    }
-
-    nsCOMPtr<nsILocalFile> localfile (do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv));
-    if (NS_FAILED(rv))
-       return rv;
-
-    localfile->InitWithNativePath(nsDependentCString(aSourceFilename));
-    nsCOMPtr<nsIURI> inputURI;
-    {
-        nsCOMPtr<nsIIOService> ioService(do_GetService(kIOServiceCID, &rv));
-        if (NS_FAILED(rv))
-           return rv;
-        rv = ioService->NewFileURI(localfile, getter_AddRefs(inputURI));
-        if (NS_FAILED(rv))
-           return rv;
-    }
-    localfile->InitWithNativePath(nsDependentCString(aBaselineFilename));
-    PRFileDesc *outputfile;
-    localfile->OpenNSPRFileDesc(0660, PR_WRONLY | PR_CREATE_FILE, &outputfile);
-    sink->SetOutputStream(outputfile);
-
-    // Parse the document, having the sink write the data to fp
-    nsIDTD* dtd = nsnull;
-    NS_NewNavHTMLDTD(&dtd);
-    parser->RegisterDTD(dtd);
-    parser->SetContentSink(sink);
-
-    rv = parser->Parse(inputURI, 0, PR_FALSE, 0, eDTDMode_unknown);
+  nsresult rv;
 
+  // Create a parser
+  nsCOMPtr<nsIParser> parser(do_CreateInstance(kParserCID, &rv));
+  if (NS_FAILED(rv)) {
+    cout << "Unable to create a parser (" << rv << ")" <<endl;
     return rv;
+  }
+
+  // Create a sink
+  nsCOMPtr<nsILoggingSink> sink(do_CreateInstance(kLoggingSinkCID, &rv));
+  if (NS_FAILED(rv)) {
+    cout << "Unable to create a sink (" << rv << ")" <<endl;
+    return rv;
+  }
+
+  nsCOMPtr<nsILocalFile> localfile (do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv));
+  if (NS_FAILED(rv))
+    return rv;
+
+  localfile->InitWithNativePath(nsDependentCString(aSourceFilename));
+  nsCOMPtr<nsIURI> inputURI;
+  {
+    nsCOMPtr<nsIIOService> ioService(do_GetService(kIOServiceCID, &rv));
+    if (NS_FAILED(rv))
+      return rv;
+    rv = ioService->NewFileURI(localfile, getter_AddRefs(inputURI));
+    if (NS_FAILED(rv))
+      return rv;
+  }
+  localfile->InitWithNativePath(nsDependentCString(aBaselineFilename));
+  PRFileDesc *outputfile;
+  localfile->OpenNSPRFileDesc(0660, PR_WRONLY | PR_CREATE_FILE, &outputfile);
+  sink->SetOutputStream(outputfile);
+
+  // Parse the document, having the sink write the data to fp
+  nsIDTD* dtd = nsnull;
+  NS_NewNavHTMLDTD(&dtd);
+  parser->RegisterDTD(dtd);
+  parser->SetContentSink(sink);
+
+  rv = parser->Parse(inputURI, 0, PR_FALSE, 0, eDTDMode_unknown);
+
+  return rv;
 }
 
 //----------------------------------------------------------------------
 
 PRBool CompareFiles(const char* aFilename1, const char* aFilename2) {
-    PRBool result=PR_TRUE;
+  PRBool result=PR_TRUE;
 
-    fstream theFirstStream(aFilename1,ios::in | ios::nocreate);
-    fstream theSecondStream(aFilename2,ios::in | ios::nocreate);
-    
-    PRBool done=PR_FALSE;        
-    char   ch1,ch2;
+  fstream theFirstStream(aFilename1,ios::in | ios::nocreate);
+  fstream theSecondStream(aFilename2,ios::in | ios::nocreate);
 
-    while(!done) {
-        theFirstStream >> ch1;
-        theSecondStream >> ch2;
-        if(ch1!=ch2) {
-            result=PR_FALSE;
-            break;
-        }
-        done=PRBool((theFirstStream.ipfx(1)==0) || (theSecondStream.ipfx(1)==0));
+  PRBool done=PR_FALSE;
+  char   ch1,ch2;
+
+  while(!done) {
+    theFirstStream >> ch1;
+    theSecondStream >> ch2;
+    if(ch1!=ch2) {
+      result=PR_FALSE;
+      break;
     }
-    return result;
+    done=PRBool((theFirstStream.ipfx(1)==0) || (theSecondStream.ipfx(1)==0));
+  }
+  return result;
 }
 
 //----------------------------------------------------------------------
 
 void ComputeTempFilename(const char* anIndexFilename, char* aTempFilename) {
-    if(anIndexFilename) {
-        strcpy(aTempFilename,anIndexFilename);            
-        char* pos=strrchr(aTempFilename,'\\');
-        if(!pos)
-            pos=strrchr(aTempFilename,'/');
-        if(pos) {
-            (*pos)=0;
-            strcat(aTempFilename,"/temp.blx");
-            return;
-        }
+  if(anIndexFilename) {
+    strcpy(aTempFilename,anIndexFilename);
+    char* pos=strrchr(aTempFilename,'\\');
+    if(!pos)
+      pos=strrchr(aTempFilename,'/');
+    if(pos) {
+      (*pos)=0;
+      strcat(aTempFilename,"/temp.blx");
+      return;
     }
-    //fall back to our last resort...
-    strcpy(aTempFilename,"c:/windows/temp/temp.blx");
+  }
+  //fall back to our last resort...
+  strcpy(aTempFilename,"c:/windows/temp/temp.blx");
 }
 
 //----------------------------------------------------------------------
@@ -162,33 +162,33 @@ static const char* kResultMsg[2] = {" failed!"," ok."};
 
 void ValidateBaselineFiles(const char* anIndexFilename) {
 
-    fstream theIndexFile(anIndexFilename,ios::in | ios::nocreate);
-    char    theFilename[500];
-    char    theBaselineFilename[500];
-    char    theTempFilename[500];
-    PRBool  done=PR_FALSE;
+  fstream theIndexFile(anIndexFilename,ios::in | ios::nocreate);
+  char    theFilename[500];
+  char    theBaselineFilename[500];
+  char    theTempFilename[500];
+  PRBool  done=PR_FALSE;
 
-    ComputeTempFilename(anIndexFilename,theTempFilename);
+  ComputeTempFilename(anIndexFilename,theTempFilename);
 
-    while(!done) {
-        theIndexFile >> theFilename;
-        theIndexFile >> theBaselineFilename;
-        if(theFilename[0] && theBaselineFilename[0]) {
-            if(NS_SUCCEEDED(GenerateBaselineFile(theFilename,theTempFilename))) {
-                PRBool matches=CompareFiles(theTempFilename,theBaselineFilename);
-                cout << theFilename << kResultMsg[matches] << endl;
-            }
-        }
-        theFilename[0]=0;
-        theBaselineFilename[0]=0;
-        done=PRBool(theIndexFile.ipfx(1)==0);
+  while(!done) {
+    theIndexFile >> theFilename;
+    theIndexFile >> theBaselineFilename;
+    if(theFilename[0] && theBaselineFilename[0]) {
+      if(NS_SUCCEEDED(GenerateBaselineFile(theFilename,theTempFilename))) {
+        PRBool matches=CompareFiles(theTempFilename,theBaselineFilename);
+        cout << theFilename << kResultMsg[matches] << endl;
+      }
     }
+    theFilename[0]=0;
+    theBaselineFilename[0]=0;
+    done=PRBool(theIndexFile.ipfx(1)==0);
+  }
 
 
-    // Now it's time to compare our output to the baseline...
-//    if(!CompareFiles(aBaselineFilename,aBaselineFilename)){
-//        cout << "File: \"" << aSourceFilename << "\" does not match baseline." << endl;
-//    }
+  // Now it's time to compare our output to the baseline...
+//  if(!CompareFiles(aBaselineFilename,aBaselineFilename)){
+//    cout << "File: \"" << aSourceFilename << "\" does not match baseline." << endl;
+//  }
 
 }
 
@@ -197,46 +197,46 @@ void ValidateBaselineFiles(const char* anIndexFilename) {
 
 int main(int argc, char** argv)
 {
-    if (argc < 2) {
-        cout << "Usage: " << kAppName << " [options] [filename]" << endl; 
-        cout << "       -c [filelist]   " << kOption1 << endl;
-        cout << "       -g [in] [out]   " << kOption2 << endl; 
-        return -1;
-    }
+  if (argc < 2) {
+    cout << "Usage: " << kAppName << " [options] [filename]" << endl;
+    cout << "     -c [filelist]   " << kOption1 << endl;
+    cout << "     -g [in] [out]   " << kOption2 << endl;
+    return -1;
+  }
 
-    int result=0;
+  int result=0;
 
-    nsresult rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
-    if (NS_FAILED(rv)) {
-        printf("NS_InitXPCOM2 failed\n");
-        return 1;
-    }
+  nsresult rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
+  if (NS_FAILED(rv)) {
+    printf("NS_InitXPCOM2 failed\n");
+    return 1;
+  }
 
-    if(0==strcmp("-c",argv[1])) {
+  if(0==strcmp("-c",argv[1])) {
 
-        if(argc>2) {
-            cout << kOption1 << "..." << endl;
+    if(argc>2) {
+      cout << kOption1 << "..." << endl;
 
-            //Open the master filelist, and read the filenames.
-            //Each line contains a source filename and a baseline filename, separated by a space.
-            ValidateBaselineFiles(argv[2]);
-        }
-        else {
-            cout << kAppName << ": Filelist missing for -c option -- nothing to do." << endl;
-        }
-
-    }
-    else if(0==strcmp("-g",argv[1])) {
-        if(argc>3) {
-            cout << kOption2 << argv[3] << " from " << argv[2] << "..." << endl;
-            GenerateBaselineFile(argv[2],argv[3]);
-        }
-        else {
-            cout << kAppName << ": Filename(s) missing for -g option -- nothing to do." << endl;
-        }
+      //Open the master filelist, and read the filenames.
+      //Each line contains a source filename and a baseline filename, separated by a space.
+      ValidateBaselineFiles(argv[2]);
     }
     else {
-        cout << kAppName << ": Unknown options -- nothing to do." << endl;
+      cout << kAppName << ": Filelist missing for -c option -- nothing to do." << endl;
     }
-    return result;
+
+  }
+  else if(0==strcmp("-g",argv[1])) {
+    if(argc>3) {
+      cout << kOption2 << argv[3] << " from " << argv[2] << "..." << endl;
+      GenerateBaselineFile(argv[2],argv[3]);
+    }
+    else {
+      cout << kAppName << ": Filename(s) missing for -g option -- nothing to do." << endl;
+    }
+  }
+  else {
+    cout << kAppName << ": Unknown options -- nothing to do." << endl;
+  }
+  return result;
 }