Replace %m option with strerror(errno)

knizhnik · knizhnik · commit bd241d8253fb · 2019-01-21T18:49:48.000+03:00
diff --git a/src/utils/file.h b/src/utils/file.h
@@ -49,8 +49,8 @@ typedef enum
 #define FIO_FDMAX 64
 #define FIO_PIPE_MARKER 0x40000000
 
-#define SYS_CHECK(cmd) do if ((cmd) < 0) { elog(ERROR, "%s: %m", #cmd); exit(EXIT_FAILURE); } while (0)
-#define IO_CHECK(cmd, size) do { int _rc = (cmd); if (_rc != (size)) { elog(ERROR, "%s:%d: proceeds %d bytes instead of %d\n", __FILE__, __LINE__, _rc, (int)(size)); exit(EXIT_FAILURE); } } while (0)
+#define SYS_CHECK(cmd) do if ((cmd) < 0) { elog(ERROR, "%s: %s", #cmd, strerror(errno)); exit(EXIT_FAILURE); } while (0)
+#define IO_CHECK(cmd, size) do { int _rc = (cmd); if (_rc != (size)) { elog(ERROR, "%s:%d: proceeds %d bytes instead of %d: %s\n", __FILE__, __LINE__, _rc, (int)(size), strerror(errno)); exit(EXIT_FAILURE); } } while (0)
 
 typedef struct
 {
diff --git a/src/utils/remote.c b/src/utils/remote.c
@@ -138,7 +138,8 @@ int remote_execute(int argc, char* argv[], bool listen)
 		SYS_CHECK(close(errfd[0]));
 		SYS_CHECK(close(errfd[1]));
 
-		SYS_CHECK(execvp(ssh_argv[0], ssh_argv));
+		if (execvp(ssh_argv[0], ssh_argv) < 0)
+			elog(ERROR, "Failed to spawn %s: %s", ssh_argv[0], strerror(errno));
 		return -1;
 	} else {
 		SYS_CHECK(close(infd[1]));  /* These are being used by the child */

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ typedef enum`
`49`	`49`	`#define FIO_FDMAX 64`
`50`	`50`	`#define FIO_PIPE_MARKER 0x40000000`
`51`	`51`
`52`		`-#define SYS_CHECK(cmd) do if ((cmd) < 0) { elog(ERROR, "%s: %m", #cmd); exit(EXIT_FAILURE); } while (0)`
`53`		`-#define IO_CHECK(cmd, size) do { int _rc = (cmd); if (_rc != (size)) { elog(ERROR, "%s:%d: proceeds %d bytes instead of %d\n", __FILE__, __LINE__, _rc, (int)(size)); exit(EXIT_FAILURE); } } while (0)`
	`52`	`+#define SYS_CHECK(cmd) do if ((cmd) < 0) { elog(ERROR, "%s: %s", #cmd, strerror(errno)); exit(EXIT_FAILURE); } while (0)`
	`53`	`+#define IO_CHECK(cmd, size) do { int _rc = (cmd); if (_rc != (size)) { elog(ERROR, "%s:%d: proceeds %d bytes instead of %d: %s\n", __FILE__, __LINE__, _rc, (int)(size), strerror(errno)); exit(EXIT_FAILURE); } } while (0)`
`54`	`54`
`55`	`55`	`typedef struct`
`56`	`56`	`{`