1 files changed, 9 insertions, 10 deletions
diff --git a/fnet/src/examples/frt/rpc/echo_client.cpp b/fnet/src/examples/frt/rpc/echo_client.cpp
index 61416fb06bd..0176337c466 100644
--- a/fnet/src/examples/frt/rpc/echo_client.cpp
+++ b/fnet/src/examples/frt/rpc/echo_client.cpp
@@ -3,28 +3,28 @@
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/target.h>
 #include <vespa/fnet/frt/rpcrequest.h>
-#include <vespa/fastos/app.h>
+#include <vespa/vespalib/util/signalhandler.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("echo_client");
 
-class EchoClient : public FastOS_Application
+class EchoClient
 {
 public:
-    int Main() override;
+    int main(int argc, char **argv);
 };
 
 int
-EchoClient::Main()
+EchoClient::main(int argc, char **argv)
 {
-    if (_argc < 2) {
+    if (argc < 2) {
         printf("usage  : echo_client <connectspec>\n");
         return 1;
     }
     fnet::frt::StandaloneFRT server;
     FRT_Supervisor & supervisor = server.supervisor();
 
-    FRT_Target *target = supervisor.GetTarget(_argv[1]);
+    FRT_Target *target = supervisor.GetTarget(argv[1]);
     FRT_RPCRequest *req = supervisor.AllocRPCRequest();
     FRT_Values *args = req->GetParams();
     req->SetMethodName("frt.rpc.echo");
@@ -90,9 +90,8 @@ EchoClient::Main()
     return 0;
 }
 
-int
-main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
+    vespalib::SignalHandler::PIPE.ignore();
     EchoClient myapp;
-    return myapp.Entry(argc, argv);
+    return myapp.main(argc, argv);
 }