convert all programs to rust programs calling mains from cpp lib

build.rs

@@ -1,40 +1,55 @@
+use std::collections::HashMap;
 use std::error::Error;
 use std::fs;
 use std::io::{BufRead, BufReader};
+use std::path::Path;
 
 fn main() -> Result<(), Box<dyn Error>> {
-    let (app_version, config_dir, lib_dir) = {
+    let conf = {
+        let mut conf = HashMap::new();
+
         let f = fs::File::open("conf.pri")?;
         let reader = BufReader::new(f);
 
-        let mut av = String::new();
-        let mut cd = String::new();
-        let mut ld = String::new();
+        const CONF_VARS: &[&str] = &["APP_VERSION", "CONFIGDIR", "LIBDIR", "QT_INSTALL_LIBS"];
 
         for line in reader.lines() {
             let line = line?;
 
-            if line.starts_with("APP_VERSION =") {
-                let pos = line.find('=').unwrap();
-
-                av = line[(pos + 1)..].trim().into();
-            } else if line.starts_with("CONFIGDIR =") {
-                let pos = line.find('=').unwrap();
-
-                cd = line[(pos + 1)..].trim().into();
-            } else if line.starts_with("LIBDIR =") {
-                let pos = line.find('=').unwrap();
-
-                ld = line[(pos + 1)..].trim().into();
+            for name in CONF_VARS {
+                if line.starts_with(name) {
+                    let pos = line
+                        .find('=')
+                        .unwrap_or_else(|| panic!("no '=' character following var {}", name));
+                    conf.insert(name.to_string(), line[(pos + 1)..].trim().to_string());
+                    break;
+                }
             }
         }
 
-        (av, cd, ld)
+        conf
     };
 
+    let app_version = conf.get("APP_VERSION").unwrap();
+    let config_dir = conf.get("CONFIGDIR").unwrap();
+    let lib_dir = conf.get("LIBDIR").unwrap();
+    let qt_install_libs = conf.get("QT_INSTALL_LIBS").unwrap();
+
+    let cpp_lib_dir = fs::canonicalize(Path::new("src/cpp")).unwrap();
+
     println!("cargo:rustc-env=APP_VERSION={}", app_version);
     println!("cargo:rustc-env=CONFIG_DIR={}", config_dir);
     println!("cargo:rustc-env=LIB_DIR={}", lib_dir);
 
+    println!("cargo:rustc-link-search={}", cpp_lib_dir.display());
+
+    #[cfg(target_os = "macos")]
+    println!("cargo:rustc-link-search=framework={}", qt_install_libs);
+
+    #[cfg(not(target_os = "macos"))]
+    println!("cargo:rustc-link-search={}", qt_install_libs);
+
+    println!("cargo:rerun-if-changed=conf.pri");
+
     Ok(())
 }

configure

@@ -496,6 +496,15 @@ public:
 
 		conf->addIncludePath("\$\$PWD/src");
 
+		QByteArray out;
+		if(conf->doCommand(conf->qmake_path, QStringList() << "-query" << "QT_INSTALL_LIBS", &out) != 0)
+		{
+			return false;
+		}
+
+		QString qtlibdir = QString::fromUtf8(out).trimmed();
+		conf->addExtra(QString("QT_INSTALL_LIBS = %1").arg(qtlibdir));
+
 		QFile file("src/config.h");
 		if(file.open(QIODevice::WriteOnly | QIODevice::Text))
 		{

qcm/conf.qcm

@@ -76,6 +76,15 @@ public:
 
 		conf->addIncludePath("$$PWD/src");
 
+		QByteArray out;
+		if(conf->doCommand(conf->qmake_path, QStringList() << "-query" << "QT_INSTALL_LIBS", &out) != 0)
+		{
+			return false;
+		}
+
+		QString qtlibdir = QString::fromUtf8(out).trimmed();
+		conf->addExtra(QString("QT_INSTALL_LIBS = %1").arg(qtlibdir));
+
 		QFile file("src/config.h");
 		if(file.open(QIODevice::WriteOnly | QIODevice::Text))
 		{

src/bin/m2adapter.rs

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2023 Fastly, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+use pushpin::call_c_main;
+use std::process::ExitCode;
+
+#[cfg(target_os = "macos")]
+#[link(name = "pushpin-cpp")]
+#[link(name = "QtCore", kind = "framework")]
+#[link(name = "QtNetwork", kind = "framework")]
+extern "C" {
+    fn m2adapter_main(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int;
+}
+
+#[cfg(not(target_os = "macos"))]
+#[link(name = "pushpin-cpp")]
+#[link(name = "Qt5Core")]
+#[link(name = "Qt5Network")]
+extern "C" {
+    fn m2adapter_main(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int;
+}
+
+fn main() -> ExitCode {
+    unsafe { ExitCode::from(call_c_main(m2adapter_main)) }
+}

src/bin/pushpin-handler.rs

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2023 Fastly, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+use pushpin::call_c_main;
+use std::process::ExitCode;
+
+#[cfg(target_os = "macos")]
+#[link(name = "pushpin-cpp")]
+#[link(name = "QtCore", kind = "framework")]
+#[link(name = "QtNetwork", kind = "framework")]
+extern "C" {
+    fn handler_main(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int;
+}
+
+#[cfg(not(target_os = "macos"))]
+#[link(name = "pushpin-cpp")]
+#[link(name = "Qt5Core")]
+#[link(name = "Qt5Network")]
+extern "C" {
+    fn handler_main(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int;
+}
+
+fn main() -> ExitCode {
+    unsafe { ExitCode::from(call_c_main(handler_main)) }
+}

src/bin/pushpin-legacy.rs

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2023 Fastly, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+use pushpin::call_c_main;
+use std::process::ExitCode;
+
+#[cfg(target_os = "macos")]
+#[link(name = "pushpin-cpp")]
+#[link(name = "QtCore", kind = "framework")]
+#[link(name = "QtNetwork", kind = "framework")]
+extern "C" {
+    fn runner_main(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int;
+}
+
+#[cfg(not(target_os = "macos"))]
+#[link(name = "pushpin-cpp")]
+#[link(name = "Qt5Core")]
+#[link(name = "Qt5Network")]
+extern "C" {
+    fn runner_main(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int;
+}
+
+fn main() -> ExitCode {
+    unsafe { ExitCode::from(call_c_main(runner_main)) }
+}

src/bin/pushpin-proxy.rs

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2023 Fastly, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+use pushpin::call_c_main;
+use std::process::ExitCode;
+
+#[cfg(target_os = "macos")]
+#[link(name = "pushpin-cpp")]
+#[link(name = "QtCore", kind = "framework")]
+#[link(name = "QtNetwork", kind = "framework")]
+extern "C" {
+    fn proxy_main(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int;
+}
+
+#[cfg(not(target_os = "macos"))]
+#[link(name = "pushpin-cpp")]
+#[link(name = "Qt5Core")]
+#[link(name = "Qt5Network")]
+extern "C" {
+    fn proxy_main(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int;
+}
+
+fn main() -> ExitCode {
+    unsafe { ExitCode::from(call_c_main(proxy_main)) }
+}

src/cpp/cpp.pro

@@ -1,11 +1,5 @@
 TEMPLATE = subdirs
 
 cpp.subdir = cpp
-tests.subdir = tests
-tests.depends = cpp
 
-tests.CONFIG += no_default_install
-
-SUBDIRS += \
-	cpp \
-	tests
+SUBDIRS += cpp

src/cpp/cpp/cpp.pro

@@ -9,6 +9,5 @@ DESTDIR = ..
 MOC_DIR = $$OUT_PWD/_moc
 OBJECTS_DIR = $$OUT_PWD/_obj
 
-include($$OUT_PWD/../../rust/lib.pri)
 include($$OUT_PWD/../../../conf.pri)
 include(cpp.pri)

src/lib.rs

@@ -57,6 +57,7 @@ pub mod zhttppacket;
 pub mod zhttpsocket;
 pub mod zmq;
 
+use std::env;
 use std::ffi::CString;
 use std::future::Future;
 use std::io;
@@ -266,3 +267,17 @@ pub struct ListenConfig {
     pub spec: ListenSpec,
     pub stream: bool,
 }
+
+/// # Safety
+///
+/// * `main_fn` must be safe to call.
+pub unsafe fn call_c_main(
+    main_fn: unsafe extern "C" fn(libc::c_int, *const *const libc::c_char) -> libc::c_int,
+) -> u8 {
+    let args: Vec<CString> = env::args_os()
+        .map(|s| CString::new(s.into_string().unwrap()).unwrap())
+        .collect();
+    let args: Vec<*const libc::c_char> = args.iter().map(|s| s.as_c_str().as_ptr()).collect();
+
+    main_fn(args.len() as libc::c_int, args.as_ptr()) as u8
+}