Add support for custom local file transfer commands via PBS_CP variable

doc/man8/pbs.conf.8B

@@ -157,7 +157,10 @@ name.  Cannot contain a colon (":").
 Hostname of primary server.  Used only for failover configuration.  
 Overrides PBS_SERVER_HOST_NAME.
 
-.IP PBS_RCP 
+.IP PBS_CP 
+Location of local copy command. Default is cp on Linux systems and xcopy on Windows.
+
+.IP PBS_RCP
 Location of rcp command if rcp is used.
 
 .IP PBS_SCHEDULER_SERVICE_PORT      

doc/man8/pbs_mom.8B

@@ -1228,10 +1228,10 @@ Default on Windows: value of the
 environment variable 
 
 .IP "$usecp <hostname:source prefix> <destination prefix>" 5
-MoM uses /bin/cp to deliver output files when
-the destination is a network mounted file system, or when
-the source and destination are both on the local host, or when
-the 
+MoM uses /bin/cp or the program specified by PBS_CP to deliver 
+output files when the destination is a network mounted file system, 
+or when the source and destination are both on the local host, or 
+when the 
 .I source prefix 
 can be replaced with the 
 .I destination prefix
@@ -1243,7 +1243,9 @@ and
 .I destination prefix
 are absolute pathnames of directories, not files.  
 
-Overrides 
+Overrides
+.I PBS_CP
+and
 .I PBS_RCP
 and 
 .I PBS_SCP.

src/include/pbs_internal.h

@@ -218,6 +218,7 @@ struct pbs_config
 	char *pbs_exec_path;			/* path to the pbs exec dir */
 	char *pbs_server_name;		/* name of PBS Server, usually hostname of host on which PBS server is executing */
 	char *pbs_server_id;                  /* name of the database PBS server id associated with the server hostname, pbs_server_name */
+	char *cp_path;			/* path to local copy function */
 	char *scp_path;			/* path to ssh */
 	char *rcp_path;			/* path to pbs_rsh */
 	char *pbs_demux_path;			/* path to pbs demux */
@@ -291,6 +292,7 @@ extern struct pbs_config pbs_conf;
 #define PBS_CONF_SERVER_NAME	"PBS_SERVER"	   /* name of the pbs server */
 #define PBS_CONF_INSTALL_MODE    "PBS_INSTALL_MODE" /* PBS installation mode */
 #define PBS_CONF_RCP		"PBS_RCP"
+#define PBS_CONF_CP		"PBS_CP"
 #define PBS_CONF_SCP		"PBS_SCP"		      /* path to ssh */
 #define PBS_CONF_ENVIRONMENT    "PBS_ENVIRONMENT" /* path to pbs_environment */
 #define PBS_CONF_PRIMARY	"PBS_PRIMARY"  /* Primary Server in failover */

src/lib/Libifl/pbs_loadconf.c

@@ -97,6 +97,7 @@ struct pbs_config pbs_conf = {
 	NULL,					/* pbs_exec_path */
 	NULL,					/* pbs_server_name */
 	NULL,					/* PBS server id */
+	NULL,					/* cp_path */
 	NULL,					/* scp_path */
 	NULL,					/* rcp_path */
 	NULL,					/* pbs_demux_path */
@@ -507,6 +508,10 @@ __pbs_loadconf(int reload)
 				free(pbs_conf.scp_path);
 				pbs_conf.scp_path = shorten_and_cleanup_path(conf_value);
 			}
+			else if (!strcmp(conf_name, PBS_CONF_CP)) {
+				free(pbs_conf.cp_path);
+				pbs_conf.cp_path = shorten_and_cleanup_path(conf_value);
+			}
 			/* rcp_path can be inferred from pbs_conf.pbs_exec_path - see below */
 			/* pbs_demux_path is inferred from pbs_conf.pbs_exec_path - see below */
 			else if (!strcmp(conf_name, PBS_CONF_ENVIRONMENT)) {
@@ -698,6 +703,10 @@ __pbs_loadconf(int reload)
 		free(pbs_conf.scp_path);
 		pbs_conf.scp_path = shorten_and_cleanup_path(gvalue);
 	}
+	if ((gvalue = getenv(PBS_CONF_CP)) != NULL) {
+		free(pbs_conf.cp_path);
+		pbs_conf.cp_path = shorten_and_cleanup_path(gvalue);
+	}
 	if ((gvalue = getenv(PBS_CONF_PRIMARY)) != NULL) {
 		free(pbs_conf.pbs_primary);
 		if ((pbs_conf.pbs_primary = strdup(gvalue)) == NULL) {
@@ -919,6 +928,17 @@ __pbs_loadconf(int reload)
 			goto err;
 		}
 	}
+	if (pbs_conf.cp_path == NULL) {
+#ifdef WIN32
+		char *cmd = "xcopy";
+#else
+		char *cmd = "/bin/cp";
+#endif
+		pbs_conf.cp_path = strdup(cmd);
+		if (pbs_conf.cp_path == NULL) {
+			goto err;
+		}
+	}
 
 	free(pbs_conf.pbs_demux_path);
 	/* strlen("/sbin/pbs_demux") + '\0' == 15 + 1 == 16 */
@@ -1040,6 +1060,10 @@ __pbs_loadconf(int reload)
 		free(pbs_conf.scp_path);
 		pbs_conf.scp_path = NULL;
 	}
+	if (pbs_conf.cp_path) {
+		free(pbs_conf.cp_path);
+		pbs_conf.cp_path = NULL;
+	}
 	if (pbs_conf.pbs_environment) {
 		free(pbs_conf.pbs_environment);
 		pbs_conf.pbs_environment = NULL;

src/lib/Libpython/pbs_python_svr_internal.c

@@ -11996,6 +11996,7 @@ pbsv1mod_meth_get_pbs_conf(void)
 		"PBS_EXEC", pbs_conf.pbs_exec_path?pbs_conf.pbs_exec_path:"",
 		"PBS_ENVIRONMENT", pbs_conf.pbs_environment?pbs_conf.pbs_environment:"",
 		"PBS_RCP", pbs_conf.rcp_path?pbs_conf.rcp_path:"",
+		"PBS_CP", pbs_conf.cp_path?pbs_conf.cp_path:"",
 		"PBS_SCP", pbs_conf.scp_path?pbs_conf.scp_path:"",
 		"PBS_MOM_HOME", pbs_conf.pbs_mom_home?pbs_conf.pbs_mom_home:"",
 		"PBS_TMPDIR", pbs_conf.pbs_tmpdir?pbs_conf.pbs_tmpdir:"",

src/resmom/stage_func.c

@@ -1629,7 +1629,7 @@ sys_copy(int dir, int rmtflg, char *owner, char *src, struct rqfpair *pair, int
 	for (loop = 1; loop < 5; ++loop) {
 		original = 0;
 		if (rmtflg == 0) {	/* local copy */
-			ag0 = "/bin/cp";
+			ag0 = pbs_conf.cp_path;
 			if (strcmp(ag3, "/dev/null") == 0)
 				return (0); /* don't need to copy, just return zero */
 			else
@@ -1779,7 +1779,7 @@ sys_copy(int dir, int rmtflg, char *owner, char *src, struct rqfpair *pair, int
 	for (loop = 1; loop < 5; ++loop) {
 		original = 0;
 		if (rmtflg == 0) {	/* local copy */
-			ag0 = "xcopy";
+			ag0 = pbs_conf.cp_path;
 			ag1 = "/e/i/q/y";
 			/* remote, try scp */
 		} else if (pbs_conf.scp_path != NULL && (loop % 2) == 1) {