os400: make programs and command name configurable

Closes #11547

diff --git a/packages/OS400/config400.default b/packages/OS400/config400.default
index 4c13086b4e906776e26b9d0ee699cf001dc1b57b..91a82771fb9eff350da65430de8ee837e4252278 100644 (file)
--- a/packages/OS400/config400.default
+++ b/packages/OS400/config400.default
@@ -29,6 +29,9 @@ setenv TARGETLIB        'CURL'                  # Target OS/400 program library.
 setenv STATBNDDIR       'CURL_A'                # Static binding directory.
 setenv DYNBNDDIR        'CURL'                  # Dynamic binding directory.
 setenv SRVPGM           "CURL.${SONAME}"        # Service program.
+setenv CURLPGM          'CURL'                  # CLI tool bound program.
+setenv CURLCMD          'CURL'                  # CL command name.
+setenv CURLCLI          'CURLCL'                # CL interface program.
 setenv TGTCCSID         '500'                   # Target CCSID of objects.
 setenv DEBUG            '*ALL'                  # Debug level.
 setenv OPTIMIZE         '10'                    # Optimization level

diff --git a/packages/OS400/curlcl.c b/packages/OS400/curlcl.c
index d4855d806133ac2afabdbb8124d391d9de308050..0a5bc5b82a058383cabbd8390d5487bbafe16515 100644 (file)
--- a/packages/OS400/curlcl.c
+++ b/packages/OS400/curlcl.c
@@ -32,6 +32,10 @@
 #include <miptrnam.h>
 #include <mih/callpgmv.h>
 
+#ifndef CURLPGM
+#define CURLPGM "CURL"
+#endif
+
 
 /* Variable-length string, with 16-bit length. */
 typedef struct {
@@ -158,7 +162,7 @@ main(int argsc, arguments *args)
       exitcode = -2;
     }
     else {
-      _SYSPTR pgmptr = rslvsp(WLI_PGM, (char *) "CURL", library, _AUTH_NONE);
+      _SYSPTR pgmptr = rslvsp(WLI_PGM, (char *) CURLPGM, library, _AUTH_NONE);
       _LU_Work_Area_T *luwrka = (_LU_Work_Area_T *) _LUWRKA();
 
       parse_command_line(args->cmdargs->string, args->cmdargs->len,

diff --git a/packages/OS400/initscript.sh b/packages/OS400/initscript.sh
index 3563a3d588e21c58eb73d3aa4f525ceabcb671e4..c092e1c2d5a60e355a7a7373b8016455a31814ce 100755 (executable)
--- a/packages/OS400/initscript.sh
+++ b/packages/OS400/initscript.sh
@@ -62,11 +62,11 @@ SONAME=`sed -e '/^VERSIONCHANGE=/!d;s/^.*=\([0-9]*\).*/\1/'             \
                                         < "${TOPDIR}/lib/Makefile.soname"`
 export SONAME
 
-#      Get OS/400 configuration parameters.
+#       Get OS/400 configuration parameters.
 
 . "${SCRIPTDIR}/config400.default"
 if [ -f "${SCRIPTDIR}/config400.override" ]
-then   . "${SCRIPTDIR}/config400.override"
+then    . "${SCRIPTDIR}/config400.override"
 fi
 
 #       Need to get the version definitions.

diff --git a/packages/OS400/make-src.sh b/packages/OS400/make-src.sh
index b66ea83e2a08946f7f3f7bf3338872424380cc38..931c1f3359770f452483f8b60b9b1b5320e90fb8 100755 (executable)
--- a/packages/OS400/make-src.sh
+++ b/packages/OS400/make-src.sh
@@ -59,7 +59,7 @@ done
 #       Link modules into program.
 
 MODULES="`echo \"${MODULES}\" | sed \"s/[^ ][^ ]*/${TARGETLIB}\/&/g\"`"
-CMD="CRTPGM PGM(${TARGETLIB}/CURL)"
+CMD="CRTPGM PGM(${TARGETLIB}/${CURLPGM})"
 CMD="${CMD} ENTMOD(${TARGETLIB}/CURLMAIN)"
 CMD="${CMD} MODULE(${MODULES})"
 CMD="${CMD} BNDSRVPGM(${TARGETLIB}/${SRVPGM} QADRTTS)"
@@ -76,14 +76,15 @@ then    mkdir -p "${IFSBIN}"
 fi
 
 rm -f "${IFSBIN}/curl"
-ln -s "/QSYS.LIB/${TARGETLIB}.LIB/CURL.PGM" "${IFSBIN}/curl"
+ln -s "/QSYS.LIB/${TARGETLIB}.LIB/${CURLPGM}.PGM" "${IFSBIN}/curl"
 
 
 #       Create the CL interface program.
 
 if action_needed "${LIBIFSNAME}/CURLCL.PGM" "${SCRIPTDIR}/curlcl.c"
-then    CMD="CRTBNDC PGM(${TARGETLIB}/CURLCL)"
+then    CMD="CRTBNDC PGM(${TARGETLIB}/${CURLCLI})"
         CMD="${CMD} SRCSTMF('${SCRIPTDIR}/curlcl.c')"
+        CMD="${CMD} DEFINE('CURLPGM=\"${CURLPGM}\"')"
         CMD="${CMD} TGTCCSID(${TGTCCSID})"
         CLcommand "${CMD}"
 fi
@@ -91,8 +92,8 @@ fi
 
 #       Create the CL command.
 
-if action_needed "${LIBIFSNAME}/CURL.CMD" "${SCRIPTDIR}/curl.cmd"
-then    CMD="CRTCMD CMD(${TARGETLIB}/CURL) PGM(${TARGETLIB}/CURLCL)"
+if action_needed "${LIBIFSNAME}/${CURLCMD}.CMD" "${SCRIPTDIR}/curl.cmd"
+then    CMD="CRTCMD CMD(${TARGETLIB}/${CURLCMD}) PGM(${TARGETLIB}/${CURLCLI})"
         CMD="${CMD} SRCSTMF('${SCRIPTDIR}/curl.cmd')"
         CLcommand "${CMD}"
 fi