diff options
| -rw-r--r-- | vms/munchconfig.c | 7 | ||||
| -rw-r--r-- | vms/subconfigure.com | 85 |
2 files changed, 23 insertions, 69 deletions
diff --git a/vms/munchconfig.c b/vms/munchconfig.c index 714cab7ea5..58c7e7c097 100644 --- a/vms/munchconfig.c +++ b/vms/munchconfig.c @@ -125,10 +125,11 @@ main(int argc, char *argv[]) /* And another over the leading ', which better be there */ *TempValue++ = '\0'; - /* Check to see if there's a trailing '. If not, add a newline to the */ - /* buffer and grab another line. */ + /* Check to see if there's a trailing ' or ". If not, add a newline to + the buffer and grab another line. */ TempLength = strlen(TempValue); - while (TempValue[TempLength-1] != '\'') { + while ((TempValue[TempLength-1] != '\'') && + (TempValue[TempLength-1] != '"')) { fgets(SecondaryLineBuffer, LINEBUFFERSIZE - 1, ConfigSH); /* Force a trailing null, just in case */ SecondaryLineBuffer[LINEBUFFERSIZE - 1] = '\0'; diff --git a/vms/subconfigure.com b/vms/subconfigure.com index 7b6169c587..cb6f12dd4f 100644 --- a/vms/subconfigure.com +++ b/vms/subconfigure.com @@ -53,6 +53,15 @@ $ perl_ranlib="" $ perl_ar="" $ perl_eunicefix=":" $ perl_hint="none" +$ perl_i_arpa_inet="undef" +$ perl_d_grpasswd="undef" +$ perl_d_setgrent="undef" +$ perl_d_getgrent="define" +$ perl_d_endgrent="define" +$ perl_d_pwpasswd="define" +$ perl_d_setpwent="define" +$ perl_d_getpwent="define" +$ perl_d_endpwent="define" $ perl_hintfile="" $ perl_shrplib="define" $ perl_usemymalloc=mymalloc @@ -295,7 +304,7 @@ $ perl_d_bsdgetpgrp="undef" $ perl_d_getpgrp2="undef" $ perl_d_sfio="undef" $ perl_usedl="define" -$ perl_startperl="" +$ perl_startperl="""$ perl 'f$env(\""procedure\"")' 'p1' 'p2' 'p3' 'p4' 'p5' 'p6' 'p7' 'p8' !\n$ exit++ + ++$status != 0 and $exit = $status = undef;""" $ perl_db_hashtype="" $ perl_db_prefixtype="" $ perl_useperlio="undef" @@ -303,14 +312,6 @@ $ perl_defvoidused="15" $ perl_voidflags="15" $ perl_d_eunice="undef" $ perl_d_pwgecos="define" -$ perl_d_pwpasswd="define" -$ perl_d_setpwent="define" -$ perl_d_getpwent="define" -$ perl_d_endpwent="define" -$ perl_d_grpasswd="undef" -$ perl_d_setgrent="undef" -$ perl_d_getgrent="undef" -$ perl_d_endgrent="undef" $ IF ("''Use_Threads'".eqs."T").and.("''VMS_VER'".LES."6.2") $ THEN $ perl_libs="SYS$SHARE:CMA$LIB_SHR.EXE/SHARE SYS$SHARE:CMA$RTL.EXE/SHARE SYS$SHARE:CMA$OPEN_LIB_SHR.exe/SHARE SYS$SHARE:CMA$OPEN_RTL.exe/SHARE" @@ -1044,53 +1045,6 @@ $ perl_i_niin="undef" $ ENDIF $ WRITE_RESULT "i_niin is ''perl_i_niin'" $! -$! Check for <arpa/inet.h> -$! -$ if ("''Has_Dec_C_Sockets'".eqs."T").or.("''Has_Socketshr'".eqs."T") -$ THEN -$ OS -$ WS "#ifdef __DECC -$ WS "#include <stdlib.h> -$ WS "#endif -$ WS "#include <stdio.h> -$ WS "#include <types.h> -$ if ("''Has_Socketshr'".eqs."T") -$ THEN -$ WS "#include <socketshr.h>" -$ else -$ WS "#include <socket.h> -$ endif -$ WS "#include <arpa/inet.h>" -$ WS "int main() -$ WS "{" -$ WS "exit(0); -$ WS "}" -$ CS -$ DEFINE SYS$ERROR _NLA0: -$ DEFINE SYS$OUTPUT _NLA0: -$ on error then continue -$ on warning then continue -$ 'Checkcc' temp -$ If (Needs_Opt.eqs."Yes") -$ THEN -$ link temp,temp/opt -$ else -$ link temp -$ endif -$ teststatus = f$extract(9,1,$status) -$ DEASSIGN SYS$OUTPUT -$ DEASSIGN SYS$ERROR -$ if (teststatus.nes."1") -$ THEN -$ perl_i_arpa_inet="undef" -$ ELSE -$ perl_i_arpa_inet="define" -$ ENDIF -$ ELSE -$ perl_i_arpa_inet="undef" -$ ENDIF -$ WRITE_RESULT "i_arpa_inet is ''perl_i_arpa_inet'" -$! $! Check for endhostent $! $ if ("''Has_Dec_C_Sockets'".eqs."T").or.("''Has_Socketshr'".eqs."T") @@ -2003,7 +1957,6 @@ $ WC "installarchlib='" + perl_installarchlib + "'" $ WC "installsitelib='" + perl_installsitelib + "'" $ WC "installsitearch='" + perl_installsitearch + "'" $ WC "path_sep='" + perl_path_sep + "'" -$ WC "startperl=""$ perl 'f$env(\""procedure\"")' 'p1' 'p2' 'p3' 'p4' 'p5' 'p6' 'p7' 'p8' !\n$ exit++ perl_ + ++$status != 0 and $exit = $status = undef;""" $ WC "vms_cc_type='" + perl_vms_cc_type + "'" $ WC "d_attribut='" + perl_d_attribut + "'" $ WC "cc='" + perl_cc + "'" @@ -2015,7 +1968,6 @@ $ WC "d_gethent='" + perl_d_gethent + "'" $ WC "d_getsent='" + perl_d_getsent + "'" $ WC "d_select='" + perl_d_select + "'" $ WC "i_niin='" + perl_i_niin + "'" -$ WC "i_arpa_inet='" + perl_i_arpa_inet + "'" $ WC "i_neterrno='" + perl_i_neterrno + "'" $ WC "d_stdstdio='" + perl_d_stdstdio + "'" $ WC "d_stdio_ptr_lval='" + perl_d_stdio_ptr_lval + "'" @@ -2268,7 +2220,7 @@ $ WC "d_getpgrp2='" + perl_d_getpgrp2 + "'" $ WC "d_sfio='" + perl_d_sfio + "'" $ WC "d_sigsetjmp='" + perl_d_sigsetjmp + "'" $ WC "usedl='" + perl_usedl + "'" -$ WC "startperl='" + perl_startperl + "'" +$ WC "startperl=" + perl_startperl ! This one's special--no enclosing single quotes $ WC "db_hashtype='" + perl_db_hashtype + "'" $ WC "db_prefixtype='" + perl_db_prefixtype + "'" $ WC "useperlio='" + perl_useperlio + "'" @@ -2330,17 +2282,18 @@ $ WC "d_getnetprotos='" + perl_d_getnetprotos + "'" $ WC "d_getprotoprotos='" + perl_d_getprotoprotos + "'" $ WC "d_getservprotos='" + perl_d_getservprotos + "'" $ WC "d_pwgecos='" + perl_d_pwgecos + "'" -$ WC "d_pwpasswd='" + perl_d_pwpasswd + "'" -$ WC "d_setpwent='" + perl_d_setpwent + "'" -$ WC "d_getpwent='" + perl_d_getpwent + "'" -$ WC "d_endpwent='" + perl_d_endpwent + "'" +$ WC "d_sched_yield='" + perl_d_sched_yield + "'" +$ WC "d_lchown='" + perl_d_lchown + "'" +$ WC "d_union_semun='" + perl_d_union_semun + "'" +$ WC "i_arpa_inet='" + perl_i_arpa_inet + "'" $ WC "d_grpasswd='" + perl_d_grpasswd + "'" $ WC "d_setgrent='" + perl_d_setgrent + "'" $ WC "d_getgrent='" + perl_d_getgrent + "'" $ WC "d_endgrent='" + perl_d_endgrent + "'" -$ WC "d_sched_yield='" + perl_d_sched_yield + "'" -$ WC "d_lchown='" + perl_d_lchown + "'" -$ WC "d_union_semun='" + perl_d_union_semun + "'" +$ WC "d_pwpasswd='" + perl_d_pwpasswd + "'" +$ WC "d_setpwent='" + perl_d_setpwent + "'" +$ WC "d_getpwent='" + perl_d_getpwent + "'" +$ WC "d_endpwent='" + perl_d_endpwent + "'" $ WC "d_semctl_semun='" + perl_d_semctl_semun + "'" $ WC "d_semctl_semid_ds='" + perl_d_semctl_semid_ds + "'" $ WC "extensions='" + perl_extensions + "'" |