Code changes to get the code to compile under GCC....

courgette/courgette_tool.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 27 matching lines @@
 void Problem(const char* format, ...) {
   va_list args;
   va_start(args, format);
   vfprintf(stderr, format, args);
   fprintf(stderr, "\n");
   va_end(args);
   exit(1);
 }
 
 std::string ReadOrFail(const std::wstring& file_name, const char* kind) {
+#if defined(OS_WIN)
   FilePath file_path(file_name);
+#else
+  FilePath file_path(WideToASCII(file_name));
+#endif
   std::string buffer;
   if (!file_util::ReadFileToString(file_path, &buffer))
     Problem("Can't read %s file.", kind);
   return buffer;
 }
 
 void WriteSinkToFile(const courgette::SinkStream *sink,
                      const std::wstring& output_file) {
+#if defined(OS_WIN)
   FilePath output_path(output_file);
+#else
+  FilePath output_path(WideToASCII(output_file));
+#endif
   int count =
       file_util::WriteFile(output_path,
                            reinterpret_cast<const char*>(sink->Buffer()),
                            sink->Length());
   if (count == -1)
-    Problem("Cant write output.");
-  if (count != sink->Length())
+    Problem("Can't write output.");
+  if (static_cast<size_t>(count) != sink->Length())
     Problem("Incomplete write.");
 }
 
 void Disassemble(const std::wstring& input_file,
                  const std::wstring& output_file) {
   std::string buffer = ReadOrFail(input_file, "input");
 
   courgette::AssemblyProgram* program = NULL;
   const courgette::Status parse_status =
       courgette::ParseWin32X86PE(buffer.c_str(), buffer.length(), &program);
@@ skipping 248 matching lines @@
 
   courgette::SinkStream new_stream;
   courgette::BSDiffStatus status =
       courgette::ApplyBinaryPatch(&old_stream, &patch_stream, &new_stream);
 
   if (status != courgette::OK) Problem("-applybsdiff failed.");
 
   WriteSinkToFile(&new_stream, new_file);
 }
 
+bool WideStringToInt(const std::wstring& str, int *output) {
+  string16 copy(str.begin(), str.end());
+  return StringToInt(copy, output);
+}
+
 int main(int argc, const char* argv[]) {
   base::AtExitManager at_exit_manager;
   CommandLine::Init(argc, argv);
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   bool cmd_dis = command_line.HasSwitch(L"dis");
   bool cmd_asm = command_line.HasSwitch(L"asm");
   bool cmd_disadj = command_line.HasSwitch(L"disadj");
   bool cmd_make_patch = command_line.HasSwitch(L"gen");
   bool cmd_apply_patch = command_line.HasSwitch(L"apply");
   bool cmd_make_bsdiff_patch = command_line.HasSwitch(L"genbsdiff");
   bool cmd_apply_bsdiff_patch = command_line.HasSwitch(L"applybsdiff");
   bool cmd_spread_1_adjusted = command_line.HasSwitch(L"gen1a");
   bool cmd_spread_1_unadjusted = command_line.HasSwitch(L"gen1u");
 
   std::vector<std::wstring> values = command_line.GetLooseValues();
 
   // '-repeat=N' is for debugging.  Running many iterations can reveal leaks and
   // bugs in cleanup.
   int repeat_count = 1;
   std::wstring repeat_switch = command_line.GetSwitchValue(L"repeat");
   if (!repeat_switch.empty())
-    if (!StringToInt(repeat_switch, &repeat_count))
+    if (!WideStringToInt(repeat_switch, &repeat_count))
       repeat_count = 1;
 
   if (cmd_dis + cmd_asm + cmd_disadj + cmd_make_patch + cmd_apply_patch +
       cmd_make_bsdiff_patch + cmd_apply_bsdiff_patch +
       cmd_spread_1_adjusted + cmd_spread_1_unadjusted
       != 1)
     UsageProblem(
         "Must have exactly one of:\n"
         "  -asm, -dis, -disadj, -gen or -apply, -genbsdiff or -applybsdiff.");
 
@@ skipping 29 matching lines @@
     } else if (cmd_spread_1_adjusted || cmd_spread_1_unadjusted) {
       if (values.size() != 3)
         UsageProblem("-gen1[au] <old_file> <new_file> <patch_files_root>");
       DisassembleAdjustDiff(values[0], values[1], values[2],
                             cmd_spread_1_adjusted);
     } else {
       UsageProblem("No operation specified");
     }
   }
 }