Imported Upstream version 7.53.1

[platform/upstream/curl.git] / packages / vms / gnv_link_curl.com

diff --git a/packages/vms/gnv_link_curl.com b/packages/vms/gnv_link_curl.com
index fadbbcc..add4be9 100644 (file)
--- a/packages/vms/gnv_link_curl.com
+++ b/packages/vms/gnv_link_curl.com
@@ -173,9 +173,17 @@ $       full_version = f$element(1, " ", hp_ssl_version)
 $       ver_maj = f$element(0, ".", full_version)
 $       ver_min = f$element(1, ".", full_version)
 $       ver_patch = f$element(2, ".", full_version)
+$!      ! ver_patch is typically both a number and some letters
 $       ver_patch_len = f$length(ver_patch)
-$       ver_patchnum = f$extract(0, ver_patch_len - 1, ver_patch)
-$       ver_patchltr = f$extract(ver_patch_len - 1, 1, ver_patch)
+$       ver_patchltr = ""
+$ver_patch_loop:
+$           ver_patchltr_c = f$extract(ver_patch_len - 1, 1, ver_patch)
+$           if ver_patchltr_c .les. "9" then goto ver_patch_loop_end
+$           ver_patchltr = ver_patchltr_c + ver_patchltr
+$           ver_patch_len = ver_patch_len - 1
+$           goto ver_patch_loop
+$ver_patch_loop_end:
+$       ver_patchnum = ver_patch - ver_patchltr
 $       if 'ver_maj' .ge. 0
 $       then
 $           if 'ver_min' .ge. 9
@@ -186,6 +194,7 @@ $                   if ver_patchltr .ges. "w" then use_hp_ssl = 1
 $               endif
 $           endif
 $       endif
+$set nover
 $       if use_hp_ssl .eq. 0
 $       then
 $           write sys$output -
@@ -354,7 +363,6 @@ $ endif
 $!
 $gnv_libcurl_share = "''default_dir'gnv$libcurl.exe"
 $!
-$set ver
 $ if f$search(gnv_libcurl_share) .eqs. ""
 $ then
 $   if arch_name .nes. "VAX"
@@ -408,7 +416,7 @@ $       link'ldebug'/exe=[.src]curl.exe/dsf=[.src]curl.dsf -
            [.src]curl-tool_urlglob.o, [.src]curl-tool_util.o, -
            [.src]curl-tool_vms.o, [.src]curl-tool_writeenv.o, -
            [.src]curl-tool_writeout.o, [.src]curl-tool_xattr.o, -
-           [.src]curl-strtoofft.o, [.src]curl-strdup.o, [.src]curl-rawstr.o, -
+           [.src]curl-strtoofft.o, [.src]curl-strdup.o, [.src]curl-strcase.o, -
            [.src]curl-nonblock.o, gnv_packages_vms:curlmsg.obj,-
            sys$input:/opt
 gnv$libcurl/share
@@ -420,19 +428,17 @@ $   curl_dsf = "[.src]curl.dsf"
 $   curl_main = "[.packages.vms.''arch_name']tool_main.obj"
 $   curl_src = "[.packages.vms.''arch_name']curlsrc.olb"
 $   curl_lib = "[.packages.vms.''arch_name']curllib.olb"
-$   strtoofft = "strtoofft"
-$   strdup = "strdup"
-$   rawstr = "rawstr"
+$   strcase = "strcase"
 $   nonblock = "nonblock"
+$   warnless = "warnless"
 $!
 $!  Extended parse style requires special quoting
 $!
 $   if (arch_name .nes. "VAX") .and. (parse_style .eqs. "EXTENDED")
 $   then
-$       strtoofft = """strtoofft"""
-$       strdup = """strdup"""
-$       rawstr = """rawstr"""
+$       strcase = """strcase"""
 $       nonblock = """nonblock"""
+$       warnless = """warnless"""
 $   endif
 $   if f$search(curl_exe) .eqs. ""
 $   then
@@ -440,7 +446,7 @@ $       define/user gnv$libcurl 'gnv_libcurl_share'
 $       link'ldebug'/exe='curl_exe'/dsf='curl_dsf' -
            'curl_main','curl_src'/lib, -
            'curl_lib'/library/include=-
-           ('strtoofft', 'strdup', 'rawstr', 'nonblock'),-
+           ('strcase','nonblock','warnless'),-
            gnv_packages_vms:curlmsg.obj,-
            sys$input:/opt
 gnv$libcurl/share
@@ -448,7 +454,7 @@ gnv_packages_vms:curl_crtl_init.obj
 $   endif
 $ endif
 $!
-$set nover
+$!
 $!
 $! in6addr_missing so skip building:
 $! [.server]sws.o