Merge pull request #5673 from larsewi/connect

larsewi · web-flow · commit c234c2a3b49a · 2025-01-06T14:45:46.000+01:00
CFE-4414: `cf-net connect` now exits with 1 in case of error
diff --git a/cf-net/cf-net.c b/cf-net/cf-net.c
@@ -472,7 +472,9 @@ static int CFNetRun(CFNetOptions *opts, char **args, char *hostnames)
     int ret = 0;
     char *hostname = strtok(hosts, ",");
     while (hostname != NULL){
-        CFNetCommandSwitch(opts, hostname, args, cmd);
+        if (CFNetCommandSwitch(opts, hostname, args, cmd) != 0) {
+            ret = -1;
+        }
         hostname = strtok(NULL, ",");
     }
     free(hosts);
@@ -636,8 +638,7 @@ static int CFNetConnect(const char *hostname, const char *use_protocol_version,
         Log(LOG_LEVEL_ERR, "No hostname specified");
         return -1;
     }
-    CFNetConnectSingle(hostname, use_protocol_version, true);
-    return 0;
+    return CFNetConnectSingle(hostname, use_protocol_version, true);
 }
 
 static void CFNetDisconnect(AgentConnection *conn)

Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,9 @@ static int CFNetRun(CFNetOptions opts, char args, char hostnames)`
`472`	`472`	`int ret = 0;`
`473`	`473`	`char *hostname = strtok(hosts, ",");`
`474`	`474`	`while (hostname != NULL){`
`475`		`- CFNetCommandSwitch(opts, hostname, args, cmd);`
	`475`	`+ if (CFNetCommandSwitch(opts, hostname, args, cmd) != 0) {`
	`476`	`+ ret = -1;`
	`477`	`+ }`
`476`	`478`	`hostname = strtok(NULL, ",");`
`477`	`479`	`}`
`478`	`480`	`free(hosts);`
`@@ -636,8 +638,7 @@ static int CFNetConnect(const char hostname, const char use_protocol_version,`
`636`	`638`	`Log(LOG_LEVEL_ERR, "No hostname specified");`
`637`	`639`	`return -1;`
`638`	`640`	`}`
`639`		`- CFNetConnectSingle(hostname, use_protocol_version, true);`
`640`		`- return 0;`
	`641`	`+ return CFNetConnectSingle(hostname, use_protocol_version, true);`
`641`	`642`	`}`
`642`	`643`
`643`	`644`	`static void CFNetDisconnect(AgentConnection *conn)`