From 1c4e0deda910a2a9c304a3683aadf156f1dab60b Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Tue, 20 Nov 2018 23:17:58 +0000
Subject: [PATCH 01/14] Add strcase*

---
 src/lib.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index bea110240432f..8057dbed6f634 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -280,6 +280,9 @@ extern "C" {
     pub fn strdup(cs: *const c_char) -> *mut c_char;
     pub fn strpbrk(cs: *const c_char, ct: *const c_char) -> *mut c_char;
     pub fn strstr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
+    pub fn strcasestr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
+    pub fn strcasecmp(s1: *const c_char, s2: *const c_char) -> c_int;
+    pub fn strncasecmp(s1: *const c_char, s2: *const c_char, n: size_t) -> c_int;
     pub fn strlen(cs: *const c_char) -> size_t;
     pub fn strnlen(cs: *const c_char, maxlen: size_t) -> size_t;
     #[cfg_attr(

From 7eed4d05a2e08d93cd069f72c88f0d0c28ccf9e5 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Tue, 20 Nov 2018 23:18:11 +0000
Subject: [PATCH 02/14] Add getline

---
 src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib.rs b/src/lib.rs
index 8057dbed6f634..82c0385ea2660 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -227,6 +227,7 @@ extern "C" {
     pub fn fputs(s: *const c_char, stream: *mut FILE) -> c_int;
     pub fn puts(s: *const c_char) -> c_int;
     pub fn ungetc(c: c_int, stream: *mut FILE) -> c_int;
+    pub fn getline (lineptr: *mut *mut c_char, n: *mut size_t, stream: *mut FILE) -> ssize_t;
     pub fn fread(ptr: *mut c_void, size: size_t, nobj: size_t, stream: *mut FILE) -> size_t;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),

From 9828bd999ee799b5275d8b986a4f0c40ffa23f70 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Tue, 20 Nov 2018 23:43:54 +0000
Subject: [PATCH 03/14] Split out getline and strcasestr to supported platforms

---
 src/lib.rs                | 2 --
 src/unix/bsd/apple/mod.rs | 2 ++
 src/unix/mod.rs           | 2 ++
 src/unix/notbsd/mod.rs    | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 82c0385ea2660..c0a28fcbdc459 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -227,7 +227,6 @@ extern "C" {
     pub fn fputs(s: *const c_char, stream: *mut FILE) -> c_int;
     pub fn puts(s: *const c_char) -> c_int;
     pub fn ungetc(c: c_int, stream: *mut FILE) -> c_int;
-    pub fn getline (lineptr: *mut *mut c_char, n: *mut size_t, stream: *mut FILE) -> ssize_t;
     pub fn fread(ptr: *mut c_void, size: size_t, nobj: size_t, stream: *mut FILE) -> size_t;
     #[cfg_attr(
         all(target_os = "macos", target_arch = "x86"),
@@ -281,7 +280,6 @@ extern "C" {
     pub fn strdup(cs: *const c_char) -> *mut c_char;
     pub fn strpbrk(cs: *const c_char, ct: *const c_char) -> *mut c_char;
     pub fn strstr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
-    pub fn strcasestr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
     pub fn strcasecmp(s1: *const c_char, s2: *const c_char) -> c_int;
     pub fn strncasecmp(s1: *const c_char, s2: *const c_char, n: size_t) -> c_int;
     pub fn strlen(cs: *const c_char) -> size_t;
diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
index ee8108de92bc0..50bc57f47aedb 100644
--- a/src/unix/bsd/apple/mod.rs
+++ b/src/unix/bsd/apple/mod.rs
@@ -2585,6 +2585,8 @@ extern {
         fd: ::c_int,
         newfd: ::c_int,
     ) -> ::c_int;
+
+    pub fn getline (lineptr: *mut *mut c_char, n: *mut size_t, stream: *mut FILE) -> ssize_t;
 }
 
 cfg_if! {
diff --git a/src/unix/mod.rs b/src/unix/mod.rs
index 06275a699450a..84c31ce78e970 100644
--- a/src/unix/mod.rs
+++ b/src/unix/mod.rs
@@ -947,6 +947,8 @@ extern {
     pub fn posix_openpt(flags: ::c_int) -> ::c_int;
     pub fn ptsname(fd: ::c_int) -> *mut ::c_char;
     pub fn unlockpt(fd: ::c_int) -> ::c_int;
+
+    pub fn strcasestr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
 }
 
 cfg_if! {
diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs
index 6e4500684e136..d3d79244623e1 100644
--- a/src/unix/notbsd/mod.rs
+++ b/src/unix/notbsd/mod.rs
@@ -1229,6 +1229,8 @@ extern {
                    flags: ::c_int) -> ::ssize_t;
     pub fn recvmsg(fd: ::c_int, msg: *mut ::msghdr, flags: ::c_int)
                    -> ::ssize_t;
+
+    pub fn getline (lineptr: *mut *mut c_char, n: *mut size_t, stream: *mut FILE) -> ssize_t;
 }
 
 cfg_if! {

From 9c6714e54ddc1477c2b3bac79ca7c95df1093110 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Tue, 20 Nov 2018 23:50:37 +0000
Subject: [PATCH 04/14] Define _WITH_GETLINE for FreeBSD so we can move getline
 into general Unix

---
 libc-test/build.rs        | 2 ++
 src/unix/bsd/apple/mod.rs | 2 --
 src/unix/mod.rs           | 1 +
 src/unix/notbsd/mod.rs    | 2 --
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/libc-test/build.rs b/libc-test/build.rs
index 90c5640ba1f1d..7250290c72843 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -42,6 +42,8 @@ fn main() {
         cfg.define("_XOPEN_SOURCE", Some("700"));
         cfg.define("__EXTENSIONS__", None);
         cfg.define("_LCONV_C99", None);
+    } else if freebsd {
+        cfg.define("_WITH_GETLINE", None);
     }
 
     // Android doesn't actually have in_port_t but it's much easier if we
diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
index 50bc57f47aedb..ee8108de92bc0 100644
--- a/src/unix/bsd/apple/mod.rs
+++ b/src/unix/bsd/apple/mod.rs
@@ -2585,8 +2585,6 @@ extern {
         fd: ::c_int,
         newfd: ::c_int,
     ) -> ::c_int;
-
-    pub fn getline (lineptr: *mut *mut c_char, n: *mut size_t, stream: *mut FILE) -> ssize_t;
 }
 
 cfg_if! {
diff --git a/src/unix/mod.rs b/src/unix/mod.rs
index 84c31ce78e970..b7bcac1574ed6 100644
--- a/src/unix/mod.rs
+++ b/src/unix/mod.rs
@@ -949,6 +949,7 @@ extern {
     pub fn unlockpt(fd: ::c_int) -> ::c_int;
 
     pub fn strcasestr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
+    pub fn getline (lineptr: *mut *mut c_char, n: *mut size_t, stream: *mut FILE) -> ssize_t;
 }
 
 cfg_if! {
diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs
index d3d79244623e1..6e4500684e136 100644
--- a/src/unix/notbsd/mod.rs
+++ b/src/unix/notbsd/mod.rs
@@ -1229,8 +1229,6 @@ extern {
                    flags: ::c_int) -> ::ssize_t;
     pub fn recvmsg(fd: ::c_int, msg: *mut ::msghdr, flags: ::c_int)
                    -> ::ssize_t;
-
-    pub fn getline (lineptr: *mut *mut c_char, n: *mut size_t, stream: *mut FILE) -> ssize_t;
 }
 
 cfg_if! {

From b81bb4a776c80db10b4b676f521f7b7a22b21e60 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Wed, 21 Nov 2018 00:02:17 +0000
Subject: [PATCH 05/14] Fix missing imports for unix module

---
 src/unix/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/unix/mod.rs b/src/unix/mod.rs
index b7bcac1574ed6..15a6a2684449f 100644
--- a/src/unix/mod.rs
+++ b/src/unix/mod.rs
@@ -4,6 +4,7 @@
 //! according to the platform in question.
 
 use dox::Option;
+use {FILE, ssize_t, size_t}; // from libc parent
 
 pub type pid_t = i32;
 pub type uid_t = u32;

From a145cf74318a85e7dd156d3c1b4de2d7df1e0c70 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Wed, 21 Nov 2018 00:10:46 +0000
Subject: [PATCH 06/14] Fix line-length unix style issue

---
 src/unix/mod.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/unix/mod.rs b/src/unix/mod.rs
index 15a6a2684449f..6a1e60de90992 100644
--- a/src/unix/mod.rs
+++ b/src/unix/mod.rs
@@ -950,7 +950,8 @@ extern {
     pub fn unlockpt(fd: ::c_int) -> ::c_int;
 
     pub fn strcasestr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
-    pub fn getline (lineptr: *mut *mut c_char, n: *mut size_t, stream: *mut FILE) -> ssize_t;
+    pub fn getline (lineptr: *mut *mut c_char, n: *mut size_t,
+        stream: *mut FILE) -> ssize_t;
 }
 
 cfg_if! {

From 08eaa2c45e13a0f5324f086eed5c262642bf12bb Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Wed, 21 Nov 2018 23:55:23 +0000
Subject: [PATCH 07/14] Split out strcase* into unix, MSVC and Windows-GNU

---
 src/unix/mod.rs |  3 +++
 src/windows.rs  | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/unix/mod.rs b/src/unix/mod.rs
index 7f7c19d289364..cfbb1e7fa8a60 100644
--- a/src/unix/mod.rs
+++ b/src/unix/mod.rs
@@ -475,6 +475,9 @@ extern {
     pub fn strdup(cs: *const c_char) -> *mut c_char;
     pub fn strpbrk(cs: *const c_char, ct: *const c_char) -> *mut c_char;
     pub fn strstr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
+    pub fn strcasecmp(s1: *const c_char, s2: *const c_char) -> c_int;
+    pub fn strncasecmp(s1: *const c_char, s2: *const c_char,
+                       n: size_t) -> c_int;
     pub fn strlen(cs: *const c_char) -> size_t;
     pub fn strnlen(cs: *const c_char, maxlen: size_t) -> size_t;
     #[cfg_attr(
diff --git a/src/windows.rs b/src/windows.rs
index 4fc2c16a611ad..0f0dc6b0ba930 100644
--- a/src/windows.rs
+++ b/src/windows.rs
@@ -379,6 +379,22 @@ extern {
     #[link_name = "_wsetlocale"]
     pub fn wsetlocale(category: ::c_int,
                       locale: *const wchar_t) -> *mut wchar_t;
+
+    cfg_if! {
+        if #[cfg(all(target_env = "gnu"))] {
+            pub fn strcasecmp(s1: *const c_char, s2: *const c_char) -> c_int;
+            pub fn strncasecmp(s1: *const c_char, s2: *const c_char,
+                            n: size_t) -> c_int;
+        } else if #[cfg(all(target_env = "msvc"))] {
+            #[link_name = "_stricmp"]
+            pub fn stricmp(s1: *const c_char, s2: *const c_char) -> c_int;
+            #[link_name = "_strnicmp"]
+            pub fn strnicmp(s1: *const c_char, s2: *const c_char,
+                            n: size_t) -> c_int;
+        } else {
+            // Unknown target_env
+        }
+    }
 }
 
 cfg_if! {

From 46f08b52a9dbb164461b39118a44aa6453b030f8 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Fri, 23 Nov 2018 21:13:58 +0000
Subject: [PATCH 08/14] Pull cfg_if! outside the extern

---
 src/windows.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/windows.rs b/src/windows.rs
index 0f0dc6b0ba930..1d2d96b4ff037 100644
--- a/src/windows.rs
+++ b/src/windows.rs
@@ -379,8 +379,10 @@ extern {
     #[link_name = "_wsetlocale"]
     pub fn wsetlocale(category: ::c_int,
                       locale: *const wchar_t) -> *mut wchar_t;
+}
 
-    cfg_if! {
+cfg_if! {
+    extern {
         if #[cfg(all(target_env = "gnu"))] {
             pub fn strcasecmp(s1: *const c_char, s2: *const c_char) -> c_int;
             pub fn strncasecmp(s1: *const c_char, s2: *const c_char,

From b75803751f102b1d672fddeac3391ef7a65ad68c Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Fri, 23 Nov 2018 21:21:24 +0000
Subject: [PATCH 09/14] strcase*: Add cloudabi support

---
 libc-test/build.rs  | 5 +++++
 src/cloudabi/mod.rs | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/libc-test/build.rs b/libc-test/build.rs
index e016d382168e6..16334d94e5c32 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -26,6 +26,7 @@ fn main() {
     let openbsd = target.contains("openbsd");
     let rumprun = target.contains("rumprun");
     let solaris = target.contains("solaris");
+    let cloudabi = target.contains("cloudabi");
     let bsdlike = freebsd || apple || netbsd || openbsd || dragonfly;
     let mut cfg = ctest::TestGenerator::new();
 
@@ -353,6 +354,10 @@ fn main() {
         }
     }
 
+    if cloudabi {
+        cfg.header("strings.h");
+    }
+
     cfg.type_name(move |ty, is_struct, is_union| {
         match ty {
             // Just pass all these through, no need for a "struct" prefix
diff --git a/src/cloudabi/mod.rs b/src/cloudabi/mod.rs
index f72eeb4d24afc..02b7974ff4825 100644
--- a/src/cloudabi/mod.rs
+++ b/src/cloudabi/mod.rs
@@ -185,6 +185,8 @@ extern {
     pub fn atexit(cb: extern fn()) -> c_int;
     pub fn system(s: *const c_char) -> c_int;
     pub fn getenv(s: *const c_char) -> *mut c_char;
+    pub fn getline (lineptr: *mut *mut c_char, n: *mut size_t,
+        stream: *mut FILE) -> ssize_t;
 
     pub fn strcpy(dst: *mut c_char, src: *const c_char) -> *mut c_char;
     pub fn strncpy(dst: *mut c_char, src: *const c_char,
@@ -201,6 +203,9 @@ extern {
     pub fn strdup(cs: *const c_char) -> *mut c_char;
     pub fn strpbrk(cs: *const c_char, ct: *const c_char) -> *mut c_char;
     pub fn strstr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
+    pub fn strcasecmp(s1: *const c_char, s2: *const c_char) -> c_int;
+    pub fn strncasecmp(s1: *const c_char, s2: *const c_char,
+                       n: size_t) -> c_int;
     pub fn strlen(cs: *const c_char) -> size_t;
     pub fn strnlen(cs: *const c_char, maxlen: size_t) -> size_t;
     pub fn strerror(n: c_int) -> *mut c_char;

From d75fc9c34acbde46f2665fcc740896b900138094 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Fri, 23 Nov 2018 21:25:23 +0000
Subject: [PATCH 10/14] strcase*: add redox support

---
 libc-test/build.rs | 3 ++-
 src/redox/mod.rs   | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libc-test/build.rs b/libc-test/build.rs
index 16334d94e5c32..9afb6240e0775 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -27,6 +27,7 @@ fn main() {
     let rumprun = target.contains("rumprun");
     let solaris = target.contains("solaris");
     let cloudabi = target.contains("cloudabi");
+    let redox = target.contains("redox");
     let bsdlike = freebsd || apple || netbsd || openbsd || dragonfly;
     let mut cfg = ctest::TestGenerator::new();
 
@@ -354,7 +355,7 @@ fn main() {
         }
     }
 
-    if cloudabi {
+    if cloudabi || redox {
         cfg.header("strings.h");
     }
 
diff --git a/src/redox/mod.rs b/src/redox/mod.rs
index 9870fa6dca066..9f68632a0fbfb 100644
--- a/src/redox/mod.rs
+++ b/src/redox/mod.rs
@@ -231,6 +231,10 @@ extern {
     pub fn strdup(cs: *const c_char) -> *mut c_char;
     pub fn strpbrk(cs: *const c_char, ct: *const c_char) -> *mut c_char;
     pub fn strstr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
+    pub fn strcasestr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
+    pub fn strcasecmp(s1: *const c_char, s2: *const c_char) -> c_int;
+    pub fn strncasecmp(s1: *const c_char, s2: *const c_char,
+                       n: size_t) -> c_int;
     pub fn strlen(cs: *const c_char) -> size_t;
     pub fn strnlen(cs: *const c_char, maxlen: size_t) -> size_t;
     pub fn strerror(n: c_int) -> *mut c_char;

From cd6b95db83dd46fad581730c021bf5666a0d9e7b Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Fri, 23 Nov 2018 22:33:20 +0000
Subject: [PATCH 11/14] Split out windows strcase* work into gnu/msvc files

---
 src/windows/gnu.rs                 |  8 ++++++
 src/{windows.rs => windows/mod.rs} | 42 +++++++++---------------------
 src/windows/msvc.rs                | 10 +++++++
 3 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 src/windows/gnu.rs
 rename src/{windows.rs => windows/mod.rs} (94%)
 create mode 100644 src/windows/msvc.rs

diff --git a/src/windows/gnu.rs b/src/windows/gnu.rs
new file mode 100644
index 0000000000000..a67af15a8f01d
--- /dev/null
+++ b/src/windows/gnu.rs
@@ -0,0 +1,8 @@
+pub const L_tmpnam: ::c_uint = 14;
+pub const TMP_MAX: ::c_uint = 0x7fff;
+
+extern {
+    pub fn strcasecmp(s1: *const ::c_char, s2: *const ::c_char) -> ::c_int;
+    pub fn strncasecmp(s1: *const ::c_char, s2: *const ::c_char,
+                    n: ::size_t) -> ::c_int;
+}
diff --git a/src/windows.rs b/src/windows/mod.rs
similarity index 94%
rename from src/windows.rs
rename to src/windows/mod.rs
index 1d2d96b4ff037..79ef49109b4c7 100644
--- a/src/windows.rs
+++ b/src/windows/mod.rs
@@ -111,18 +111,6 @@ pub const BUFSIZ: ::c_uint = 512;
 pub const FOPEN_MAX: ::c_uint = 20;
 pub const FILENAME_MAX: ::c_uint = 260;
 
-cfg_if! {
-    if #[cfg(all(target_env = "gnu"))] {
-        pub const L_tmpnam: ::c_uint = 14;
-        pub const TMP_MAX: ::c_uint = 0x7fff;
-    } else if #[cfg(all(target_env = "msvc"))] {
-        pub const L_tmpnam: ::c_uint = 260;
-        pub const TMP_MAX: ::c_uint = 0x7fff_ffff;
-    } else {
-        // Unknown target_env
-    }
-}
-
 pub const O_RDONLY: ::c_int = 0;
 pub const O_WRONLY: ::c_int = 1;
 pub const O_RDWR: ::c_int = 2;
@@ -381,24 +369,6 @@ extern {
                       locale: *const wchar_t) -> *mut wchar_t;
 }
 
-cfg_if! {
-    extern {
-        if #[cfg(all(target_env = "gnu"))] {
-            pub fn strcasecmp(s1: *const c_char, s2: *const c_char) -> c_int;
-            pub fn strncasecmp(s1: *const c_char, s2: *const c_char,
-                            n: size_t) -> c_int;
-        } else if #[cfg(all(target_env = "msvc"))] {
-            #[link_name = "_stricmp"]
-            pub fn stricmp(s1: *const c_char, s2: *const c_char) -> c_int;
-            #[link_name = "_strnicmp"]
-            pub fn strnicmp(s1: *const c_char, s2: *const c_char,
-                            n: size_t) -> c_int;
-        } else {
-            // Unknown target_env
-        }
-    }
-}
-
 cfg_if! {
     if #[cfg(core_cvoid)] {
         pub use core::ffi::c_void;
@@ -416,3 +386,15 @@ cfg_if! {
         }
     }
 }
+
+cfg_if! {
+    if #[cfg(all(target_env = "gnu"))] {
+        mod gnu;
+        pub use self::gnu::*;
+    } else if #[cfg(all(target_env = "msvc"))] {
+        mod msvc;
+        pub use self::msvc::*;
+    } else {
+        // Unknown target_env
+    }
+}
\ No newline at end of file
diff --git a/src/windows/msvc.rs b/src/windows/msvc.rs
new file mode 100644
index 0000000000000..9e2a9b9e5d46c
--- /dev/null
+++ b/src/windows/msvc.rs
@@ -0,0 +1,10 @@
+pub const L_tmpnam: ::c_uint = 260;
+pub const TMP_MAX: ::c_uint = 0x7fff_ffff;
+
+extern {
+    #[link_name = "_stricmp"]
+    pub fn stricmp(s1: *const ::c_char, s2: *const ::c_char) -> ::c_int;
+    #[link_name = "_strnicmp"]
+    pub fn strnicmp(s1: *const ::c_char, s2: *const ::c_char,
+                    n: ::size_t) -> ::c_int;
+}
\ No newline at end of file

From b05e05819da2e2cc3dc15deb6c784bdee3328f3f Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 24 Nov 2018 19:18:51 +0000
Subject: [PATCH 12/14] Download Docker images first as that seems to work
 better at least locally

---
 ci/run-docker.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index 4247827f67ffc..1e65795ebf964 100755
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -7,6 +7,14 @@ set -ex
 
 run() {
     echo "Building docker container for target ${1}"
+
+    # FIXME: Hacky workaround. Docker build seems to work better if we pull the base images first
+    ubuntu_images=( 16.04 17.10 18.04 )
+    for i in "${ubuntu_images[@]}"
+    do
+      docker pull ubuntu:$i
+    done
+
     # use -f so we can use ci/ as build context
     docker build -t libc -f "ci/docker/${1}/Dockerfile" ci/
     mkdir -p target

From 9a04c39566ff085278119c410fe85ddfa8442736 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Sat, 24 Nov 2018 19:27:22 +0000
Subject: [PATCH 13/14] Remove non-POSIX loop construct

---
 ci/run-docker.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index 1e65795ebf964..b1bd77fa60345 100755
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -9,11 +9,10 @@ run() {
     echo "Building docker container for target ${1}"
 
     # FIXME: Hacky workaround. Docker build seems to work better if we pull the base images first
-    ubuntu_images=( 16.04 17.10 18.04 )
-    for i in "${ubuntu_images[@]}"
-    do
-      docker pull ubuntu:$i
-    done
+    # Not using arrays/loops because it's not POSIX sh compatible
+    docker pull ubuntu:16.04
+    docker pull ubuntu:17.10
+    docker pull ubuntu:18.04
 
     # use -f so we can use ci/ as build context
     docker build -t libc -f "ci/docker/${1}/Dockerfile" ci/

From 0942070c31eccdafebf91e5323a01ea6cf79cf4f Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <palfrey@tevp.net>
Date: Mon, 26 Nov 2018 12:07:34 +0000
Subject: [PATCH 14/14] Remove hacky Travis workaround

---
 ci/run-docker.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index b1bd77fa60345..c656f5904d684 100755
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -8,12 +8,6 @@ set -ex
 run() {
     echo "Building docker container for target ${1}"
 
-    # FIXME: Hacky workaround. Docker build seems to work better if we pull the base images first
-    # Not using arrays/loops because it's not POSIX sh compatible
-    docker pull ubuntu:16.04
-    docker pull ubuntu:17.10
-    docker pull ubuntu:18.04
-
     # use -f so we can use ci/ as build context
     docker build -t libc -f "ci/docker/${1}/Dockerfile" ci/
     mkdir -p target