From 33191c7f8a58bcaeeb9783e6ac45ee87f2faa3e7 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Tue, 4 Jun 2013 00:55:57 -0700
Subject: [PATCH] Mac installer: Fix build breaks due to recent changes for
 strcpy -> strlcpy.

---
 lib/url.h                                 | 1 +
 mac_build/boinc.xcodeproj/project.pbxproj | 4 ++++
 mac_installer/Installer.cpp               | 2 +-
 mac_installer/PostInstall.cpp             | 1 +
 mac_installer/WaitPermissions.cpp         | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/url.h b/lib/url.h
index 3a0810b217..32b715b522 100644
--- a/lib/url.h
+++ b/lib/url.h
@@ -38,6 +38,7 @@ extern void parse_url(const char* url, PARSED_URL&);
 extern void unescape_url(std::string& url);
 extern void unescape_url(char *url, int len);
 extern void escape_url(std::string& url);
+extern void escape_url(const char *in, char*out, int out_size);
 extern void escape_url_unsage(char *in, char *out);
 extern void escape_url_readable(char* in, char* out);
 extern void escape_project_url(char *in, char* out);
diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj
index d0d864336b..d26fe5e664 100755
--- a/mac_build/boinc.xcodeproj/project.pbxproj
+++ b/mac_build/boinc.xcodeproj/project.pbxproj
@@ -202,6 +202,8 @@
 		DD6ABCD10BD4C5CA009AA7A1 /* browser_safari.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD6ABCD00BD4C5CA009AA7A1 /* browser_safari.mm */; };
 		DD6D0A8707E9A61E007F882B /* network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD6D0A8507E9A61B007F882B /* network.cpp */; };
 		DD6FCB68167745E700C740DB /* libsqlite3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD6FCB67167745E700C740DB /* libsqlite3.a */; };
+		DD728D45175DD3B900A1CE23 /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC06AB210A3E93F00C8D9A5 /* url.cpp */; };
+		DD728D47175DD41B00A1CE23 /* str_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD7BF7D70B8E7A9800A009F7 /* str_util.cpp */; };
 		DD73E36E08A0720500656EB1 /* gui_rpc_server_ops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD73E36208A06ED400656EB1 /* gui_rpc_server_ops.cpp */; };
 		DD73E3A708A07CA600656EB1 /* hostinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD344BB607C5AEEE0043025C /* hostinfo.cpp */; };
 		DD73E3B608A07FC600656EB1 /* gui_rpc_client_ops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD73E34E08A0694000656EB1 /* gui_rpc_client_ops.cpp */; };
@@ -2832,6 +2834,8 @@
 				DDA12AA20A369B5500FBDD12 /* SetupSecurity.cpp in Sources */,
 				DD51DC8F0A4943A300BD24E6 /* check_security.cpp in Sources */,
 				DD2FE5CB142DE94700A1E6F3 /* LoginItemAPI.c in Sources */,
+				DD728D45175DD3B900A1CE23 /* url.cpp in Sources */,
+				DD728D47175DD41B00A1CE23 /* str_util.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/mac_installer/Installer.cpp b/mac_installer/Installer.cpp
index f26578bc74..265f41407d 100644
--- a/mac_installer/Installer.cpp
+++ b/mac_installer/Installer.cpp
@@ -30,7 +30,7 @@
 #include <sys/param.h>  // for MAXPATHLEN
 #include <sys/stat.h>
 
-#include "std_util.h"
+#include "str_util.h"
 
 #define boinc_master_user_name "boinc_master"
 #define boinc_master_group_name "boinc_master"
diff --git a/mac_installer/PostInstall.cpp b/mac_installer/PostInstall.cpp
index fa48415441..4718e06909 100644
--- a/mac_installer/PostInstall.cpp
+++ b/mac_installer/PostInstall.cpp
@@ -72,6 +72,7 @@
 #include <time.h>       // for time()
 #include <vector>
 #include <string>
+#include "url.h"
 
 using std::vector;
 using std::string;
diff --git a/mac_installer/WaitPermissions.cpp b/mac_installer/WaitPermissions.cpp
index 5e202e52a3..ed0dec9785 100644
--- a/mac_installer/WaitPermissions.cpp
+++ b/mac_installer/WaitPermissions.cpp
@@ -24,6 +24,7 @@
 #include <sys/stat.h>   // for stat
 #include <unistd.h>	// getuid
 #include <dirent.h>
+#include "str_util.h"
 
 void print_to_log_file(const char *format, ...);
 void strip_cr(char *buf);