diff -Nru autogen-5.18.7/aclocal.m4 autogen-5.18.12/aclocal.m4 --- autogen-5.18.7/aclocal.m4 2015-12-07 00:04:11.000000000 +0000 +++ autogen-5.18.12/aclocal.m4 2016-08-29 21:35:41.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,7 +21,7 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # lib-ld.m4 serial 6 -dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -141,7 +141,7 @@ ]) # lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -366,7 +366,7 @@ ]) # longlong.m4 serial 17 -dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc. +dnl Copyright (C) 1999-2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -479,7 +479,7 @@ | (ullmax / ull) | (ullmax % ull));]]) ]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -491,10 +491,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -510,14 +510,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -562,15 +562,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -601,7 +600,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -792,7 +791,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -867,7 +866,7 @@ ]) -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -891,7 +890,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -981,8 +980,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -1055,7 +1054,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -1084,7 +1087,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1095,7 +1098,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -1105,7 +1108,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1126,7 +1129,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1176,7 +1179,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1215,7 +1218,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1244,7 +1247,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1291,7 +1294,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1310,7 +1313,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1391,7 +1394,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1451,7 +1454,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1479,7 +1482,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1498,7 +1501,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru autogen-5.18.7/agen5/agCgi.c autogen-5.18.12/agen5/agCgi.c --- autogen-5.18.7/agen5/agCgi.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/agCgi.c 2016-05-24 18:37:33.000000000 +0000 @@ -7,7 +7,7 @@ * AutoGen process. * * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -24,33 +24,34 @@ */ typedef struct { - char const * pzName; - char * pzValue; -} tNameMap; + char const * name; + char * cgi_val; +} name_map_t; #define ENV_TABLE \ - _ET_(SERVER_SOFTWARE) \ - _ET_(SERVER_NAME) \ - _ET_(GATEWAY_INTERFACE) \ - _ET_(SERVER_PROTOCOL) \ - _ET_(SERVER_PORT) \ _ET_(REQUEST_METHOD) \ - _ET_(PATH_INFO) \ - _ET_(PATH_TRANSLATED) \ - _ET_(SCRIPT_NAME) \ _ET_(QUERY_STRING) \ - _ET_(REMOTE_HOST) \ - _ET_(REMOTE_ADDR) \ + _ET_(CONTENT_LENGTH) \ +\ _ET_(AUTH_TYPE) \ - _ET_(REMOTE_USER) \ - _ET_(REMOTE_IDENT) \ _ET_(CONTENT_TYPE) \ - _ET_(CONTENT_LENGTH) \ + _ET_(GATEWAY_INTERFACE) \ _ET_(HTTP_ACCEPT) \ + _ET_(HTTP_REFERER) \ _ET_(HTTP_USER_AGENT) \ - _ET_(HTTP_REFERER) + _ET_(PATH_INFO) \ + _ET_(PATH_TRANSLATED) \ + _ET_(REMOTE_ADDR) \ + _ET_(REMOTE_HOST) \ + _ET_(REMOTE_IDENT) \ + _ET_(REMOTE_USER) \ + _ET_(SCRIPT_NAME) \ + _ET_(SERVER_NAME) \ + _ET_(SERVER_PORT) \ + _ET_(SERVER_PROTOCOL) \ + _ET_(SERVER_SOFTWARE) -static tNameMap nameValueMap[] = { +static name_map_t name_val_map[] = { #define _ET_(n) { #n, NULL }, ENV_TABLE #undef _ET_ @@ -62,19 +63,26 @@ ENV_TABLE #undef _ET_ NAME_CT -} tNameIdx; +} name_idx_t; + +#define cgi_method name_val_map[ REQUEST_METHOD_IDX ].cgi_val +#define cgi_query name_val_map[ QUERY_STRING_IDX ].cgi_val +#define cgi_len name_val_map[ CONTENT_LENGTH_IDX ].cgi_val -#define pzCgiMethod nameValueMap[ REQUEST_METHOD_IDX ].pzValue -#define pzCgiQuery nameValueMap[ QUERY_STRING_IDX ].pzValue -#define pzCgiLength nameValueMap[ CONTENT_LENGTH_IDX ].pzValue - -/* = = = START-STATIC-FORWARD = = = */ -static char * -parseInput(char * pzSrc, int len); -/* = = = END-STATIC-FORWARD = = = */ + static inline char * +parse_input(char * src, int len) +{ + size_t rsz = (len * 4) + PARSE_INPUT_AG_DEF_STR_LEN; + char * res = AGALOC(rsz, "CGI Defs"); + + memcpy(res, PARSE_INPUT_AG_DEF_STR, PARSE_INPUT_AG_DEF_STR_LEN); + (void)cgi_run_fsm(src, len, res + PARSE_INPUT_AG_DEF_STR_LEN, len * 2); + assert(rsz > strlen(res)); + return AGREALOC(res, strlen(res)+1, "CGI input"); +} LOCAL void -loadCgi(void) +load_cgi(void) { /* * Redirect stderr to a file. If it gets used, we must trap it @@ -103,46 +111,46 @@ * gets an empty string default. */ { - tNameMap * pNM = nameValueMap; - tNameIdx ix = (tNameIdx)0; + name_map_t * nm_map = name_val_map; + name_idx_t ix = (name_idx_t)0; do { - pNM->pzValue = getenv(pNM->pzName); - if (pNM->pzValue == NULL) - pNM->pzValue = (char *)zNil; - } while (pNM++, ++ix < NAME_CT); + nm_map->cgi_val = getenv(nm_map->name); + if (nm_map->cgi_val == NULL) + nm_map->cgi_val = (char *)zNil; + } while (nm_map++, ++ix < NAME_CT); } base_ctx = (scan_ctx_t *)AGALOC(sizeof(scan_ctx_t), "CGI ctx"); memset(VOIDP(base_ctx), 0, sizeof(scan_ctx_t)); { - size_t textLen = strtoul(pzCgiLength, NULL, 0); - char * pzText; + size_t len = strtoul(cgi_len, NULL, 0); + char * text; - if (strcasecmp(pzCgiMethod, "POST") == 0) { - if (textLen == 0) + if (strcasecmp(cgi_method, "POST") == 0) { + if (len == 0) AG_ABEND(LOAD_CGI_NO_DATA_MSG); - pzText = AGALOC(textLen + 1, "CGI POST"); - if (fread(pzText, (size_t)1, textLen, stdin) != textLen) + text = AGALOC(len + 1, "CGI POST"); + if (fread(text, (size_t)1, len, stdin) != len) AG_CANT(LOAD_CGI_READ_NAME, LOAD_CGI_READ_WHAT); - pzText[ textLen ] = NUL; + text[ len ] = NUL; - base_ctx->scx_data = parseInput(pzText, (int)textLen); - AGFREE(pzText); + base_ctx->scx_data = parse_input(text, (int)len); + AGFREE(text); - } else if (strcasecmp(pzCgiMethod, LOAD_CGI_GET_NAME) == 0) { - if (textLen == 0) - textLen = strlen(pzCgiQuery); - base_ctx->scx_data = parseInput(pzCgiQuery, (int)textLen); + } else if (strcasecmp(cgi_method, LOAD_CGI_GET_NAME) == 0) { + if (len == 0) + len = strlen(cgi_query); + base_ctx->scx_data = parse_input(cgi_query, (int)len); } else { - AG_ABEND(aprf(LOAD_CGI_INVAL_REQ_FMT, pzCgiMethod)); + AG_ABEND(aprf(LOAD_CGI_INVAL_REQ_FMT, cgi_method)); /* NOTREACHED */ #ifdef WARNING_WATCH - pzText = NULL; + text = NULL; #endif } } @@ -152,18 +160,6 @@ base_ctx->scx_scan = base_ctx->scx_data; } - -static char * -parseInput(char * pzSrc, int len) -{ -# define defLen (sizeof("Autogen Definitions cgi;\n") - 1) - char * pzRes = AGALOC((len * 2) + defLen + 1, "CGI Definitions"); - - memcpy(pzRes, PARSE_INPUT_AG_DEF_STR, defLen); - (void)cgi_run_fsm(pzSrc, len, pzRes + defLen, len * 2); - return AGREALOC(pzRes, strlen(pzRes)+1, "CGI input"); -} - /* * Local Variables: * mode: C diff -Nru autogen-5.18.7/agen5/agDep.c autogen-5.18.12/agen5/agDep.c --- autogen-5.18.7/agen5/agDep.c 2015-08-09 00:51:04.000000000 +0000 +++ autogen-5.18.12/agen5/agDep.c 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/agInit.c autogen-5.18.12/agen5/agInit.c --- autogen-5.18.7/agen5/agInit.c 2015-08-08 23:33:36.000000000 +0000 +++ autogen-5.18.12/agen5/agInit.c 2016-03-08 17:00:36.000000000 +0000 @@ -10,7 +10,7 @@ */ /* * This file is part of AutoGen. - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/agShell.c autogen-5.18.12/agen5/agShell.c --- autogen-5.18.7/agen5/agShell.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/agShell.c 2016-05-23 15:09:15.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -51,7 +51,7 @@ free(cur_dir); { char const * pz = ag_scm2zchars(dir, zChdirDir); - cur_dir = malloc(AG_SCM_STRLEN(dir) + 1); + cur_dir = malloc(scm_c_string_length(dir) + 1); strcpy((char *)cur_dir, pz); } return dir; @@ -86,19 +86,19 @@ #ifndef SHELL_ENABLED return cmd; #else - if (! AG_SCM_STRING_P(cmd)) { + if (! scm_is_string(cmd)) { static SCM joiner = SCM_UNDEFINED; if (joiner == SCM_UNDEFINED) - joiner = scm_gc_protect_object(AG_SCM_STR02SCM("")); + joiner = scm_gc_protect_object(scm_from_latin1_string("")); cmd = ag_scm_join(joiner, cmd); - if (! AG_SCM_STRING_P(cmd)) + if (! scm_is_string(cmd)) return SCM_UNDEFINED; } { char * pz = shell_cmd(ag_scm2zchars(cmd, "command")); - cmd = AG_SCM_STR02SCM(pz); + cmd = scm_from_latin1_string(pz); AGFREE(pz); return cmd; } @@ -127,7 +127,7 @@ pz = shell_cmd(ag_scm2zchars(fmt, "shell script")); if (pz == NULL) AG_ABEND(SHELL_RES_NULL_MSG); - fmt = AG_SCM_STR02SCM(pz); + fmt = scm_from_latin1_string(pz); AGFREE(pz); #endif return fmt; @@ -202,7 +202,8 @@ (void)kill(serv_id, SIGKILL); serv_id = NULLPROCESS; if (OPT_VALUE_TRACE >= TRACE_SERVER_SHELL) - fprintf(trace_fp, "close_server_shell in %u state\n", processing_state); + fprintf(trace_fp, "close_server_shell in %u state\n", + processing_state); /* * This guard should not be necessary. However, sometimes someone diff -Nru autogen-5.18.7/agen5/ag-text.c autogen-5.18.12/agen5/ag-text.c --- autogen-5.18.7/agen5/ag-text.c 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/ag-text.c 2016-08-29 21:35:43.000000000 +0000 @@ -38,7 +38,7 @@ */ #include "ag-text.h" -char const ag_text_strtable[16320] = +char const ag_text_strtable[16331] = /* 0 */ "ag-text.c\0" /* 10 */ "The '%d' address family cannot be handled\0" /* 52 */ "%s__\0" @@ -329,109 +329,109 @@ " die \"gperf failed on ${gpdir}/%2$s.gperf\n" " `cat %2$s.log`\"\n" "egrep -v '^[^#].*_inline' %2$s-temp.c > %2$s.c\n" - "export CFLAGS=-g\n" + "export CFLAGS=\"$CFLAGS -g\"\n" "%1$s %2$s 1>&2\n" "test $? -eq 0 -a -x ${gperf_%2$s} || \\\n" " die \"could not '%1$s %2$s' gperf program\n" " `cat %2$s.log`\"\n" "exec 2>&8\0" -/* 6331 */ "(define header-file \"%s\") (define header-guard \"%s\")\0" -/* 6384 */ "Could not open license file '%s'\0" -/* 6417 */ "mk_tmp_dir ; echo ${tmp_dir}/ag-XXXXXX\0" -/* 6456 */ "#ifndef %1$s\n" +/* 6341 */ "(define header-file \"%s\") (define header-guard \"%s\")\0" +/* 6394 */ "Could not open license file '%s'\0" +/* 6427 */ "mk_tmp_dir ; echo ${tmp_dir}/ag-XXXXXX\0" +/* 6466 */ "#ifndef %1$s\n" "#define %1$s 1\0" -/* 6484 */ "%s may not exceed %d chars\n\0" -/* 6512 */ "owner length\0" -/* 6525 */ "prefix length\0" -/* 6539 */ "program name length\0" -/* 6559 */ "license name is not a string\0" -/* 6588 */ "There is no %s license.\0" -/* 6612 */ "\0" -/* 6620 */ "\0" -/* 6626 */ "\0" -/* 6636 */ "\0" -/* 6644 */ "no macro arg name\0" -/* 6662 */ "\n\0" -/* 6664 */ "Invalid template file: %s\0" -/* 6690 */ "ERROR: %s is not a string\n\0" -/* 6717 */ "expressionless IF\0" -/* 6735 */ "no\0" -/* 6738 */ "no template was specified\0" -/* 6764 */ "NULL file name\0" -/* 6779 */ "null\0" -/* 6784 */ "open for output\0" -/* 6800 */ "unlink\0" -/* 6807 */ "* temp file *\0" -/* 6821 */ "On macro argument # %d:\n" +/* 6494 */ "%s may not exceed %d chars\n\0" +/* 6522 */ "owner length\0" +/* 6535 */ "prefix length\0" +/* 6549 */ "program name length\0" +/* 6569 */ "license name is not a string\0" +/* 6598 */ "There is no %s license.\0" +/* 6622 */ "\0" +/* 6630 */ "\0" +/* 6636 */ "\0" +/* 6646 */ "\0" +/* 6654 */ "no macro arg name\0" +/* 6672 */ "\n\0" +/* 6674 */ "Invalid template file: %s\0" +/* 6700 */ "ERROR: %s is not a string\n\0" +/* 6727 */ "expressionless IF\0" +/* 6745 */ "no\0" +/* 6748 */ "no template was specified\0" +/* 6774 */ "NULL file name\0" +/* 6789 */ "null\0" +/* 6794 */ "open for output\0" +/* 6810 */ "unlink\0" +/* 6817 */ "* temp file *\0" +/* 6831 */ "On macro argument # %d:\n" "%s\n\0" -/* 6849 */ "Cannot format file name: \"%s\", %s, %s\0" -/* 6888 */ "No output file specified to add to\0" -/* 6923 */ "failed to create temp file from %s\0" -/* 6958 */ "ERROR: no output file was suspended as '%s'\n\0" -/* 7003 */ "ERROR: Cannot pop output with no output pushed\0" -/* 7051 */ "%s '%s'\n\0" -/* 7060 */ "open 'wb+'\0" -/* 7071 */ "freopen\0" -/* 7079 */ "Autogen Definitions cgi;\n\0" -/* 7105 */ "AF_UNIX path exceeds %d\0" -/* 7129 */ "stdin\0" -/* 7135 */ "dup2\0" -/* 7140 */ "%s-in\0" -/* 7146 */ "%s-out\0" -/* 7153 */ "fork\0" -/* 7158 */ "mkfifo\0" -/* 7165 */ "poll\0" -/* 7170 */ "write\0" -/* 7176 */ "Invalid port number: '%s'\0" -/* 7203 */ "Starting %s template\n\0" -/* 7225 */ "pseudo-macro\0" -/* 7238 */ "BROKEN FSM STATE\0" -/* 7255 */ "The INVOKE macro requires a name\0" -/* 7288 */ "The INVOKE macro name not space separated\0" -/* 7330 */ "%s%s[%u] (%s) from %s/%d at %p\n\0" -/* 7362 */ " \0" -/* 7395 */ "start marker contained in end marker\0" -/* 7432 */ "start/end macro mark too long\0" -/* 7462 */ "end marker contained in start marker\0" -/* 7499 */ "bad template marker in %s on line %d:\n" +/* 6859 */ "Cannot format file name: \"%s\", %s, %s\0" +/* 6898 */ "No output file specified to add to\0" +/* 6933 */ "failed to create temp file from %s\0" +/* 6968 */ "ERROR: no output file was suspended as '%s'\n\0" +/* 7013 */ "ERROR: Cannot pop output with no output pushed\0" +/* 7061 */ "%s '%s'\n\0" +/* 7070 */ "open 'wb+'\0" +/* 7081 */ "freopen\0" +/* 7089 */ "Autogen Definitions cgi;\n\0" +/* 7115 */ "AF_UNIX path exceeds %d\0" +/* 7139 */ "stdin\0" +/* 7145 */ "dup2\0" +/* 7150 */ "%s-in\0" +/* 7156 */ "%s-out\0" +/* 7163 */ "fork\0" +/* 7168 */ "mkfifo\0" +/* 7175 */ "poll\0" +/* 7180 */ "write\0" +/* 7186 */ "Invalid port number: '%s'\0" +/* 7213 */ "Starting %s template\n\0" +/* 7235 */ "pseudo-macro\0" +/* 7248 */ "BROKEN FSM STATE\0" +/* 7265 */ "The INVOKE macro requires a name\0" +/* 7298 */ "The INVOKE macro name not space separated\0" +/* 7340 */ "%s%s[%u] (%s) from %s/%d at %p\n\0" +/* 7372 */ " \0" +/* 7405 */ "start marker contained in end marker\0" +/* 7442 */ "start/end macro mark too long\0" +/* 7472 */ "end marker contained in start marker\0" +/* 7509 */ "bad template marker in %s on line %d:\n" "\t%s\0" -/* 7541 */ "invalid edit mode marker\0" -/* 7566 */ "need autogen5 marker\0" -/* 7587 */ "need end marker\0" -/* 7603 */ "need end of line\0" -/* 7620 */ "need start marker\0" -/* 7638 */ "need template marker\0" -/* 7659 */ "broken pseudo-macro FSM\0" -/* 7683 */ "-*-\0" -/* 7687 */ "*template file*\0" -/* 7703 */ "@@ No-Definitions @@\0" -/* 7724 */ "open non-regular file\0" -/* 7746 */ "stat\0" -/* 7751 */ "No definition data were read\0" -/* 7780 */ "REQUEST_METHOD\0" -/* 7795 */ "** EXACT **\0" -/* 7807 */ "** INEXACT **\0" -/* 7821 */ "** LIST **\0" -/* 7832 */ "** Pair **\0" -/* 7843 */ "** Procedure 0x%08lX **\0" -/* 7867 */ "** UNKNOWN **\0" -/* 7881 */ "** Vector **\0" -/* 7894 */ "RETURN out of context\0" -/* 7916 */ "realloc of %zd bytes at 0x%p failed\n\0" -/* 7953 */ "attempt to remove unrecorded def entry\n\0" -/* 7993 */ "test -n \"${gperf_%1$s}\" || \\\n" +/* 7551 */ "invalid edit mode marker\0" +/* 7576 */ "need autogen5 marker\0" +/* 7597 */ "need end marker\0" +/* 7613 */ "need end of line\0" +/* 7630 */ "need start marker\0" +/* 7648 */ "need template marker\0" +/* 7669 */ "broken pseudo-macro FSM\0" +/* 7693 */ "-*-\0" +/* 7697 */ "*template file*\0" +/* 7713 */ "@@ No-Definitions @@\0" +/* 7734 */ "open non-regular file\0" +/* 7756 */ "stat\0" +/* 7761 */ "No definition data were read\0" +/* 7790 */ "REQUEST_METHOD\0" +/* 7805 */ "** EXACT **\0" +/* 7817 */ "** INEXACT **\0" +/* 7831 */ "** LIST **\0" +/* 7842 */ "** Pair **\0" +/* 7853 */ "** Procedure 0x%08lX **\0" +/* 7877 */ "** UNKNOWN **\0" +/* 7891 */ "** Vector **\0" +/* 7904 */ "RETURN out of context\0" +/* 7926 */ "realloc of %zd bytes at 0x%p failed\n\0" +/* 7963 */ "attempt to remove unrecorded def entry\n\0" +/* 8003 */ "test -n \"${gperf_%1$s}\" || \\\n" " die 'no environment variable \"gperf_%1$s\"'\n" "test -x \"${gperf_%1$s}\" || \\\n" " die \"no gperf program named ${gperf_%1$s}\"\n" "${gperf_%1$s} %2$s\0" -/* 8165 */ "%s ERROR: %s processing printf format:\n" +/* 8175 */ "%s ERROR: %s processing printf format:\n" "\t%s\n\0" -/* 8210 */ "Bad args to sprintf\0" -/* 8230 */ "ice-9 debug\0" -/* 8242 */ "system vm trace\0" -/* 8258 */ "Scheme evaluation error. AutoGen ABEND-ing in template\n" +/* 8220 */ "Bad args to sprintf\0" +/* 8240 */ "ice-9 debug\0" +/* 8252 */ "system vm trace\0" +/* 8268 */ "Scheme evaluation error. AutoGen ABEND-ing in template\n" "\t%s on line %d\n\0" -/* 8330 */ "(use-modules (ice-9 common-list))\n" +/* 8340 */ "(use-modules (ice-9 common-list))\n" "(define identifier?\n" "(lambda (x) (or (string? x) (symbol? x))))\n" "(define normalize-identifier\n" @@ -486,7 +486,7 @@ "(define tmp-dir \"\")\n" "(define header-file \"\")\n" "(define header-guard \"\")\n" - "(define autogen-version \"5.18.7\")\n" + "(define autogen-version \"5.18.12\")\n" "(define c-file-line-fmt \"#line %2$d \\\"%1$s\\\"\\n\")\n" "(define-macro (defined-as predicate symbol)\n" "`(and (defined? ',symbol) (,predicate ,symbol)))\n" @@ -559,29 +559,29 @@ "(define stack-join (lambda (j-str ag-name)\n" "(join j-str (stack ag-name))))\n" "(version)\0" -/* 12258 */ "scm_string_length returned wrong value: %d != %d\n\0" -/* 12308 */ "\n" +/* 12269 */ "scm_string_length returned wrong value: %d != %d\n\0" +/* 12319 */ "\n" "Guile/Scheme evaluation error in %s line %d: %s\n\0" -/* 12359 */ "#f\0" -/* 12362 */ "...\0" -/* 12366 */ "re-read output\0" -/* 12381 */ "(*)()\0" -/* 12387 */ "#t\0" -/* 12390 */ "%s%s\0" -/* 12395 */ "shell_cmd result is NULL\0" -/* 12420 */ "ERROR: Cannot pop output with no output pushed\n\0" -/* 12469 */ "SERVER RESTART: serv_id is NULLPROCESS\n\0" -/* 12510 */ "cannot allocate path name\0" -/* 12536 */ "(set! tmp-dir \"%1$s\")\n" +/* 12370 */ "#f\0" +/* 12373 */ "...\0" +/* 12377 */ "re-read output\0" +/* 12392 */ "(*)()\0" +/* 12398 */ "#t\0" +/* 12401 */ "%s%s\0" +/* 12406 */ "shell_cmd result is NULL\0" +/* 12431 */ "ERROR: Cannot pop output with no output pushed\n\0" +/* 12480 */ "SERVER RESTART: serv_id is NULLPROCESS\n\0" +/* 12521 */ "cannot allocate path name\0" +/* 12547 */ "(set! tmp-dir \"%1$s\")\n" "(add-cleanup \"test \\\"${VERBOSE:-false}\\\" = true || rm -rf %1$s\")\0" -/* 12623 */ "Warning: (set-writable) function in %s on line %d:\n" +/* 12634 */ "Warning: (set-writable) function in %s on line %d:\n" "\toverridden by invocation option\n\0" -/* 12708 */ "cd %s\n" +/* 12719 */ "cd %s\n" "%s\n\n" "echo\n" "echo %s - %d\n\0" -/* 12737 */ "Closing server: %s signal (%d) received\n\0" -/* 12779 */ "exec 8>&2 2>/dev/null\n\n" +/* 12748 */ "Closing server: %s signal (%d) received\n\0" +/* 12790 */ "exec 8>&2 2>/dev/null\n\n" "if test -n \"${ZSH_VERSION+set}\" && (emulate sh) 1>&2\n" "then\n" " emulate sh\n" @@ -640,114 +640,114 @@ "AG_pid=\"%u\"\n" "AGexe='%s'\n\n" "exec 2>&8\0" -/* 14033 */ "\n" +/* 14044 */ "\n" "Last command issued:\n\0" -/* 14056 */ "feof on data load\n\0" -/* 14075 */ "\n" +/* 14067 */ "feof on data load\n\0" +/* 14086 */ "\n" "Server Restart\n\0" -/* 14092 */ "(result discarded)\n\0" -/* 14112 */ "PS4=>${FUNCNAME:-ag}> \0" -/* 14135 */ "fs err %d (%s) reading from server shell\n\0" -/* 14177 */ "set -x\n" +/* 14103 */ "(result discarded)\n\0" +/* 14123 */ "PS4=>${FUNCNAME:-ag}> \0" +/* 14146 */ "fs err %d (%s) reading from server shell\n\0" +/* 14188 */ "set -x\n" "trap\n" "echo server setup done\n\0" -/* 14213 */ "ShElL-OuTpUt-HaS-bEeN-cOmPlEtEd\0" -/* 14245 */ "# Makefile dependency file created by:\t\t-*- Mode: Makefile -*-\n" +/* 14224 */ "ShElL-OuTpUt-HaS-bEeN-cOmPlEtEd\0" +/* 14256 */ "# Makefile dependency file created by:\t\t-*- Mode: Makefile -*-\n" "# %s\n" "# with the following command line arguments:\n\0" -/* 14359 */ "# %s\0" -/* 14366 */ "fopen for write\0" -/* 14382 */ "'(\0" -/* 14385 */ "strdup of %d byte string failed\n\0" -/* 14418 */ "cannot map unprintable chars to C name chars\0" -/* 14463 */ "ag_scm_string_to_c_name_x\0" -/* 14489 */ "Server shell timed out 5 times\0" -/* 14520 */ "syscall\0" -/* 14528 */ "\tfrom %s line %d\n\0" -/* 14546 */ ".d-XXXXXX\0" -/* 14556 */ "template\0" -/* 14565 */ "add source dep: %s\n\0" -/* 14586 */ "add target dep: %s\n\0" -/* 14607 */ "Template macro %s invoked with %d args\n\0" -/* 14647 */ "Warning in template %s, line %d\n" +/* 14370 */ "# %s\0" +/* 14377 */ "fopen for write\0" +/* 14393 */ "'(\0" +/* 14396 */ "strdup of %d byte string failed\n\0" +/* 14429 */ "cannot map unprintable chars to C name chars\0" +/* 14474 */ "ag_scm_string_to_c_name_x\0" +/* 14500 */ "Server shell timed out 5 times\0" +/* 14531 */ "syscall\0" +/* 14539 */ "\tfrom %s line %d\n\0" +/* 14557 */ ".d-XXXXXX\0" +/* 14567 */ "template\0" +/* 14576 */ "add source dep: %s\n\0" +/* 14597 */ "add target dep: %s\n\0" +/* 14618 */ "Template macro %s invoked with %d args\n\0" +/* 14658 */ "Warning in template %s, line %d\n" "\t%s\n\0" -/* 14684 */ "Adding '%s' to environment\n\0" -/* 14712 */ "CASE string `%s' did not match\n\0" -/* 14744 */ "CASE string `%s' %s matched `%s'\n\0" -/* 14778 */ "CASE no match: `%s' %s vs. `%s'\n\0" -/* 14811 */ " '%s'\0" -/* 14817 */ "eval for arg %d:\n" +/* 14695 */ "Adding '%s' to environment\n\0" +/* 14723 */ "CASE string `%s' did not match\n\0" +/* 14755 */ "CASE string `%s' %s matched `%s'\n\0" +/* 14789 */ "CASE no match: `%s' %s vs. `%s'\n\0" +/* 14822 */ " '%s'\0" +/* 14828 */ "eval for arg %d:\n" "\t`%s'\n\0" -/* 14841 */ "marker '%s' loaded\n\0" -/* 14861 */ "Definition Load:\n\0" -/* 14879 */ " in \"%s\" -- \0" -/* 14892 */ "FOR %s repeated %d times\n\0" -/* 14918 */ "eval from file %s line %d:\n" +/* 14852 */ "marker '%s' loaded\n\0" +/* 14872 */ "Definition Load:\n\0" +/* 14890 */ " in \"%s\" -- \0" +/* 14903 */ "FOR %s repeated %d times\n\0" +/* 14929 */ "eval from file %s line %d:\n" "%s\n\0" -/* 14949 */ "FOR %s loop in %s on line %d begins:\n\0" -/* 14987 */ "FOR loop skipped - no definition for `%s'\n\0" -/* 15030 */ "IF expression `%s' on line %d yielded true\n\0" -/* 15074 */ "IF `%s' macro selected no clause\n\0" -/* 15108 */ "Template %s included\n\0" -/* 15130 */ "\tbased on %s\n\0" -/* 15144 */ "Expr\0" -/* 15149 */ "Invoke\0" -/* 15156 */ "remapped to '%s' (%2X) in %s at line %d\n\0" -/* 15197 */ "WHILE macro repeated %d times\n\0" -/* 15228 */ "WHILE `%s' loop in %s on line %d begins:\n\0" -/* 15270 */ "\texiting FOR %s from %d to %d by %d:\n" +/* 14960 */ "FOR %s loop in %s on line %d begins:\n\0" +/* 14998 */ "FOR loop skipped - no definition for `%s'\n\0" +/* 15041 */ "IF expression `%s' on line %d yielded true\n\0" +/* 15085 */ "IF `%s' macro selected no clause\n\0" +/* 15119 */ "Template %s included\n\0" +/* 15141 */ "\tbased on %s\n\0" +/* 15155 */ "Expr\0" +/* 15160 */ "Invoke\0" +/* 15167 */ "remapped to '%s' (%2X) in %s at line %d\n\0" +/* 15208 */ "WHILE macro repeated %d times\n\0" +/* 15239 */ "WHILE `%s' loop in %s on line %d begins:\n\0" +/* 15281 */ "\texiting FOR %s from %d to %d by %d:\n" "\tmore than %d iterations\n\0" -/* 15333 */ "too many FOR iterations in %s line %d\n\0" -/* 15372 */ "Defining macro %s from %s\n\0" -/* 15399 */ "%-10s (%2X) in %s at line %d\n\0" -/* 15429 */ "Compiling '%s' with bits 0x%lX\n\0" -/* 15461 */ "\n" +/* 15344 */ "too many FOR iterations in %s line %d\n\0" +/* 15383 */ "Defining macro %s from %s\n\0" +/* 15410 */ "%-10s (%2X) in %s at line %d\n\0" +/* 15440 */ "Compiling '%s' with bits 0x%lX\n\0" +/* 15472 */ "\n" "= = = RESULT %d bytes:\n" "%s%s\n" "= = = = = = = = = = = = = = =\n\0" -/* 15521 */ "\n" +/* 15532 */ "\n" "Guile Library Version %s\n\0" -/* 15548 */ "searching for `%s'\0" -/* 15567 */ "%s %s to %s\n\0" -/* 15580 */ "%s '%s' mode %s\n\0" -/* 15597 */ "NOTE: skipping file '%s'\n\0" -/* 15624 */ "%s -- temp file %s\n\0" -/* 15644 */ "%s from %s to '%s'\n\0" -/* 15664 */ "%s %s%s\n\0" -/* 15673 */ "%s %s from '%s'\n\0" -/* 15690 */ "remove source dep: %s\n\0" -/* 15714 */ "remove target dep: %s\n\0" -/* 15738 */ "\n" +/* 15559 */ "searching for `%s'\0" +/* 15578 */ "%s %s to %s\n\0" +/* 15591 */ "%s '%s' mode %s\n\0" +/* 15608 */ "NOTE: skipping file '%s'\n\0" +/* 15635 */ "%s -- temp file %s\n\0" +/* 15655 */ "%s from %s to '%s'\n\0" +/* 15675 */ "%s %s%s\n\0" +/* 15684 */ "%s %s from '%s'\n\0" +/* 15701 */ "remove source dep: %s\n\0" +/* 15725 */ "remove target dep: %s\n\0" +/* 15749 */ "\n" "Server First Start\n\0" -/* 15759 */ "Server shell is pid %u\n\0" -/* 15783 */ "Server shell %s starts\n\0" -/* 15807 */ "\n\n" +/* 15770 */ "Server shell is pid %u\n\0" +/* 15794 */ "Server shell %s starts\n\0" +/* 15818 */ "\n\n" "===AutoGen starts - %u: %s\0" -/* 15837 */ "%s %s as '%s'\n\0" -/* 15852 */ "Trap state:\n" +/* 15848 */ "%s %s as '%s'\n\0" +/* 15863 */ "Trap state:\n" "%s\n\0" -/* 15868 */ "\tcode %lX -- %s\n\0" -/* 15885 */ "0x%016llX <<== '%s'\n\0" -/* 15906 */ "Server traps set\n\0" -/* 15924 */ "true\0" -/* 15929 */ "uname(2)\0" -/* 15938 */ "invalid make dependency option: %s\0" -/* 15974 */ "echo 'definition names looked up'\n" +/* 15879 */ "\tcode %lX -- %s\n\0" +/* 15896 */ "0x%016llX <<== '%s'\n\0" +/* 15917 */ "Server traps set\n\0" +/* 15935 */ "true\0" +/* 15940 */ "uname(2)\0" +/* 15949 */ "invalid make dependency option: %s\0" +/* 15985 */ "echo 'definition names looked up'\n" "sed 's/[-^]/-/g'|sort -u -f\n" "echo 'end of looked up definitions'\0" -/* 16072 */ "%s\n\0" -/* 16076 */ "WARNING: %s\n\0" -/* 16089 */ "Warning\0" -/* 16097 */ "format\0" -/* 16104 */ "yes\0" -/* 16108 */ "'%s'\n\0" -/* 16114 */ "%s: in %s on line %d\n" +/* 16083 */ "%s\n\0" +/* 16087 */ "WARNING: %s\n\0" +/* 16100 */ "Warning\0" +/* 16108 */ "format\0" +/* 16115 */ "yes\0" +/* 16119 */ "'%s'\n\0" +/* 16125 */ "%s: in %s on line %d\n" "\ttoken in error: %s\n" "\t[[...]] %s\n\n" "Likely causes: a mismatched quote, a value that needs quoting,\n" "\t\tor a missing semi-colon\n\0" -/* 16273 */ "%s: ''%s''\n\0" -/* 16286 */ "unterminated quote in definition\0" -/* 16319 */ ""; +/* 16284 */ "%s: ''%s''\n\0" +/* 16297 */ "unterminated quote in definition\0" +/* 16330 */ ""; /* end of ag-text.c */ diff -Nru autogen-5.18.7/agen5/ag-text.def autogen-5.18.12/agen5/ag-text.def --- autogen-5.18.7/agen5/ag-text.def 2015-08-09 00:51:04.000000000 +0000 +++ autogen-5.18.12/agen5/ag-text.def 2016-05-27 20:38:31.000000000 +0000 @@ -2,7 +2,7 @@ # ag-text.def: autogen text strings */ /* This file is part of AutoGen. - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -494,7 +494,7 @@ die "gperf failed on ${gpdir}/%2$s.gperf `cat %2$s.log`" egrep -v '^[^#].*_inline' %2$s-temp.c > %2$s.c - export CFLAGS=-g + export CFLAGS="$CFLAGS -g" %1$s %2$s 1>&2 test $? -eq 0 -a -x ${gperf_%2$s} || \ die "could not '%1$s %2$s' gperf program @@ -537,7 +537,7 @@ string = { nm = OUTPUT_NO_OPEN; str = "open for output"; }; string = { nm = OUTPUT_NO_UNLINK; str = "unlink"; }; string = { nm = OUTPUT_TEMP_FILE; str = "* temp file *"; }; -string = { nm = NAMED_VALUES_WHERE; str = "On macro argument # %d:\n%s\n";}; +string = { nm = NAMED_VALUES_WHERE; str = "On macro argument # %d:\n%s\n";}; string = { nm = OPEN_OUTPUT_BAD_FMT; str = "Cannot format file name: \"%s\", %s, %s"; }; @@ -913,7 +913,7 @@ string = { nm = TRACE_SHELL_FIRST_START; str = "\nServer First Start\n"; }; string = { nm = TRACE_SHELL_PID_FMT; str = "Server shell is pid %u\n"; }; string = { nm = TRACE_SHELL_STARTS_FMT; str = "Server shell %s starts\n"; }; -string = { nm = TRACE_START_FMT; str = "\n\n===AutoGen starts - %u: %s"; }; +string = { nm = TRACE_START_FMT; str = "\n\n===AutoGen starts - %u: %s"; }; string = { nm = TRACE_SUSPEND; str = "%s %s as '%s'\n"; }; string = { nm = TRACE_TRAP_STATE_FMT; str = "Trap state:\n%s\n"; }; string = { nm = TRACE_UNKNOWN_FMT; str = "\tcode %lX -- %s\n"; }; diff -Nru autogen-5.18.7/agen5/ag-text.h autogen-5.18.12/agen5/ag-text.h --- autogen-5.18.7/agen5/ag-text.h 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/ag-text.h 2016-08-29 21:35:43.000000000 +0000 @@ -446,272 +446,272 @@ #define MKSTEMP_FAIL_FMT (ag_text_strtable+4860) #define MKSTEMP_FAIL_FMT_LEN 22 #define MK_GPERF_SCRIPT (ag_text_strtable+5153) -#define MK_GPERF_SCRIPT_LEN 1177 -#define MK_HEAD_GUARD_GUARD (ag_text_strtable+6456) +#define MK_GPERF_SCRIPT_LEN 1187 +#define MK_HEAD_GUARD_GUARD (ag_text_strtable+6466) #define MK_HEAD_GUARD_GUARD_LEN 27 -#define MK_HEAD_GUARD_SCM (ag_text_strtable+6331) +#define MK_HEAD_GUARD_SCM (ag_text_strtable+6341) #define MK_HEAD_GUARD_SCM_LEN 52 -#define MK_LIC_BIG_OWN (ag_text_strtable+6512) +#define MK_LIC_BIG_OWN (ag_text_strtable+6522) #define MK_LIC_BIG_OWN_LEN 12 -#define MK_LIC_BIG_PFX (ag_text_strtable+6525) +#define MK_LIC_BIG_PFX (ag_text_strtable+6535) #define MK_LIC_BIG_PFX_LEN 13 -#define MK_LIC_BIG_PROG (ag_text_strtable+6539) +#define MK_LIC_BIG_PROG (ag_text_strtable+6549) #define MK_LIC_BIG_PROG_LEN 19 -#define MK_LIC_NOT_STR (ag_text_strtable+6559) +#define MK_LIC_NOT_STR (ag_text_strtable+6569) #define MK_LIC_NOT_STR_LEN 28 -#define MK_LIC_NO_LIC (ag_text_strtable+6588) +#define MK_LIC_NO_LIC (ag_text_strtable+6598) #define MK_LIC_NO_LIC_LEN 23 -#define MK_LIC_NO_OPEN (ag_text_strtable+6384) +#define MK_LIC_NO_OPEN (ag_text_strtable+6394) #define MK_LIC_NO_OPEN_LEN 32 -#define MK_LIC_OWN (ag_text_strtable+6612) +#define MK_LIC_OWN (ag_text_strtable+6622) #define MK_LIC_OWN_LEN 7 -#define MK_LIC_PFX (ag_text_strtable+6620) +#define MK_LIC_PFX (ag_text_strtable+6630) #define MK_LIC_PFX_LEN 5 -#define MK_LIC_PROG (ag_text_strtable+6626) +#define MK_LIC_PROG (ag_text_strtable+6636) #define MK_LIC_PROG_LEN 9 #define MK_LIC_SFX (ag_text_strtable+3110) #define MK_LIC_SFX_LEN 3 -#define MK_LIC_TOO_BIG_FMT (ag_text_strtable+6484) +#define MK_LIC_TOO_BIG_FMT (ag_text_strtable+6494) #define MK_LIC_TOO_BIG_FMT_LEN 27 -#define MK_LIC_YRS (ag_text_strtable+6636) +#define MK_LIC_YRS (ag_text_strtable+6646) #define MK_LIC_YRS_LEN 7 -#define MK_TMP_DIR_CMD (ag_text_strtable+6417) +#define MK_TMP_DIR_CMD (ag_text_strtable+6427) #define MK_TMP_DIR_CMD_LEN 38 -#define NAMED_VALUES_NO_NAME (ag_text_strtable+6644) +#define NAMED_VALUES_NO_NAME (ag_text_strtable+6654) #define NAMED_VALUES_NO_NAME_LEN 17 -#define NAMED_VALUES_WHERE (ag_text_strtable+6821) +#define NAMED_VALUES_WHERE (ag_text_strtable+6831) #define NAMED_VALUES_WHERE_LEN 27 -#define NEWLINE (ag_text_strtable+6662) +#define NEWLINE (ag_text_strtable+6672) #define NEWLINE_LEN 1 -#define NEXT_PM_TOKEN_INVALID (ag_text_strtable+6664) +#define NEXT_PM_TOKEN_INVALID (ag_text_strtable+6674) #define NEXT_PM_TOKEN_INVALID_LEN 25 -#define NOT_STR_FMT (ag_text_strtable+6690) +#define NOT_STR_FMT (ag_text_strtable+6700) #define NOT_STR_FMT_LEN 26 -#define NO_IF_EXPR (ag_text_strtable+6717) +#define NO_IF_EXPR (ag_text_strtable+6727) #define NO_IF_EXPR_LEN 17 -#define NO_NAME_STR (ag_text_strtable+6735) +#define NO_NAME_STR (ag_text_strtable+6745) #define NO_NAME_STR_LEN 2 -#define NO_TEMPLATE_ERR_MSG (ag_text_strtable+6738) +#define NO_TEMPLATE_ERR_MSG (ag_text_strtable+6748) #define NO_TEMPLATE_ERR_MSG_LEN 25 -#define NULL_FILE_NAME_STR (ag_text_strtable+6764) +#define NULL_FILE_NAME_STR (ag_text_strtable+6774) #define NULL_FILE_NAME_STR_LEN 14 -#define OPEN_OUTPUT_BAD_FMT (ag_text_strtable+6849) +#define OPEN_OUTPUT_BAD_FMT (ag_text_strtable+6859) #define OPEN_OUTPUT_BAD_FMT_LEN 38 -#define OPEN_OUTPUT_NULL (ag_text_strtable+6779) +#define OPEN_OUTPUT_NULL (ag_text_strtable+6789) #define OPEN_OUTPUT_NULL_LEN 4 -#define OUTPUT_NO_OPEN (ag_text_strtable+6784) +#define OUTPUT_NO_OPEN (ag_text_strtable+6794) #define OUTPUT_NO_OPEN_LEN 15 -#define OUTPUT_NO_UNLINK (ag_text_strtable+6800) +#define OUTPUT_NO_UNLINK (ag_text_strtable+6810) #define OUTPUT_NO_UNLINK_LEN 6 -#define OUTPUT_TEMP_FILE (ag_text_strtable+6807) +#define OUTPUT_TEMP_FILE (ag_text_strtable+6817) #define OUTPUT_TEMP_FILE_LEN 13 -#define OUT_ADD_INVALID (ag_text_strtable+6888) +#define OUT_ADD_INVALID (ag_text_strtable+6898) #define OUT_ADD_INVALID_LEN 34 -#define OUT_CLOSE_TRACE_WRAP (ag_text_strtable+7051) +#define OUT_CLOSE_TRACE_WRAP (ag_text_strtable+7061) #define OUT_CLOSE_TRACE_WRAP_LEN 8 -#define OUT_PUSH_NEW_FAIL (ag_text_strtable+7060) -#define OUT_PUSH_NEW_FAILED (ag_text_strtable+6923) +#define OUT_PUSH_NEW_FAIL (ag_text_strtable+7070) +#define OUT_PUSH_NEW_FAILED (ag_text_strtable+6933) #define OUT_PUSH_NEW_FAILED_LEN 34 #define OUT_PUSH_NEW_FAIL_LEN 10 -#define OUT_RESUME_CANNOT (ag_text_strtable+6958) +#define OUT_RESUME_CANNOT (ag_text_strtable+6968) #define OUT_RESUME_CANNOT_LEN 44 -#define OUT_SUSPEND_CANNOT (ag_text_strtable+7003) +#define OUT_SUSPEND_CANNOT (ag_text_strtable+7013) #define OUT_SUSPEND_CANNOT_LEN 47 -#define OUT_SWITCH_FAIL (ag_text_strtable+7071) +#define OUT_SWITCH_FAIL (ag_text_strtable+7081) #define OUT_SWITCH_FAIL_LEN 7 -#define PARSE_INPUT_AG_DEF_STR (ag_text_strtable+7079) +#define PARSE_INPUT_AG_DEF_STR (ag_text_strtable+7089) #define PARSE_INPUT_AG_DEF_STR_LEN 25 -#define PATH_TOO_BIG (ag_text_strtable+7105) +#define PATH_TOO_BIG (ag_text_strtable+7115) #define PATH_TOO_BIG_LEN 23 -#define PIPE_DEFS_STDIN_NAME (ag_text_strtable+7129) +#define PIPE_DEFS_STDIN_NAME (ag_text_strtable+7139) #define PIPE_DEFS_STDIN_NAME_LEN 5 #define PIPE_DEFS_STDIN_STR (ag_text_strtable+1404) #define PIPE_DEFS_STDIN_STR_LEN 1 -#define PIPE_DUP2_NAME_STR (ag_text_strtable+7135) +#define PIPE_DUP2_NAME_STR (ag_text_strtable+7145) #define PIPE_DUP2_NAME_STR_LEN 4 -#define PIPE_FIFO_IN_NAME_FMT (ag_text_strtable+7140) +#define PIPE_FIFO_IN_NAME_FMT (ag_text_strtable+7150) #define PIPE_FIFO_IN_NAME_FMT_LEN 5 #define PIPE_FIFO_OPEN (ag_text_strtable+1567) #define PIPE_FIFO_OPEN_LEN 4 -#define PIPE_FIFO_OUT_NAME_FMT (ag_text_strtable+7146) +#define PIPE_FIFO_OUT_NAME_FMT (ag_text_strtable+7156) #define PIPE_FIFO_OUT_NAME_FMT_LEN 6 -#define PIPE_FORK_NAME (ag_text_strtable+7153) +#define PIPE_FORK_NAME (ag_text_strtable+7163) #define PIPE_FORK_NAME_LEN 4 -#define PIPE_MKFIFO_NAME (ag_text_strtable+7158) +#define PIPE_MKFIFO_NAME (ag_text_strtable+7168) #define PIPE_MKFIFO_NAME_LEN 6 -#define PIPE_POLL_NAME_STR (ag_text_strtable+7165) +#define PIPE_POLL_NAME_STR (ag_text_strtable+7175) #define PIPE_POLL_NAME_STR_LEN 4 -#define PIPE_WRITE_NAME_STR (ag_text_strtable+7170) +#define PIPE_WRITE_NAME_STR (ag_text_strtable+7180) #define PIPE_WRITE_NAME_STR_LEN 5 -#define PORT_NUM_BAD (ag_text_strtable+7176) +#define PORT_NUM_BAD (ag_text_strtable+7186) #define PORT_NUM_BAD_LEN 26 -#define PREP_INVOKE_NO_NAME (ag_text_strtable+7255) +#define PREP_INVOKE_NO_NAME (ag_text_strtable+7265) #define PREP_INVOKE_NO_NAME_LEN 32 -#define PREP_INVOKE_NO_SEP (ag_text_strtable+7288) +#define PREP_INVOKE_NO_SEP (ag_text_strtable+7298) #define PREP_INVOKE_NO_SEP_LEN 41 -#define PRINT_DEF_SHOW_FMT (ag_text_strtable+7330) +#define PRINT_DEF_SHOW_FMT (ag_text_strtable+7340) #define PRINT_DEF_SHOW_FMT_LEN 31 -#define PRINT_DEF_SPACES (ag_text_strtable+7362) +#define PRINT_DEF_SPACES (ag_text_strtable+7372) #define PRINT_DEF_SPACES_LEN 32 #define PROC_TPL_BOGUS_RET (ag_text_strtable+1940) #define PROC_TPL_BOGUS_RET_LEN 27 -#define PROC_TPL_START (ag_text_strtable+7203) +#define PROC_TPL_START (ag_text_strtable+7213) #define PROC_TPL_START_LEN 21 -#define PSEUDO_MACRO_NAME_STR (ag_text_strtable+7225) +#define PSEUDO_MACRO_NAME_STR (ag_text_strtable+7235) #define PSEUDO_MACRO_NAME_STR_LEN 12 -#define PSEUDO_MAC_BAD_ENDER (ag_text_strtable+7395) +#define PSEUDO_MAC_BAD_ENDER (ag_text_strtable+7405) #define PSEUDO_MAC_BAD_ENDER_LEN 36 -#define PSEUDO_MAC_BAD_FSM (ag_text_strtable+7238) +#define PSEUDO_MAC_BAD_FSM (ag_text_strtable+7248) #define PSEUDO_MAC_BAD_FSM_LEN 16 -#define PSEUDO_MAC_BAD_LENGTH (ag_text_strtable+7432) +#define PSEUDO_MAC_BAD_LENGTH (ag_text_strtable+7442) #define PSEUDO_MAC_BAD_LENGTH_LEN 29 -#define PSEUDO_MAC_BAD_MODE (ag_text_strtable+7541) +#define PSEUDO_MAC_BAD_MODE (ag_text_strtable+7551) #define PSEUDO_MAC_BAD_MODE_LEN 24 -#define PSEUDO_MAC_BAD_NOAG5 (ag_text_strtable+7566) +#define PSEUDO_MAC_BAD_NOAG5 (ag_text_strtable+7576) #define PSEUDO_MAC_BAD_NOAG5_LEN 20 -#define PSEUDO_MAC_BAD_NOEND (ag_text_strtable+7587) +#define PSEUDO_MAC_BAD_NOEND (ag_text_strtable+7597) #define PSEUDO_MAC_BAD_NOEND_LEN 15 -#define PSEUDO_MAC_BAD_NOEOL (ag_text_strtable+7603) +#define PSEUDO_MAC_BAD_NOEOL (ag_text_strtable+7613) #define PSEUDO_MAC_BAD_NOEOL_LEN 16 -#define PSEUDO_MAC_BAD_NOSTART (ag_text_strtable+7620) +#define PSEUDO_MAC_BAD_NOSTART (ag_text_strtable+7630) #define PSEUDO_MAC_BAD_NOSTART_LEN 17 -#define PSEUDO_MAC_BAD_NOTPL (ag_text_strtable+7638) +#define PSEUDO_MAC_BAD_NOTPL (ag_text_strtable+7648) #define PSEUDO_MAC_BAD_NOTPL_LEN 20 -#define PSEUDO_MAC_BAD_PSEUDO (ag_text_strtable+7659) +#define PSEUDO_MAC_BAD_PSEUDO (ag_text_strtable+7669) #define PSEUDO_MAC_BAD_PSEUDO_LEN 23 -#define PSEUDO_MAC_BAD_STARTER (ag_text_strtable+7462) +#define PSEUDO_MAC_BAD_STARTER (ag_text_strtable+7472) #define PSEUDO_MAC_BAD_STARTER_LEN 36 -#define PSEUDO_MAC_ERR_FMT (ag_text_strtable+7499) +#define PSEUDO_MAC_ERR_FMT (ag_text_strtable+7509) #define PSEUDO_MAC_ERR_FMT_LEN 41 -#define PSEUDO_MAC_MODE_MARK (ag_text_strtable+7683) +#define PSEUDO_MAC_MODE_MARK (ag_text_strtable+7693) #define PSEUDO_MAC_MODE_MARK_LEN 3 -#define PSEUDO_MAC_TPL_FILE (ag_text_strtable+7687) +#define PSEUDO_MAC_TPL_FILE (ag_text_strtable+7697) #define PSEUDO_MAC_TPL_FILE_LEN 15 -#define READY_INPUT_NODEF (ag_text_strtable+7703) +#define READY_INPUT_NODEF (ag_text_strtable+7713) #define READY_INPUT_NODEF_LEN 20 -#define READY_INPUT_NOT_REG (ag_text_strtable+7724) +#define READY_INPUT_NOT_REG (ag_text_strtable+7734) #define READY_INPUT_NOT_REG_LEN 21 -#define READY_INPUT_STAT (ag_text_strtable+7746) +#define READY_INPUT_STAT (ag_text_strtable+7756) #define READY_INPUT_STAT_LEN 4 -#define READ_DEF_NO_DEFS (ag_text_strtable+7751) +#define READ_DEF_NO_DEFS (ag_text_strtable+7761) #define READ_DEF_NO_DEFS_LEN 28 #define READ_DEF_OPEN (ag_text_strtable+1567) #define READ_DEF_OPEN_LEN 4 #define READ_DEF_READ (ag_text_strtable+1572) #define READ_DEF_READ_LEN 4 -#define REALLOC_FAIL_FMT (ag_text_strtable+7916) +#define REALLOC_FAIL_FMT (ag_text_strtable+7926) #define REALLOC_FAIL_FMT_LEN 36 -#define REQUEST_METHOD (ag_text_strtable+7780) +#define REQUEST_METHOD (ag_text_strtable+7790) #define REQUEST_METHOD_LEN 14 -#define RESOLVE_SCM_EXACT (ag_text_strtable+7795) +#define RESOLVE_SCM_EXACT (ag_text_strtable+7805) #define RESOLVE_SCM_EXACT_LEN 11 -#define RESOLVE_SCM_INEXACT (ag_text_strtable+7807) +#define RESOLVE_SCM_INEXACT (ag_text_strtable+7817) #define RESOLVE_SCM_INEXACT_LEN 13 -#define RESOLVE_SCM_LIST (ag_text_strtable+7821) +#define RESOLVE_SCM_LIST (ag_text_strtable+7831) #define RESOLVE_SCM_LIST_LEN 10 -#define RESOLVE_SCM_PAIR (ag_text_strtable+7832) +#define RESOLVE_SCM_PAIR (ag_text_strtable+7842) #define RESOLVE_SCM_PAIR_LEN 10 -#define RESOLVE_SCM_PROC (ag_text_strtable+7843) +#define RESOLVE_SCM_PROC (ag_text_strtable+7853) #define RESOLVE_SCM_PROC_LEN 23 -#define RESOLVE_SCM_UNKNOWN (ag_text_strtable+7867) +#define RESOLVE_SCM_UNKNOWN (ag_text_strtable+7877) #define RESOLVE_SCM_UNKNOWN_LEN 13 -#define RESOLVE_SCM_VECTOR (ag_text_strtable+7881) +#define RESOLVE_SCM_VECTOR (ag_text_strtable+7891) #define RESOLVE_SCM_VECTOR_LEN 12 -#define RETURN_FROM_NOWHERE (ag_text_strtable+7894) +#define RETURN_FROM_NOWHERE (ag_text_strtable+7904) #define RETURN_FROM_NOWHERE_LEN 21 -#define RM_MISSING_DE (ag_text_strtable+7953) +#define RM_MISSING_DE (ag_text_strtable+7963) #define RM_MISSING_DE_LEN 39 -#define RUN_GPERF_CMD (ag_text_strtable+7993) +#define RUN_GPERF_CMD (ag_text_strtable+8003) #define RUN_GPERF_CMD_LEN 171 #define RUN_PRINTF_HUH (ag_text_strtable+3273) #define RUN_PRINTF_HUH_LEN 13 -#define SAFE_PRINTF_BAD_ARGS (ag_text_strtable+8210) +#define SAFE_PRINTF_BAD_ARGS (ag_text_strtable+8220) #define SAFE_PRINTF_BAD_ARGS_LEN 19 -#define SAFE_PRINTF_BAD_FMT (ag_text_strtable+8165) +#define SAFE_PRINTF_BAD_FMT (ag_text_strtable+8175) #define SAFE_PRINTF_BAD_FMT_LEN 44 -#define SCHEME_EVAL_ERR_FMT (ag_text_strtable+8258) +#define SCHEME_EVAL_ERR_FMT (ag_text_strtable+8268) #define SCHEME_EVAL_ERR_FMT_LEN 71 -#define SCHEME_INIT_DEBUG_1_6 (ag_text_strtable+8230) +#define SCHEME_INIT_DEBUG_1_6 (ag_text_strtable+8240) #define SCHEME_INIT_DEBUG_1_6_LEN 11 -#define SCHEME_INIT_DEBUG_2_0 (ag_text_strtable+8242) +#define SCHEME_INIT_DEBUG_2_0 (ag_text_strtable+8252) #define SCHEME_INIT_DEBUG_2_0_LEN 15 -#define SCHEME_INIT_TEXT (ag_text_strtable+8330) -#define SCHEME_INIT_TEXT_LEN 3927 -#define SCM2ZCHARS_BAD_VAL (ag_text_strtable+12258) +#define SCHEME_INIT_TEXT (ag_text_strtable+8340) +#define SCHEME_INIT_TEXT_LEN 3928 +#define SCM2ZCHARS_BAD_VAL (ag_text_strtable+12269) #define SCM2ZCHARS_BAD_VAL_LEN 49 -#define SCM_ERROR_FMT (ag_text_strtable+12308) +#define SCM_ERROR_FMT (ag_text_strtable+12319) #define SCM_ERROR_FMT_LEN 50 -#define SCM_FALSE_STR (ag_text_strtable+12359) +#define SCM_FALSE_STR (ag_text_strtable+12370) #define SCM_FALSE_STR_LEN 2 -#define SCM_LIST_STR (ag_text_strtable+12362) +#define SCM_LIST_STR (ag_text_strtable+12373) #define SCM_LIST_STR_LEN 3 -#define SCM_OUT_POP_EMPTY (ag_text_strtable+12420) +#define SCM_OUT_POP_EMPTY (ag_text_strtable+12431) #define SCM_OUT_POP_EMPTY_LEN 48 -#define SCM_OUT_POP_NO_REREAD (ag_text_strtable+12366) +#define SCM_OUT_POP_NO_REREAD (ag_text_strtable+12377) #define SCM_OUT_POP_NO_REREAD_LEN 14 -#define SCM_PROC_CAST (ag_text_strtable+12381) +#define SCM_PROC_CAST (ag_text_strtable+12392) #define SCM_PROC_CAST_LEN 5 -#define SCM_TRUE_STR (ag_text_strtable+12387) +#define SCM_TRUE_STR (ag_text_strtable+12398) #define SCM_TRUE_STR_LEN 2 -#define SERV_RESTART (ag_text_strtable+12469) +#define SERV_RESTART (ag_text_strtable+12480) #define SERV_RESTART_LEN 40 -#define SET_ORIG_DIR_NO_MEM_MSG (ag_text_strtable+12510) +#define SET_ORIG_DIR_NO_MEM_MSG (ag_text_strtable+12521) #define SET_ORIG_DIR_NO_MEM_MSG_LEN 25 -#define SET_TMP_DIR_CMD (ag_text_strtable+12536) +#define SET_TMP_DIR_CMD (ag_text_strtable+12547) #define SET_TMP_DIR_CMD_LEN 86 -#define SET_WRITE_WARN (ag_text_strtable+12623) +#define SET_WRITE_WARN (ag_text_strtable+12634) #define SET_WRITE_WARN_LEN 84 -#define SFX_FMT (ag_text_strtable+12390) +#define SFX_FMT (ag_text_strtable+12401) #define SFX_FMT_LEN 4 -#define SHELL_CMD_FMT (ag_text_strtable+12708) +#define SHELL_CMD_FMT (ag_text_strtable+12719) #define SHELL_CMD_FMT_LEN 28 -#define SHELL_DIE_FMT (ag_text_strtable+12737) +#define SHELL_DIE_FMT (ag_text_strtable+12748) #define SHELL_DIE_FMT_LEN 41 -#define SHELL_INIT_STR (ag_text_strtable+12779) +#define SHELL_INIT_STR (ag_text_strtable+12790) #define SHELL_INIT_STR_LEN 1253 -#define SHELL_LAST_CMD_MSG (ag_text_strtable+14033) +#define SHELL_LAST_CMD_MSG (ag_text_strtable+14044) #define SHELL_LAST_CMD_MSG_LEN 22 -#define SHELL_NO_END_MARK_MSG (ag_text_strtable+14056) +#define SHELL_NO_END_MARK_MSG (ag_text_strtable+14067) #define SHELL_NO_END_MARK_MSG_LEN 18 -#define SHELL_READ_ERR_FMT (ag_text_strtable+14135) +#define SHELL_READ_ERR_FMT (ag_text_strtable+14146) #define SHELL_READ_ERR_FMT_LEN 41 -#define SHELL_RESTART_MSG (ag_text_strtable+14075) +#define SHELL_RESTART_MSG (ag_text_strtable+14086) #define SHELL_RESTART_MSG_LEN 16 -#define SHELL_RES_DISCARD_MSG (ag_text_strtable+14092) +#define SHELL_RES_DISCARD_MSG (ag_text_strtable+14103) #define SHELL_RES_DISCARD_MSG_LEN 19 -#define SHELL_RES_NULL_MSG (ag_text_strtable+12395) +#define SHELL_RES_NULL_MSG (ag_text_strtable+12406) #define SHELL_RES_NULL_MSG_LEN 24 -#define SHELL_SET_PS4_FMT (ag_text_strtable+14112) +#define SHELL_SET_PS4_FMT (ag_text_strtable+14123) #define SHELL_SET_PS4_FMT_LEN 22 #define SHELL_UNK_LAST_CMD_MSG (ag_text_strtable+3273) #define SHELL_UNK_LAST_CMD_MSG_LEN 13 -#define SHELL_XTRACE_CMDS (ag_text_strtable+14177) +#define SHELL_XTRACE_CMDS (ag_text_strtable+14188) #define SHELL_XTRACE_CMDS_LEN 35 -#define SH_DONE_MARK (ag_text_strtable+14213) +#define SH_DONE_MARK (ag_text_strtable+14224) #define SH_DONE_MARK_LEN 31 -#define START_DEP_ARG_FMT (ag_text_strtable+14359) +#define START_DEP_ARG_FMT (ag_text_strtable+14370) #define START_DEP_ARG_FMT_LEN 6 -#define START_DEP_FILE_FMT (ag_text_strtable+14245) +#define START_DEP_FILE_FMT (ag_text_strtable+14256) #define START_DEP_FILE_FMT_LEN 113 -#define START_DEP_FOPEN_MSG (ag_text_strtable+14366) +#define START_DEP_FOPEN_MSG (ag_text_strtable+14377) #define START_DEP_FOPEN_MSG_LEN 15 -#define START_SCHEME_LIST (ag_text_strtable+14382) +#define START_SCHEME_LIST (ag_text_strtable+14393) #define START_SCHEME_LIST_LEN 2 -#define STDIN_FILE_NAME (ag_text_strtable+7129) +#define STDIN_FILE_NAME (ag_text_strtable+7139) #define STDIN_FILE_NAME_LEN 5 -#define STRDUP_FAIL_FMT (ag_text_strtable+14385) +#define STRDUP_FAIL_FMT (ag_text_strtable+14396) #define STRDUP_FAIL_FMT_LEN 32 -#define STR_TO_C_MAP_FAIL (ag_text_strtable+14418) +#define STR_TO_C_MAP_FAIL (ag_text_strtable+14429) #define STR_TO_C_MAP_FAIL_LEN 44 -#define STR_TO_C_NAME (ag_text_strtable+14463) +#define STR_TO_C_NAME (ag_text_strtable+14474) #define STR_TO_C_NAME_LEN 25 -#define SYSCALL_NAME (ag_text_strtable+14520) +#define SYSCALL_NAME (ag_text_strtable+14531) #define SYSCALL_NAME_LEN 7 -#define TAB_FILE_LINE_FMT (ag_text_strtable+14528) +#define TAB_FILE_LINE_FMT (ag_text_strtable+14539) #define TAB_FILE_LINE_FMT_LEN 17 -#define TEMP_SUFFIX (ag_text_strtable+14546) +#define TEMP_SUFFIX (ag_text_strtable+14557) #define TEMP_SUFFIX_LEN 9 -#define TOO_MANY_TIMEOUTS_MSG (ag_text_strtable+14489) +#define TOO_MANY_TIMEOUTS_MSG (ag_text_strtable+14500) #define TOO_MANY_TIMEOUTS_MSG_LEN 30 #define TPL_FILE_LINE_FMT (ag_text_strtable+1146) #define TPL_FILE_LINE_FMT_LEN 15 @@ -719,145 +719,145 @@ #define TPL_FILE_NEXT_LINE_FMT_LEN 13 #define TPL_FILE_TPL (ag_text_strtable+4838) #define TPL_FILE_TPL_LEN 3 -#define TPL_INVOKED (ag_text_strtable+14607) +#define TPL_INVOKED (ag_text_strtable+14618) #define TPL_INVOKED_LEN 39 -#define TPL_MARK (ag_text_strtable+14556) +#define TPL_MARK (ag_text_strtable+14567) #define TPL_MARK_LEN 8 -#define TPL_WARN_FMT (ag_text_strtable+14647) +#define TPL_WARN_FMT (ag_text_strtable+14658) #define TPL_WARN_FMT_LEN 36 -#define TRACE_ADD_SRC_FILE_FMT (ag_text_strtable+14565) +#define TRACE_ADD_SRC_FILE_FMT (ag_text_strtable+14576) #define TRACE_ADD_SRC_FILE_FMT_LEN 20 -#define TRACE_ADD_TARG_FILE_FMT (ag_text_strtable+14586) +#define TRACE_ADD_TARG_FILE_FMT (ag_text_strtable+14597) #define TRACE_ADD_TARG_FILE_FMT_LEN 20 -#define TRACE_ADD_TO_ENV_FMT (ag_text_strtable+14684) +#define TRACE_ADD_TO_ENV_FMT (ag_text_strtable+14695) #define TRACE_ADD_TO_ENV_FMT_LEN 27 -#define TRACE_AG_ARG_FMT (ag_text_strtable+14811) +#define TRACE_AG_ARG_FMT (ag_text_strtable+14822) #define TRACE_AG_ARG_FMT_LEN 5 -#define TRACE_BUILD_DEFS (ag_text_strtable+14817) +#define TRACE_BUILD_DEFS (ag_text_strtable+14828) #define TRACE_BUILD_DEFS_LEN 23 -#define TRACE_CASE_FAIL (ag_text_strtable+14712) +#define TRACE_CASE_FAIL (ag_text_strtable+14723) #define TRACE_CASE_FAIL_LEN 31 -#define TRACE_CASE_MATCHED (ag_text_strtable+14744) +#define TRACE_CASE_MATCHED (ag_text_strtable+14755) #define TRACE_CASE_MATCHED_LEN 33 -#define TRACE_CASE_NOMATCH (ag_text_strtable+14778) +#define TRACE_CASE_NOMATCH (ag_text_strtable+14789) #define TRACE_CASE_NOMATCH_LEN 32 -#define TRACE_COPY_MARK (ag_text_strtable+14841) +#define TRACE_COPY_MARK (ag_text_strtable+14852) #define TRACE_COPY_MARK_LEN 19 -#define TRACE_DEF_LOAD (ag_text_strtable+14861) +#define TRACE_DEF_LOAD (ag_text_strtable+14872) #define TRACE_DEF_LOAD_LEN 17 -#define TRACE_EVAL_STRING (ag_text_strtable+14918) +#define TRACE_EVAL_STRING (ag_text_strtable+14929) #define TRACE_EVAL_STRING_LEN 30 -#define TRACE_FIND_ENT (ag_text_strtable+14879) +#define TRACE_FIND_ENT (ag_text_strtable+14890) #define TRACE_FIND_ENT_LEN 12 -#define TRACE_FN_FOR (ag_text_strtable+14949) +#define TRACE_FN_FOR (ag_text_strtable+14960) #define TRACE_FN_FOR_LEN 37 -#define TRACE_FN_FOR_REPEAT (ag_text_strtable+14892) +#define TRACE_FN_FOR_REPEAT (ag_text_strtable+14903) #define TRACE_FN_FOR_REPEAT_LEN 25 -#define TRACE_FN_FOR_SKIP (ag_text_strtable+14987) +#define TRACE_FN_FOR_SKIP (ag_text_strtable+14998) #define TRACE_FN_FOR_SKIP_LEN 42 -#define TRACE_FN_IF (ag_text_strtable+15030) +#define TRACE_FN_IF (ag_text_strtable+15041) #define TRACE_FN_IF_LEN 43 -#define TRACE_FN_IF_NOTHING (ag_text_strtable+15074) +#define TRACE_FN_IF_NOTHING (ag_text_strtable+15085) #define TRACE_FN_IF_NOTHING_LEN 33 -#define TRACE_FN_INC_LINE (ag_text_strtable+14528) +#define TRACE_FN_INC_LINE (ag_text_strtable+14539) #define TRACE_FN_INC_LINE_LEN 17 -#define TRACE_FN_INC_TPL (ag_text_strtable+15108) +#define TRACE_FN_INC_TPL (ag_text_strtable+15119) #define TRACE_FN_INC_TPL_LEN 21 -#define TRACE_FN_REMAPPED (ag_text_strtable+15156) +#define TRACE_FN_REMAPPED (ag_text_strtable+15167) #define TRACE_FN_REMAPPED_LEN 40 -#define TRACE_FN_REMAP_BASE (ag_text_strtable+15130) +#define TRACE_FN_REMAP_BASE (ag_text_strtable+15141) #define TRACE_FN_REMAP_BASE_LEN 13 -#define TRACE_FN_REMAP_EXPR (ag_text_strtable+15144) +#define TRACE_FN_REMAP_EXPR (ag_text_strtable+15155) #define TRACE_FN_REMAP_EXPR_LEN 4 -#define TRACE_FN_REMAP_INVOKE (ag_text_strtable+15149) +#define TRACE_FN_REMAP_INVOKE (ag_text_strtable+15160) #define TRACE_FN_REMAP_INVOKE_LEN 6 -#define TRACE_FN_WHILE_END (ag_text_strtable+15197) +#define TRACE_FN_WHILE_END (ag_text_strtable+15208) #define TRACE_FN_WHILE_END_LEN 30 -#define TRACE_FN_WHILE_START (ag_text_strtable+15228) +#define TRACE_FN_WHILE_START (ag_text_strtable+15239) #define TRACE_FN_WHILE_START_LEN 41 -#define TRACE_FOR_BY_STEP (ag_text_strtable+15270) +#define TRACE_FOR_BY_STEP (ag_text_strtable+15281) #define TRACE_FOR_BY_STEP_LEN 62 -#define TRACE_FOR_STEP_TOO_FAR (ag_text_strtable+15333) +#define TRACE_FOR_STEP_TOO_FAR (ag_text_strtable+15344) #define TRACE_FOR_STEP_TOO_FAR_LEN 38 -#define TRACE_MACRO_DEF (ag_text_strtable+15372) +#define TRACE_MACRO_DEF (ag_text_strtable+15383) #define TRACE_MACRO_DEF_LEN 26 -#define TRACE_MACRO_FMT (ag_text_strtable+15399) +#define TRACE_MACRO_FMT (ag_text_strtable+15410) #define TRACE_MACRO_FMT_LEN 29 -#define TRACE_MATCH_VAL (ag_text_strtable+15548) +#define TRACE_MATCH_VAL (ag_text_strtable+15559) #define TRACE_MATCH_VAL_LEN 18 -#define TRACE_MOVE_FMT (ag_text_strtable+15567) +#define TRACE_MOVE_FMT (ag_text_strtable+15578) #define TRACE_MOVE_FMT_LEN 12 -#define TRACE_OPEN_OUT (ag_text_strtable+15580) +#define TRACE_OPEN_OUT (ag_text_strtable+15591) #define TRACE_OPEN_OUT_LEN 16 -#define TRACE_OUT_DELETE (ag_text_strtable+15597) +#define TRACE_OUT_DELETE (ag_text_strtable+15608) #define TRACE_OUT_DELETE_LEN 26 -#define TRACE_OUT_PUSH_NEW (ag_text_strtable+15624) +#define TRACE_OUT_PUSH_NEW (ag_text_strtable+15635) #define TRACE_OUT_PUSH_NEW_LEN 19 -#define TRACE_OUT_SWITCH (ag_text_strtable+15644) +#define TRACE_OUT_SWITCH (ag_text_strtable+15655) #define TRACE_OUT_SWITCH_LEN 19 -#define TRACE_POP_FMT (ag_text_strtable+15664) +#define TRACE_POP_FMT (ag_text_strtable+15675) #define TRACE_POP_FMT_LEN 8 -#define TRACE_RESUME (ag_text_strtable+15673) +#define TRACE_RESUME (ag_text_strtable+15684) #define TRACE_RESUME_LEN 16 -#define TRACE_RM_SRC_FILE_FMT (ag_text_strtable+15690) +#define TRACE_RM_SRC_FILE_FMT (ag_text_strtable+15701) #define TRACE_RM_SRC_FILE_FMT_LEN 23 -#define TRACE_RM_TARG_FILE_FMT (ag_text_strtable+15714) +#define TRACE_RM_TARG_FILE_FMT (ag_text_strtable+15725) #define TRACE_RM_TARG_FILE_FMT_LEN 23 -#define TRACE_SEL_MATCH_FULL (ag_text_strtable+15429) +#define TRACE_SEL_MATCH_FULL (ag_text_strtable+15440) #define TRACE_SEL_MATCH_FULL_LEN 31 -#define TRACE_SHELL_FIRST_START (ag_text_strtable+15738) +#define TRACE_SHELL_FIRST_START (ag_text_strtable+15749) #define TRACE_SHELL_FIRST_START_LEN 20 -#define TRACE_SHELL_PID_FMT (ag_text_strtable+15759) +#define TRACE_SHELL_PID_FMT (ag_text_strtable+15770) #define TRACE_SHELL_PID_FMT_LEN 23 -#define TRACE_SHELL_RESULT_MSG (ag_text_strtable+15461) +#define TRACE_SHELL_RESULT_MSG (ag_text_strtable+15472) #define TRACE_SHELL_RESULT_MSG_LEN 59 -#define TRACE_SHELL_STARTS_FMT (ag_text_strtable+15783) +#define TRACE_SHELL_STARTS_FMT (ag_text_strtable+15794) #define TRACE_SHELL_STARTS_FMT_LEN 23 -#define TRACE_START_FMT (ag_text_strtable+15807) +#define TRACE_START_FMT (ag_text_strtable+15818) #define TRACE_START_FMT_LEN 29 -#define TRACE_START_GUILE (ag_text_strtable+15521) +#define TRACE_START_GUILE (ag_text_strtable+15532) #define TRACE_START_GUILE_LEN 26 -#define TRACE_SUSPEND (ag_text_strtable+15837) +#define TRACE_SUSPEND (ag_text_strtable+15848) #define TRACE_SUSPEND_LEN 14 -#define TRACE_TRAP_STATE_FMT (ag_text_strtable+15852) +#define TRACE_TRAP_STATE_FMT (ag_text_strtable+15863) #define TRACE_TRAP_STATE_FMT_LEN 15 -#define TRACE_UNKNOWN_FMT (ag_text_strtable+15868) +#define TRACE_UNKNOWN_FMT (ag_text_strtable+15879) #define TRACE_UNKNOWN_FMT_LEN 16 -#define TRACE_VER_CONVERT (ag_text_strtable+15885) +#define TRACE_VER_CONVERT (ag_text_strtable+15896) #define TRACE_VER_CONVERT_LEN 20 -#define TRACE_XTRACE_MSG (ag_text_strtable+15906) +#define TRACE_XTRACE_MSG (ag_text_strtable+15917) #define TRACE_XTRACE_MSG_LEN 17 -#define TRUE_NAME_STR (ag_text_strtable+15924) +#define TRUE_NAME_STR (ag_text_strtable+15935) #define TRUE_NAME_STR_LEN 4 #define ULONG_FMT (ag_text_strtable+794) #define ULONG_FMT_LEN 3 -#define UNAME_CALL_NAME (ag_text_strtable+15929) +#define UNAME_CALL_NAME (ag_text_strtable+15940) #define UNAME_CALL_NAME_LEN 8 -#define USAGE_INVAL_DEP_OPT_FMT (ag_text_strtable+15938) +#define USAGE_INVAL_DEP_OPT_FMT (ag_text_strtable+15949) #define USAGE_INVAL_DEP_OPT_FMT_LEN 35 -#define USED_DEFINES_FMT (ag_text_strtable+15974) +#define USED_DEFINES_FMT (ag_text_strtable+15985) #define USED_DEFINES_FMT_LEN 97 -#define USED_DEFINES_LINE_FMT (ag_text_strtable+16072) +#define USED_DEFINES_LINE_FMT (ag_text_strtable+16083) #define USED_DEFINES_LINE_FMT_LEN 3 -#define WARN_FMT (ag_text_strtable+16076) +#define WARN_FMT (ag_text_strtable+16087) #define WARN_FMT_LEN 12 -#define WARN_STR (ag_text_strtable+16089) +#define WARN_STR (ag_text_strtable+16100) #define WARN_STR_LEN 7 -#define WORD_FORMAT (ag_text_strtable+16097) +#define WORD_FORMAT (ag_text_strtable+16108) #define WORD_FORMAT_LEN 6 -#define YES_NAME_STR (ag_text_strtable+16104) +#define YES_NAME_STR (ag_text_strtable+16115) #define YES_NAME_STR_LEN 3 -#define YYLEX_DF_STR (ag_text_strtable+16108) +#define YYLEX_DF_STR (ag_text_strtable+16119) #define YYLEX_DF_STR_LEN 5 -#define YYLEX_ERR_FMT (ag_text_strtable+16114) +#define YYLEX_ERR_FMT (ag_text_strtable+16125) #define YYLEX_ERR_FMT_LEN 158 -#define YYLEX_TOKEN_STR (ag_text_strtable+16273) +#define YYLEX_TOKEN_STR (ag_text_strtable+16284) #define YYLEX_TOKEN_STR_LEN 12 -#define YYLEX_UNENDING_QUOTE (ag_text_strtable+16286) +#define YYLEX_UNENDING_QUOTE (ag_text_strtable+16297) #define YYLEX_UNENDING_QUOTE_LEN 32 -#define zNil (ag_text_strtable+16319) +#define zNil (ag_text_strtable+16330) #define zNil_LEN 0 -extern char const ag_text_strtable[16320]; +extern char const ag_text_strtable[16331]; #define SCHEME_INIT_TEXT_LINENO 434 diff -Nru autogen-5.18.7/agen5/agUtils.c autogen-5.18.12/agen5/agUtils.c --- autogen-5.18.7/agen5/agUtils.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/agUtils.c 2016-03-08 22:30:28.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -431,14 +431,13 @@ if (dp[-1] == 0x7F) dp--; in_q += ct; - } else { + } else switch (*in_q) { case '\\': case '\'': case '#': dp[-1] = *in_q++; } - } break; default: @@ -472,7 +471,7 @@ if (qc == '\'') { /* * Single quoted strings process the backquote specially - * only in fron of these three characters: + * only in front of these three characters: */ switch (*qstr) { case '\\': diff -Nru autogen-5.18.7/agen5/autogen.1 autogen-5.18.12/agen5/autogen.1 --- autogen-5.18.7/agen5/autogen.1 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/autogen.1 2016-08-29 21:35:44.000000000 +0000 @@ -10,7 +10,7 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH autogen 1 "06 Dec 2015" "GNU AutoGen (5.18.7)" "User Commands" +.TH autogen 1 "29 Aug 2016" "GNU AutoGen (5.18.12)" "User Commands" .\" .\" DO NOT EDIT THIS FILE (in-mem file) .\" @@ -83,7 +83,7 @@ .B NOTE: THIS OPTION IS DEPRECATED .TP -.NOP \f\*[B-Font]\-\-definitions\f[]=\f\*[I-Font]file\f[], \f\*[I-Font] Fl \-no\-definitions\f[] +.NOP \f\*[B-Font]\-\-definitions\f[]=\f\*[I-Font]file\f[], \f\*[B-Font]\-\-no\-definitions\f[] Read definitions from \fIFILE\fP. The \fIno\-definitions\fP form will disable the option. This option is enabled by default. @@ -153,7 +153,7 @@ that directory first, or use directory names in the format specification for the output suffix lists, see: pseudo macro. .TP -.NOP \f\*[B-Font]\-\-source\-time\f[], \f\*[B-Font]\- Fl \-no\-source\-time\f[] +.NOP \f\*[B-Font]\-\-source\-time\f[], \f\*[B-Font]\-\-no\-source\-time\f[] set mod times to latest source. The \fIno\-source\-time\fP form will disable the option. .sp @@ -163,7 +163,7 @@ time of the output files will change only if the input files change. This will help reduce unneeded builds. .TP -.NOP \f\*[B-Font]\-\-writable\f[], \f\*[B-Font]\- Fl \-not\-writable\f[] +.NOP \f\*[B-Font]\-\-writable\f[], \f\*[B-Font]\-\-not\-writable\f[] Allow output files to be writable. The \fInot\-writable\fP form will disable the option. .sp diff -Nru autogen-5.18.7/agen5/autogen.c autogen-5.18.12/agen5/autogen.c --- autogen-5.18.7/agen5/autogen.c 2015-08-21 19:44:08.000000000 +0000 +++ autogen-5.18.12/agen5/autogen.c 2016-05-27 20:38:31.000000000 +0000 @@ -8,7 +8,7 @@ */ /* This file is part of AutoGen. - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -24,9 +24,17 @@ * with this program. If not, see . */ #ifdef HAVE_SYS_RESOURCE_H -#include +# include +#endif + +#ifdef SIGRTMIN +# define MAX_AG_SIG SIGRTMIN-1 +#else +# define MAX_AG_SIG NSIG +#endif +#ifndef SIGCHLD +# define SIGCHLD SIGCLD #endif -//#include typedef void (void_main_proc_t)(int, char **); @@ -124,7 +132,8 @@ { char const * lc = getenv("LC_ALL"); if ((lc != NULL) && (*lc != NUL) && (strcmp(lc, "C") != 0)) { - putenv("LC_ALL=C"); + static char lc_all[] = "LC_ALL=C"; + putenv(lc_all); execvp(argv[0], argv); fserr(AUTOGEN_EXIT_FS_ERROR, "execvp", argv[0]); } @@ -475,6 +484,9 @@ if (msg[-1] != NL) fputc(NL, stderr); +#ifdef DEBUG_ENABLED + abort(); +#else { proc_state_t o_state = processing_state; processing_state = PROC_STATE_ABORTING; @@ -486,13 +498,13 @@ longjmp(abort_jmp_buf, FAILURE); /* NOTREACHED */ default: - exit(EXIT_FAILURE); + abort(); /* NOTREACHED */ } } +#endif } - static void setup_signals(sighandler_proc_t * hdl_chld, sighandler_proc_t * hdl_abrt, @@ -500,11 +512,7 @@ { struct sigaction sa; int sigNo = 1; -#ifdef SIGRTMIN - const int maxSig = SIGRTMIN-1; -#else - const int maxSig = NSIG; -#endif + int const maxSig = MAX_AG_SIG; sa.sa_flags = 0; sigemptyset(&sa.sa_mask); @@ -520,9 +528,6 @@ * POSIX oversight. Allowed to be fixed for next POSIX rev, tho * it is "optional" to reset SIGCHLD on exec(2). */ -#ifndef SIGCHLD -# define SIGCHLD SIGCLD -#endif case SIGCHLD: sa.sa_handler = hdl_chld; break; diff -Nru autogen-5.18.7/agen5/autogen.h autogen-5.18.12/agen5/autogen.h --- autogen-5.18.7/agen5/autogen.h 2015-08-09 01:00:18.000000000 +0000 +++ autogen-5.18.12/agen5/autogen.h 2016-05-23 15:09:15.000000000 +0000 @@ -11,15 +11,15 @@ * ("autogen"), a library ("libopts") and its support templates (collectively, * "AutoOpts"), several support and utility programs ("columns", "getdefs" and * "xml2ag"), *plus* several handy embedded utility templates. They are all - * bundled together because they all require each other. They each do completely - * separate things, but they each are not useful without the other. Thus, - * they are bundled together. + * bundled together because they all require each other. + * They each do completely separate things, but they each are not useful + * without the other. Thus, they are bundled together. * * @group autogen * @{ */ /* This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/bootstrap.dir autogen-5.18.12/agen5/bootstrap.dir --- autogen-5.18.7/agen5/bootstrap.dir 2015-08-25 20:43:49.000000000 +0000 +++ autogen-5.18.12/agen5/bootstrap.dir 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # # Author: Bruce Korb ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/cgi.def autogen-5.18.12/agen5/cgi.def --- autogen-5.18.7/agen5/cgi.def 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/cgi.def 2016-03-08 17:00:39.000000000 +0000 @@ -1,7 +1,7 @@ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -42,7 +42,7 @@ { tst = name; tev = alpha, name_char; ttype = stash; }, { tst = name; tev = equal; next = value; }, { tst = value; tev = '*'; ttype = stash; }, - { tst = value; tev = space; ttype = stash; }, + { tst = value; tev = space; ttype = sv_space; }, { tst = value; tev = escape; }, { tst = value; tev = end; next = done; ttype = separate; }, { tst = value; tev = separator; next = init; ttype = separate; }; diff -Nru autogen-5.18.7/agen5/cgi-fsm.c autogen-5.18.12/agen5/cgi-fsm.c --- autogen-5.18.7/agen5/cgi-fsm.c 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/cgi-fsm.c 2016-08-29 21:35:44.000000000 +0000 @@ -8,7 +8,7 @@ * * Automated Finite State Machine * - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -45,11 +45,40 @@ /* START === USER HEADERS === DO NOT CHANGE THIS COMMENT */ /* This file is part of AutoGen. - * Copyright (C) 1992-2014 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved */ #include "autogen.h" +static inline te_cgi_state +get_next_event(char ch, int inlen, char * out, int outlen) +{ + if (inlen <= 0) + return CGI_EV_END; + + if (outlen < 4) { + static char const exhaustion[] = "output space exhausted\n"; + memcpy(out, exhaustion, sizeof(exhaustion)); + + return CGI_ST_INVALID; + } + + if (IS_ALPHABETIC_CHAR( ch )) + return CGI_EV_ALPHA; + + if (IS_DEC_DIGIT_CHAR( ch )) + return CGI_EV_NAME_CHAR; + + switch (ch) { + case '_': return CGI_EV_NAME_CHAR; break; + case '=': return CGI_EV_EQUAL; break; + case '+': return CGI_EV_SPACE; break; + case '%': return CGI_EV_ESCAPE; break; + case '&': return CGI_EV_SEPARATOR; break; + default: return CGI_EV_OTHER; break; + } +} + /* END === USER HEADERS === DO NOT CHANGE THIS COMMENT */ #ifndef NULL @@ -65,9 +94,10 @@ CGI_TR_NAME_EQUAL, CGI_TR_SEPARATE, CGI_TR_STASH, + CGI_TR_SV_SPACE, CGI_TR_VALUE_ESCAPE } te_cgi_trans; -#define CGI_TRANSITION_CT 5 +#define CGI_TRANSITION_CT 6 /** * State transition handling map. Map the state enumeration and the event @@ -110,7 +140,7 @@ { { CGI_ST_VALUE, CGI_TR_STASH }, /* EVT: ALPHA */ { CGI_ST_VALUE, CGI_TR_STASH }, /* EVT: NAME_CHAR */ { CGI_ST_VALUE, CGI_TR_STASH }, /* EVT: = */ - { CGI_ST_VALUE, CGI_TR_STASH }, /* EVT: + */ + { CGI_ST_VALUE, CGI_TR_SV_SPACE }, /* EVT: + */ { CGI_ST_VALUE, CGI_TR_VALUE_ESCAPE }, /* EVT: % */ { CGI_ST_VALUE, CGI_TR_STASH }, /* EVT: OTHER */ { CGI_ST_INIT, CGI_TR_SEPARATE }, /* EVT: & */ @@ -202,35 +232,8 @@ while (cgi_state < CGI_ST_INVALID) { /* START == FIND TRANSITION == DO NOT CHANGE THIS COMMENT */ - - char curCh; - if (--inlen < 0) { - trans_evt = CGI_EV_END; - curCh = NUL; - - } else { - if (outlen < 4) { - static char const exhaustion[] = "output space exhausted\n"; - if (saved_outlen > (int)sizeof(exhaustion)) - memcpy(saved_pzOut, exhaustion, sizeof(exhaustion)); - - return CGI_ST_INVALID; - } - curCh = *(pzSrc++); - if (IS_ALPHABETIC_CHAR( curCh )) - trans_evt = CGI_EV_ALPHA; - else if (IS_DEC_DIGIT_CHAR( curCh )) - trans_evt = CGI_EV_NAME_CHAR; - else switch (curCh) { - case '_': trans_evt = CGI_EV_NAME_CHAR; break; - case '=': trans_evt = CGI_EV_EQUAL; break; - case '+': trans_evt = CGI_EV_SPACE; curCh = ' '; break; - case '%': trans_evt = CGI_EV_ESCAPE; break; - case '&': trans_evt = CGI_EV_SEPARATOR; break; - default: trans_evt = CGI_EV_OTHER; break; - } - } - + char curCh = *(pzSrc++); + trans_evt = get_next_event(curCh, inlen--, saved_pzOut, outlen); /* END == FIND TRANSITION == DO NOT CHANGE THIS COMMENT */ #ifndef __COVERITY__ @@ -250,25 +253,31 @@ switch (trans) { case CGI_TR_INVALID: /* START == INVALID == DO NOT CHANGE THIS COMMENT */ - exit( cgi_invalid_transition( cgi_state, trans_evt )); + exit( cgi_invalid_transition(cgi_state, trans_evt)); /* END == INVALID == DO NOT CHANGE THIS COMMENT */ break; case CGI_TR_NAME_EQUAL: /* START == NAME_EQUAL == DO NOT CHANGE THIS COMMENT */ - strcpy( pzOut, "='" ); - outlen -= 2; - pzOut += 2; + { + static char const txt[] = "='"; + memcpy(pzOut, txt, sizeof(txt) - 1); + outlen -= sizeof(txt) - 1; + pzOut += sizeof(txt) - 1; + } /* END == NAME_EQUAL == DO NOT CHANGE THIS COMMENT */ break; case CGI_TR_SEPARATE: /* START == SEPARATE == DO NOT CHANGE THIS COMMENT */ - strcpy( pzOut, "';\n" ); - outlen -= 2; - pzOut += 3; + { + static char const txt[] = "';\n"; + memcpy(pzOut, txt, sizeof(txt)); + outlen -= sizeof(txt) - 1; + pzOut += sizeof(txt) - 1; + } /* END == SEPARATE == DO NOT CHANGE THIS COMMENT */ break; @@ -281,6 +290,14 @@ break; + case CGI_TR_SV_SPACE: + /* START == SV_SPACE == DO NOT CHANGE THIS COMMENT */ + *(pzOut++) = ' '; + outlen--; + /* END == SV_SPACE == DO NOT CHANGE THIS COMMENT */ + break; + + case CGI_TR_VALUE_ESCAPE: /* START == VALUE_ESCAPE == DO NOT CHANGE THIS COMMENT */ { diff -Nru autogen-5.18.7/agen5/cgi-fsm.h autogen-5.18.12/agen5/cgi-fsm.h --- autogen-5.18.7/agen5/cgi-fsm.h 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/cgi-fsm.h 2016-08-29 21:35:43.000000000 +0000 @@ -8,7 +8,7 @@ * * Automated Finite State Machine * - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff -Nru autogen-5.18.7/agen5/defDirect.c autogen-5.18.12/agen5/defDirect.c --- autogen-5.18.7/agen5/defDirect.c 2015-08-09 01:00:18.000000000 +0000 +++ autogen-5.18.12/agen5/defDirect.c 2016-05-23 15:09:15.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -29,8 +29,8 @@ /** * "ifdef" processing level. Blocks of text being skipped do not increment - * the value. Thus, transitioning from skip mode to process mode increments it, - * and the reverse decrements it. + * the value. Thus, transitioning from skip mode to process mode increments + * it, and the reverse decrements it. */ static int ifdef_lvl = 0; diff -Nru autogen-5.18.7/agen5/defFind.c autogen-5.18.12/agen5/defFind.c --- autogen-5.18.7/agen5/defFind.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/defFind.c 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/defLex.c autogen-5.18.12/agen5/defLex.c --- autogen-5.18.7/agen5/defLex.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/defLex.c 2016-05-23 15:09:15.000000000 +0000 @@ -10,7 +10,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -202,19 +202,20 @@ case '*': { char * pz = strstr(cctx->scx_scan+2, END_C_COMMENT); - if (pz != NULL) { - char * p = cctx->scx_scan+1; - for (;;) { - p = strchr(p+1, NL); - if ((p == NULL) || (p > pz)) - break; - cctx->scx_line++; - } - cctx->scx_scan = pz+2; - return SUCCESS; + if (pz == NULL) + break; + + char * p = cctx->scx_scan+1; + for (;;) { + p = strchr(p+1, NL); + if ((p == NULL) || (p > pz)) + break; + cctx->scx_line++; } - break; + cctx->scx_scan = pz+2; + return SUCCESS; } + case '/': { char * pz = strchr(cctx->scx_scan+2, NL); @@ -548,10 +549,10 @@ /* * The result *must* be a string, or we choke. */ - if (! AG_SCM_STRING_P(res)) + if (! scm_is_string(res)) AG_ABEND(ALIST_TO_AG_ERR); - res_len = AG_SCM_STRLEN(res); + res_len = scm_c_string_length(res); processing_state = PROC_STATE_LOAD_DEFS; cctx->scx_scan = pzEnd; AGFREE(pzText); diff -Nru autogen-5.18.7/agen5/defLoad.c autogen-5.18.12/agen5/defLoad.c --- autogen-5.18.7/agen5/defLoad.c 2015-08-09 01:00:18.000000000 +0000 +++ autogen-5.18.12/agen5/defLoad.c 2016-05-23 15:09:15.000000000 +0000 @@ -11,7 +11,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -274,7 +274,7 @@ sizeof(def) - ag_offsetof(def_ent_t, de_name)); /* - * Contents are swapped. Link "de" after "de_list" and return "de_list". + * Contents are swapped. Link "de" after "de_list" & return "de_list". */ de->de_twin = de_list->de_twin; if (de->de_twin != NULL) @@ -386,7 +386,7 @@ if (strcmp(*ppzfile, "-") == 0) { *ppzfile = OPT_ARG(DEFINITIONS) = "stdin"; if (getenv(REQUEST_METHOD) != NULL) { - loadCgi(); + load_cgi(); cctx = base_ctx; dp_run_fsm(); return INPUT_DONE; diff -Nru autogen-5.18.7/agen5/defParse.def autogen-5.18.12/agen5/defParse.def --- autogen-5.18.7/agen5/defParse.def 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/defParse.def 2016-05-23 15:09:15.000000000 +0000 @@ -1,6 +1,6 @@ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -102,5 +102,5 @@ ttype = start_block; }, { tst = need_value; tev = delete_ent; next = need_name; }, { tst = have_value; tev = lit_semi; next = need_name; ttype = noop; }, -{ tst = have_value; tev = lit_comma; next = need_value;ttype = next_val;}; +{ tst = have_value; tev = lit_comma; next = need_value;ttype = next_val;}; /* end of agen5/defParse.def */ diff -Nru autogen-5.18.7/agen5/defParse-fsm.c autogen-5.18.12/agen5/defParse-fsm.c --- autogen-5.18.7/agen5/defParse-fsm.c 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/defParse-fsm.c 2016-08-29 21:35:43.000000000 +0000 @@ -8,7 +8,7 @@ * * Automated Finite State Machine * - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff -Nru autogen-5.18.7/agen5/defParse-fsm.h autogen-5.18.12/agen5/defParse-fsm.h --- autogen-5.18.7/agen5/defParse-fsm.h 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/defParse-fsm.h 2016-08-29 21:35:43.000000000 +0000 @@ -8,7 +8,7 @@ * * Automated Finite State Machine * - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff -Nru autogen-5.18.7/agen5/defParse.x autogen-5.18.12/agen5/defParse.x --- autogen-5.18.7/agen5/defParse.x 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/defParse.x 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ * Definition parser functions. * * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/expExtract.c autogen-5.18.12/agen5/expExtract.c --- autogen-5.18.7/agen5/expExtract.c 2015-08-09 01:00:18.000000000 +0000 +++ autogen-5.18.12/agen5/expExtract.c 2016-05-23 15:09:15.000000000 +0000 @@ -8,7 +8,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -162,18 +162,18 @@ ssize_t mlen = (ssize_t)(strlen(start) + strlen(end) + 3); char * pzOut; - if (! AG_SCM_STRING_P(def)) { + if (! scm_is_string(def)) { pzOut = scribble_get(mlen); sprintf(pzOut, LINE_CONCAT3_FMT+3, start, end); } else { char const * pzDef = ag_scm2zchars(def, "dft extr str"); - mlen += (ssize_t)AG_SCM_STRLEN(def) + 1; + mlen += (ssize_t)scm_c_string_length(def) + 1; pzOut = scribble_get(mlen); sprintf(pzOut, LINE_CONCAT3_FMT, start, pzDef, end); } - return AG_SCM_STR02SCM(pzOut); + return scm_from_latin1_string(pzOut); } @@ -195,7 +195,7 @@ pzE += strlen(end); - return AG_SCM_STR2SCM(pzS, (size_t)(pzE - pzS)); + return scm_from_latin1_stringn(pzS, (size_t)(pzE - pzS)); } @@ -296,7 +296,7 @@ char const * end; char const * text; - if (! AG_SCM_STRING_P(file) || ! AG_SCM_STRING_P(marker)) + if (! scm_is_string(file) || ! scm_is_string(marker)) return SCM_UNDEFINED; text = load_extract_file(ag_scm2zchars(file, "extr")); @@ -305,7 +305,7 @@ char const * mark = ag_scm2zchars(marker, "mark"); char const * careful = EXTRACT_CAVEAT; - if (AG_SCM_STRING_P(caveat) && (AG_SCM_STRLEN(caveat) > 0)) + if (scm_is_string(caveat) && (scm_c_string_length(caveat) > 0)) careful = ag_scm2zchars(caveat, "caveat"); start = aprf(mark, EXTRACT_START, careful); @@ -343,7 +343,7 @@ { SCM res = SCM_UNDEFINED; - if (! AG_SCM_STRING_P(file)) + if (! scm_is_string(file)) scm_wrong_type_arg(FIND_FILE_NAME, 1, file); { @@ -353,15 +353,15 @@ /* * The suffix is optional. If provided, it will be a string. */ - if (AG_SCM_STRING_P(suffix)) { + if (scm_is_string(suffix)) { char * apz[2]; apz[0] = (char *)ag_scm2zchars(suffix, "file suffix"); apz[1] = NULL; if (SUCCESSFUL(find_file(pz, z, (char const **)apz, NULL))) - res = AG_SCM_STR02SCM(z); + res = scm_from_latin1_string(z); } else if (SUCCESSFUL(find_file(pz, z, NULL, NULL))) - res = AG_SCM_STR02SCM(z); + res = scm_from_latin1_string(z); } return res; diff -Nru autogen-5.18.7/agen5/expFormat.c autogen-5.18.12/agen5/expFormat.c --- autogen-5.18.7/agen5/expFormat.c 2015-08-08 23:33:36.000000000 +0000 +++ autogen-5.18.12/agen5/expFormat.c 2016-05-23 15:09:15.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -50,6 +50,7 @@ switch (*text++) { case NUL: return; + case NL: if (IS_HORIZ_WHITE_CHAR(text[-2])) goto doit; @@ -61,24 +62,23 @@ doit: start = SPN_HORIZ_WHITE_BACK(start, text - 2); *(start++) = NL; - { - char * dest = start; - for (;;) { - switch (*(dest++) = *(text++)) { - case NUL: - return; + char * dest = start; - case NL: - if (IS_HORIZ_WHITE_CHAR(dest[-2])) { - dest = SPN_HORIZ_WHITE_BACK(start, dest - 2); - start = dest; - *(dest++) = NL; - } + for (;;) { + switch (*(dest++) = *(text++)) { + case NUL: + return; - default: - break; + case NL: + if (IS_HORIZ_WHITE_CHAR(dest[-2])) { + dest = SPN_HORIZ_WHITE_BACK(start, dest - 2); + start = dest; + *(dest++) = NL; } + + default: + break; } } } @@ -134,14 +134,14 @@ char const * pzFirst; char const * pzPrefix; - if (! AG_SCM_STRING_P(prefix)) + if (! scm_is_string(prefix)) return SCM_UNDEFINED; date_str = zNil; pzFirst = zNil; { - size_t pfxLen = AG_SCM_STRLEN(prefix); + size_t pfxLen = scm_c_string_length(prefix); pzPrefix = ag_scm2zchars(prefix, "dne-prefix"); /* @@ -187,7 +187,7 @@ * IF we also have a 'first' prefix string, * THEN we set it to something other than ``zNil'' and deallocate later. */ - if (AG_SCM_STRING_P(first)) + if (scm_is_string(first)) pzFirst = aprf(ENABLED_OPT(WRITABLE) ? "%s\n" : EXP_FMT_DNE1, ag_scm2zchars(first, "pfx-1"), pzPrefix); @@ -241,7 +241,7 @@ if (pzFirst != zNil) AGFREE(pzFirst); { - SCM res = AG_SCM_STR02SCM(date_str); + SCM res = scm_from_latin1_string(date_str); AGFREE(date_str); return res; @@ -358,7 +358,8 @@ * THEN print it. */ if (*msg != NUL) { - char * pz = aprf(DEF_NOTE_FMT, (abrt != PROBLEM) ? ERROR_STR : WARN_STR, + char const * typ = (abrt != PROBLEM) ? ERROR_STR : WARN_STR; + char * pz = aprf(DEF_NOTE_FMT, typ, current_tpl->td_file, cur_macro->md_line, cur_fpstack->stk_fname, msg); if (abrt != PROBLEM) @@ -587,27 +588,29 @@ MK_LIC_PROG, MK_LIC_PFX, MK_LIC_OWN, MK_LIC_YRS }; subs = scm_gc_protect_object( - scm_list_4(AG_SCM_STR02SCM(slst[0]), AG_SCM_STR02SCM(slst[1]), - AG_SCM_STR02SCM(slst[2]), AG_SCM_STR02SCM(slst[3]))); + scm_list_4(scm_from_latin1_string(slst[0]), + scm_from_latin1_string(slst[1]), + scm_from_latin1_string(slst[2]), + scm_from_latin1_string(slst[3]))); - empty = scm_gc_protect_object(AG_SCM_STR02SCM("")); + empty = scm_gc_protect_object(scm_from_latin1_string("")); } - if (! AG_SCM_STRING_P(lic)) + if (! scm_is_string(lic)) AG_ABEND(MK_LIC_NOT_STR); lic_text = find_lic_text(seg, lic, &text_len, pfx_pz); if (lic_text == NULL) AG_ABEND(aprf(MK_LIC_NO_LIC, ag_scm2zchars(lic, "lic"))); - if (! AG_SCM_STRING_P(owner)) owner = empty; - if (! AG_SCM_STRING_P(years)) years = empty; + if (! scm_is_string(owner)) owner = empty; + if (! scm_is_string(years)) years = empty; vals = scm_list_4(prog, pfx, owner, years); do_multi_subs(&lic_text, &text_len, subs, vals); trim_trailing_white(lic_text); - return AG_SCM_STR02SCM(lic_text); + return scm_from_latin1_string(lic_text); } /*=gfunc license_full @@ -740,7 +743,7 @@ txt = SPN_WHITESPACE_CHARS(txt); e = SPN_WHITESPACE_BACK(txt, txt); *e = NUL; - lic = AG_SCM_STR02SCM(txt); + lic = scm_from_latin1_string(txt); } return lic; } @@ -764,7 +767,8 @@ static SCM lic = SCM_UNDEFINED; if (lic == SCM_UNDEFINED) - lic = scm_gc_protect_object(AG_SCM_STR02SCM(FIND_LIC_TEXT_LGPL+1)); + lic = scm_gc_protect_object( + scm_from_latin1_string(FIND_LIC_TEXT_LGPL+1)); return ag_scm_license_description(lic, prog_name, prefix, SCM_UNDEFINED); } @@ -787,7 +791,8 @@ static SCM lic = SCM_UNDEFINED; if (lic == SCM_UNDEFINED) - lic = scm_gc_protect_object(AG_SCM_STR02SCM(FIND_LIC_TEXT_AGPL)); + lic = scm_gc_protect_object( + scm_from_latin1_string(FIND_LIC_TEXT_AGPL)); return ag_scm_license_description(lic, prog_name, prefix, SCM_UNDEFINED); } @@ -811,7 +816,8 @@ static SCM lic = SCM_UNDEFINED; if (lic == SCM_UNDEFINED) - lic = scm_gc_protect_object(AG_SCM_STR02SCM(FIND_LIC_TEXT_LGPL)); + lic = scm_gc_protect_object( + scm_from_latin1_string(FIND_LIC_TEXT_LGPL)); return ag_scm_license_description(lic, prog_name, prefix, owner); } @@ -836,7 +842,8 @@ static SCM lic = SCM_UNDEFINED; if (lic == SCM_UNDEFINED) - lic = scm_gc_protect_object(AG_SCM_STR02SCM(FIND_LIC_TEXT_MBSD)); + lic = scm_gc_protect_object( + scm_from_latin1_string(FIND_LIC_TEXT_MBSD)); return ag_scm_license_description(lic, prog_name, prefix, owner); } @@ -867,7 +874,7 @@ char * pzRes; - if (! AG_SCM_STRING_P(license)) + if (! scm_is_string(license)) return SCM_UNDEFINED; { @@ -917,13 +924,13 @@ * Make sure they are reasonably sized (less than * SCRIBBLE_SIZE). Copy them to the scratch buffer. */ - if (AG_SCM_STRLEN(prog_name) >= SCRIBBLE_SIZE) + if (scm_c_string_length(prog_name) >= SCRIBBLE_SIZE) AG_ABEND(aprf(MK_LIC_TOO_BIG_FMT, MK_LIC_BIG_PROG, SCRIBBLE_SIZE)); - if (AG_SCM_STRLEN(prefix) >= SCRIBBLE_SIZE) + if (scm_c_string_length(prefix) >= SCRIBBLE_SIZE) AG_ABEND(aprf(MK_LIC_TOO_BIG_FMT, MK_LIC_BIG_PFX, SCRIBBLE_SIZE)); - if (AG_SCM_STRLEN(owner) >= SCRIBBLE_SIZE) + if (scm_c_string_length(owner) >= SCRIBBLE_SIZE) AG_ABEND(aprf(MK_LIC_TOO_BIG_FMT, MK_LIC_BIG_OWN, SCRIBBLE_SIZE)); /* @@ -984,7 +991,8 @@ */ AGFREE(pzRes); - return AG_SCM_STR2SCM(pzSaveRes, (size_t)((pzOut - pzSaveRes) - 1)); + return scm_from_latin1_stringn( + pzSaveRes, (size_t)((pzOut - pzSaveRes) - 1)); } } /** diff -Nru autogen-5.18.7/agen5/expGperf.c autogen-5.18.12/agen5/expGperf.c --- autogen-5.18.7/agen5/expGperf.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/expGperf.c 2016-05-23 15:09:15.000000000 +0000 @@ -10,7 +10,7 @@ */ /* * This file is part of AutoGen. - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -71,9 +71,9 @@ char const * gp_nam = ag_scm2zchars(name, "gp nm"); char const * h_list; - SCM nl_scm = AG_SCM_STR2SCM(NEWLINE, (size_t)1); + SCM nl_scm = scm_from_latin1_stringn(NEWLINE, (size_t)1); - if (! AG_SCM_STRING_P(name)) + if (! scm_is_string(name)) return SCM_UNDEFINED; /* @@ -142,7 +142,7 @@ if (*key2hash == NUL) str = SCM_UNDEFINED; else - str = AG_SCM_STR02SCM(key2hash); + str = scm_from_latin1_string(key2hash); AGFREE(cmd); AGFREE(key2hash); diff -Nru autogen-5.18.7/agen5/expGuile.c autogen-5.18.12/agen5/expGuile.c --- autogen-5.18.7/agen5/expGuile.c 2015-08-08 23:40:32.000000000 +0000 +++ autogen-5.18.12/agen5/expGuile.c 2016-05-23 15:09:15.000000000 +0000 @@ -10,7 +10,7 @@ */ /* * This file is part of AutoGen. - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -42,7 +42,7 @@ char * buf; char * str; - if (! AG_SCM_STRING_P(s)) + if (! scm_is_string(s)) AG_ABEND(aprf(NOT_STR_FMT, type)); str = scm_to_locale_stringn(s, &len); @@ -67,11 +67,11 @@ ag_scm_type_e(SCM typ) { if (scm_is_bool( typ)) return GH_TYPE_BOOLEAN; - if (AG_SCM_SYM_P( typ)) return GH_TYPE_SYMBOL; - if (AG_SCM_STRING_P(typ)) return GH_TYPE_STRING; + if (scm_is_symbol( typ)) return GH_TYPE_SYMBOL; + if (scm_is_string(typ)) return GH_TYPE_STRING; if (AG_SCM_IS_PROC( typ)) return GH_TYPE_PROCEDURE; if (AG_SCM_CHAR_P( typ)) return GH_TYPE_CHAR; - if (AG_SCM_VEC_P( typ)) return GH_TYPE_VECTOR; + if (scm_is_vector( typ)) return GH_TYPE_VECTOR; if (AG_SCM_PAIR_P( typ)) return GH_TYPE_PAIR; if (scm_is_number( typ)) return GH_TYPE_NUMBER; if (AG_SCM_LIST_P( typ)) return GH_TYPE_LIST; @@ -84,7 +84,7 @@ ag_scm_c_eval_string_from_file_line( char const * pzExpr, char const * pzFile, int line) { - SCM port = scm_open_input_string(AG_SCM_STR02SCM(pzExpr)); + SCM port = scm_open_input_string(scm_from_latin1_string(pzExpr)); if (OPT_VALUE_TRACE >= TRACE_EVERYTHING) fprintf(trace_fp, TRACE_EVAL_STRING, pzFile, line, pzExpr); @@ -97,7 +97,7 @@ if (pzOldFile != NULL) AGFREE(pzOldFile); AGDUPSTR(pzOldFile, pzFile, "scheme source"); - file = AG_SCM_STR02SCM(pzFile); + file = scm_from_latin1_string(pzFile); } { @@ -301,11 +301,14 @@ int len; char * pz; - if (! AG_SCM_STRING_P(str)) + if (! scm_is_string(str)) scm_wrong_type_arg(STR_TO_C_NAME, 1, str); - for (pz = C(char *, scm_i_string_chars(str)), len = (int)AG_SCM_STRLEN(str); + for (pz = C(char *, scm_i_string_chars(str)), + len = (int)scm_c_string_length(str); + --len >= 0; + pz++) { char ch = *pz; @@ -337,10 +340,10 @@ int len; char * pz; - if (! AG_SCM_STRING_P(str)) + if (! scm_is_string(str)) return SCM_UNDEFINED; - len = (int)AG_SCM_STRLEN(str); + len = (int)scm_c_string_length(str); pz = C(char *, scm_i_string_chars(str)); while (--len >= 0) { char ch = *pz; @@ -367,10 +370,11 @@ ag_scm_string_upcase(SCM str) { SCM res; - if (! AG_SCM_STRING_P(str)) + if (! scm_is_string(str)) return SCM_UNDEFINED; - res = AG_SCM_STR2SCM(scm_i_string_chars(str), AG_SCM_STRLEN(str)); + res = scm_from_latin1_stringn( + scm_i_string_chars(str), scm_c_string_length(str)); scm_string_upcase_x(res); return res; } @@ -392,10 +396,10 @@ char * pz; bool w_start = true; - if (! AG_SCM_STRING_P(str)) + if (! scm_is_string(str)) return SCM_UNDEFINED; - len = (int)AG_SCM_STRLEN(str); + len = (int)scm_c_string_length(str); pz = C(char *, scm_i_string_chars(str)); while (--len >= 0) { @@ -434,10 +438,11 @@ ag_scm_string_capitalize(SCM str) { SCM res; - if (! AG_SCM_STRING_P(str)) + if (! scm_is_string(str)) return SCM_UNDEFINED; - res = AG_SCM_STR2SCM(scm_i_string_chars(str), AG_SCM_STRLEN(str)); + res = scm_from_latin1_stringn( + scm_i_string_chars(str), scm_c_string_length(str)); ag_scm_string_capitalize_x(res); return res; } @@ -458,10 +463,10 @@ int len; char * pz; - if (! AG_SCM_STRING_P(str)) + if (! scm_is_string(str)) return SCM_UNDEFINED; - len = (int)AG_SCM_STRLEN(str); + len = (int)scm_c_string_length(str); pz = C(char *, scm_i_string_chars(str)); while (--len >= 0) { char ch = *pz; @@ -488,10 +493,11 @@ ag_scm_string_downcase(SCM str) { SCM res; - if (! AG_SCM_STRING_P(str)) + if (! scm_is_string(str)) return SCM_UNDEFINED; - res = AG_SCM_STR2SCM(scm_i_string_chars(str), AG_SCM_STRLEN(str)); + res = scm_from_latin1_stringn( + scm_i_string_chars(str), scm_c_string_length(str)); ag_scm_string_downcase_x(res); return res; } @@ -516,10 +522,10 @@ char * pzs; bool cap_done = false; - if (! AG_SCM_STRING_P(str)) + if (! scm_is_string(str)) return SCM_UNDEFINED; - len = (int)AG_SCM_STRLEN(str); + len = (int)scm_c_string_length(str); res = pzd = scribble_get(len + 1); pzs = C(char *, scm_i_string_chars(str)); @@ -548,7 +554,7 @@ *(pzd++) = (char)ch; } - return AG_SCM_STR2SCM(res, (size_t)(pzd - res)); + return scm_from_latin1_stringn(res, (size_t)(pzd - res)); } /** * @} diff -Nru autogen-5.18.7/agen5/expMake.c autogen-5.18.12/agen5/expMake.c --- autogen-5.18.7/agen5/expMake.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/expMake.c 2016-05-23 15:09:15.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -344,7 +344,7 @@ size_t sz = script_size(&text, &tabch); if (sz == 0) - return AG_SCM_STR02SCM(zNil); + return scm_from_latin1_string(zNil); bol = out = res_str = scribble_get((ssize_t)sz); @@ -417,7 +417,7 @@ } { - SCM res = AG_SCM_STR2SCM(res_str, (size_t)(out - res_str)); + SCM res = scm_from_latin1_stringn(res_str, (size_t)(out - res_str)); return res; } } diff -Nru autogen-5.18.7/agen5/expOutput.c autogen-5.18.12/agen5/expOutput.c --- autogen-5.18.7/agen5/expOutput.c 2015-08-08 23:40:32.000000000 +0000 +++ autogen-5.18.12/agen5/expOutput.c 2016-05-27 20:38:31.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -94,7 +94,7 @@ sprintfv(buf, fmt, (snv_constpointer *)args); } - return AG_SCM_STR02SCM(buf); + return scm_from_latin1_string(buf); } /** @@ -240,7 +240,7 @@ SCM ag_scm_out_move(SCM new_file) { - size_t sz = AG_SCM_STRLEN(new_file); + size_t sz = scm_c_string_length(new_file); char * pz = (char *)AGALOC(sz + 1, "file name"); memcpy(pz, scm_i_string_chars(new_file), sz); pz[sz] = NUL; @@ -310,7 +310,7 @@ AG_CANT(SCM_OUT_POP_NO_REREAD, cur_fpstack->stk_fname); } - res = AG_SCM_STR2SCM(pz, (size_t)pos); + res = scm_from_latin1_stringn(pz, (size_t)pos); } outputDepth--; @@ -347,7 +347,7 @@ else str = num_or_str; - if (AG_SCM_STRING_P(str)) + if (scm_is_string(str)) fmt = ag_scm2zchars(str, "file/line format"); else fmt = FILE_LINE_FMT; @@ -386,7 +386,7 @@ suspAllocCt * sizeof(tSuspendName), "add to susp f"); } - pSuspended[ suspendCt-1 ].pzSuspendName = AG_SCM_TO_NEWSTR(susp_nm); + pSuspended[ suspendCt-1 ].pzSuspendName = scm_to_latin1_string(susp_nm); pSuspended[ suspendCt-1 ].pOutDesc = cur_fpstack; if (OPT_VALUE_TRACE >= TRACE_EXPRESSIONS) fprintf(trace_fp, TRACE_SUSPEND, __func__, cur_fpstack->stk_fname, @@ -479,7 +479,7 @@ * If "port" is a string, it must match one of the suspended outputs. * Otherwise, we'll fall through to the abend. */ - if (AG_SCM_STRING_P(port)) { + if (scm_is_string(port)) { int ix = 0; char const * pzName = ag_scm2zchars(port, "resume name"); @@ -548,11 +548,11 @@ { static char const append_mode[] = "a" FOPEN_BINARY_FLAG "+"; - if (! AG_SCM_STRING_P(new_file)) + if (! scm_is_string(new_file)) AG_ABEND(OUT_ADD_INVALID); - open_output_file(scm_i_string_chars(new_file), AG_SCM_STRLEN(new_file), - append_mode, 0); + open_output_file(scm_i_string_chars(new_file), + scm_c_string_length(new_file), append_mode, 0); return SCM_UNDEFINED; } @@ -578,7 +578,7 @@ temp_tpl_dir_len = tmp_sz - 9; // "ag-XXXXXX" tmpdir[temp_tpl_dir_len - 1] = NUL; // trim dir char - if (snprintf(cmdbf, bfsz, SET_TMP_DIR_CMD, tmpdir) >= bfsz) + if (snprintf(cmdbf, bfsz, SET_TMP_DIR_CMD, tmpdir) >= (int)bfsz) AG_ABEND(BOGUS_TAG); tmpdir[temp_tpl_dir_len - 1] = DIRCH; // restore dir char @@ -607,9 +607,9 @@ { static char const write_mode[] = "w" FOPEN_BINARY_FLAG "+"; - if (AG_SCM_STRING_P(new_file)) { - open_output_file(scm_i_string_chars(new_file), AG_SCM_STRLEN(new_file), - write_mode, 0); + if (scm_is_string(new_file)) { + open_output_file(scm_i_string_chars(new_file), + scm_c_string_length(new_file), write_mode, 0); return SCM_UNDEFINED; } @@ -691,10 +691,10 @@ struct utimbuf tbuf; char * pzNewFile; - if (! AG_SCM_STRING_P(new_file)) + if (! scm_is_string(new_file)) return SCM_UNDEFINED; { - size_t sz = AG_SCM_STRLEN(new_file); + size_t sz = scm_c_string_length(new_file); pzNewFile = AGALOC(sz + 1, "new file name"); memcpy(pzNewFile, scm_i_string_chars(new_file), sz); pzNewFile[ sz ] = NUL; @@ -761,7 +761,7 @@ { out_stack_t * p = cur_fpstack; while (p->stk_flags & FPF_UNLINK) p = p->stk_prev; - return AG_SCM_STR02SCM(VOIDP(p->stk_fname)); + return scm_from_latin1_string(VOIDP(p->stk_fname)); } @@ -885,9 +885,9 @@ * to "HEADER" */ char const * lpz = - AG_SCM_STRING_P(name) ? scm_i_string_chars(name) : HEADER_STR; + scm_is_string(name) ? scm_i_string_chars(name) : HEADER_STR; size_t lsz = (lpz == HEADER_STR) - ? HEADER_STR_LEN : AG_SCM_STRLEN(name); + ? HEADER_STR_LEN : scm_c_string_length(name); /* * Full, maximal length of output @@ -932,13 +932,13 @@ size_t sz2 = MK_HEAD_GUARD_GUARD_LEN + 2 * gsz; size_t sz = (sz1 < sz2) ? sz2 : sz1; char * p = scribble_get((ssize_t)sz); - if (snprintf(p, sz, MK_HEAD_GUARD_SCM, opz, gpz) >= sz) + if (snprintf(p, sz, MK_HEAD_GUARD_SCM, opz, gpz) >= (int)sz) AG_ABEND(BOGUS_TAG); (void)ag_scm_c_eval_string_from_file_line(p, __FILE__, __LINE__); - if (snprintf(p, sz, MK_HEAD_GUARD_GUARD, gpz) >= sz) + if (snprintf(p, sz, MK_HEAD_GUARD_GUARD, gpz) >= (int)sz) AG_ABEND(BOGUS_TAG); - name = AG_SCM_STR02SCM(p); + name = scm_from_latin1_string(p); } AGFREE(gpz); diff -Nru autogen-5.18.7/agen5/expPrint.c autogen-5.18.12/agen5/expPrint.c --- autogen-5.18.7/agen5/expPrint.c 2015-08-09 00:51:04.000000000 +0000 +++ autogen-5.18.12/agen5/expPrint.c 2016-05-23 15:09:15.000000000 +0000 @@ -13,7 +13,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -172,7 +172,7 @@ { char * bf; size_t bf_sz = (size_t)safePrintf(&bf, pzFmt, arglist); - res = AG_SCM_STR2SCM(bf, bf_sz); + res = scm_from_latin1_stringn(bf, bf_sz); free(bf); } @@ -284,14 +284,15 @@ do { if (*end_adr == NUL) break; - scan += snprintf(scan, str_size - (scan - res), HTML_DEC_DIGIT, *(end_adr++)); + scan += snprintf(scan, str_size - (scan - res), + HTML_DEC_DIGIT, *(end_adr++)); } while (scan < end); scan += snprintf(scan, str_size - (scan - res), HIDE_EMAIL_END_FMT, disp); if (scan > end) AG_ABEND(BOGUS_TAG); - return AG_SCM_STR2SCM(res, (size_t)(scan - res)); + return scm_from_latin1_stringn(res, (size_t)(scan - res)); } /*=gfunc format_arg_count diff -Nru autogen-5.18.7/agen5/expr.h autogen-5.18.12/agen5/expr.h --- autogen-5.18.7/agen5/expr.h 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/expr.h 2016-08-29 21:35:44.000000000 +0000 @@ -6,7 +6,7 @@ * From the definitions expr.def * and the template file snarf.tpl * - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/expr.ini autogen-5.18.12/agen5/expr.ini --- autogen-5.18.7/agen5/expr.ini 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/expr.ini 2016-08-29 21:35:44.000000000 +0000 @@ -6,7 +6,7 @@ * From the definitions expr.def * and the template file snarf.tpl * - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/expState.c autogen-5.18.12/agen5/expState.c --- autogen-5.18.7/agen5/expState.c 2015-08-09 01:15:06.000000000 +0000 +++ autogen-5.18.12/agen5/expState.c 2016-05-23 15:09:15.000000000 +0000 @@ -10,7 +10,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -150,7 +150,7 @@ return SCM_BOOL_F; /* Cannot match string -- not a text value */ } - field = AG_SCM_STR02SCM(def->de_val.dvu_text); + field = scm_from_latin1_string(def->de_val.dvu_text); result = AG_SCM_APPLY2(op, field, test); if (! has_idx) while (result == SCM_BOOL_F) { @@ -159,7 +159,7 @@ if (def == NULL) break; - field = AG_SCM_STR02SCM(def->de_val.dvu_text); + field = scm_from_latin1_string(def->de_val.dvu_text); result = AG_SCM_APPLY2(op, field, test); } @@ -183,7 +183,7 @@ */ pzField[-1] = name_sep_ch; { - SCM field = AG_SCM_STR02SCM(pzField); + SCM field = scm_from_latin1_string(pzField); SCM result; def_ctx_t ctx = curr_def_ctx; @@ -222,7 +222,7 @@ SCM ag_scm_base_name(void) { - return AG_SCM_STR02SCM(C(char *, OPT_ARG(BASE_NAME))); + return scm_from_latin1_string(C(char *, OPT_ARG(BASE_NAME))); } /*=gfunc version_compare @@ -338,7 +338,7 @@ SCM ag_scm_def_file(void) { - return AG_SCM_STR02SCM(C(char *, (base_ctx->scx_fname))); + return scm_from_latin1_string(C(char *, (base_ctx->scx_fname))); } /*=gfunc exist_p @@ -419,7 +419,7 @@ ag_scm_match_value_p(SCM op, SCM obj, SCM test) { if ( (! AG_SCM_IS_PROC(op)) - || (! AG_SCM_STRING_P(obj)) ) + || (! scm_is_string(obj)) ) return SCM_UNDEFINED; if (OPT_VALUE_TRACE >= TRACE_EXPRESSIONS) @@ -444,12 +444,12 @@ SCM ag_scm_get(SCM v_name, SCM alt_v_name) { - if (AG_SCM_STRING_P(v_name)) { + if (scm_is_string(v_name)) { bool x; char * vnm = ag_scm2zchars(v_name, "vname"); def_ent_t * de = find_def_ent(vnm, &x); if ((de != NULL) && (de->de_type == VALTYP_TEXT)) - return AG_SCM_STR02SCM(de->de_val.dvu_text); + return scm_from_latin1_string(de->de_val.dvu_text); if (OPT_VALUE_TRACE >= TRACE_EXPRESSIONS) fprintf(trace_fp, GOT_NOTHING_FMT, vnm, (de != NULL) ? "non text value" : "no value at all", @@ -460,9 +460,9 @@ fprintf(trace_fp, GET_NOTHING_FMT, current_tpl->td_file, (unsigned)cur_macro->md_line); - if (AG_SCM_STRING_P(alt_v_name)) + if (scm_is_string(alt_v_name)) return alt_v_name; - return AG_SCM_STR02SCM(zNil); + return scm_from_latin1_string(zNil); } /*=gfunc get_c_name @@ -640,7 +640,7 @@ SCM ag_scm_suffix(void) { - return AG_SCM_STR02SCM((char *)curr_sfx); + return scm_from_latin1_string((char *)curr_sfx); } /*=gfunc tpl_file @@ -662,10 +662,10 @@ char z[AG_PATH_MAX]; if (SUCCESSFUL(find_file(tpl_fname, z, sfx, NULL))) - return AG_SCM_STR02SCM(z); + return scm_from_latin1_string(z); } - return AG_SCM_STR02SCM(C(char *, tpl_fname)); + return scm_from_latin1_string(C(char *, tpl_fname)); } /** @@ -689,7 +689,7 @@ } sprintfv(buf, fmt, (snv_constpointer *)args); - return AG_SCM_STR02SCM(buf); + return scm_from_latin1_string(buf); } /*=gfunc tpl_file_line @@ -718,7 +718,7 @@ ag_scm_tpl_file_line(SCM fmt_scm) { char const * fmt = TPL_FILE_LINE_FMT; - if (AG_SCM_STRING_P(fmt_scm)) + if (scm_is_string(fmt_scm)) fmt = ag_scm2zchars(fmt_scm, "f/l fmt"); return do_tpl_file_line(0, fmt); @@ -739,7 +739,7 @@ ag_scm_tpl_file_next_line(SCM fmt_scm) { char const * fmt = TPL_FILE_NEXT_LINE_FMT; - if (AG_SCM_STRING_P(fmt_scm)) + if (scm_is_string(fmt_scm)) fmt = ag_scm2zchars(fmt_scm, "f/l fmt"); return do_tpl_file_line(1, fmt); @@ -750,8 +750,8 @@ * what: get the maximum input file modification time * * doc: returns the time stamp of the most recently modified sourc file as the - * number of seconds since the epoch. If any input is dynamic (a shell command), - * then it will be the current time. + * number of seconds since the epoch. If any input is dynamic + * (a shell command), then it will be the current time. =*/ SCM ag_scm_max_file_time(void) @@ -797,7 +797,7 @@ if (def == NULL) return SCM_UNDEFINED; - if (AG_SCM_STRING_P(fmt_scm)) + if (scm_is_string(fmt_scm)) fmt = ag_scm2zchars(fmt_scm, "f/l fmt"); { @@ -817,7 +817,7 @@ sprintfv(buf, fmt, (snv_constpointer *)args); } - return AG_SCM_STR02SCM(buf); + return scm_from_latin1_string(buf); } /** diff -Nru autogen-5.18.7/agen5/expString.c autogen-5.18.12/agen5/expString.c --- autogen-5.18.7/agen5/expString.c 2015-08-08 23:40:32.000000000 +0000 +++ autogen-5.18.12/agen5/expString.c 2016-05-23 15:09:15.000000000 +0000 @@ -10,7 +10,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -44,6 +44,9 @@ SCM repl, char ** ppz_res, ssize_t * res_len); + +static inline void +tr_char_range(unsigned char * ch_map, unsigned char * from, unsigned char * to); /* = = = END-STATIC-FORWARD = = = */ static size_t @@ -135,7 +138,7 @@ dtaSize = stringify_for_sh(pzNew, qt, pzDta); { - SCM res = AG_SCM_STR2SCM(pzNew, dtaSize); + SCM res = scm_from_latin1_stringn(pzNew, dtaSize); AGFREE(pzNew); return res; } @@ -180,8 +183,8 @@ { char * pzMatch = ag_scm2zchars(match, "match text"); char * rep_str = ag_scm2zchars(repl, "repl text"); - int mark_len = (int)AG_SCM_STRLEN(match); - int repl_len = (int)AG_SCM_STRLEN(repl); + int mark_len = (int)scm_c_string_length(match); + int repl_len = (int)scm_c_string_length(repl); { int ct = sub_count(src_str, pzMatch); @@ -242,7 +245,7 @@ match = SCM_CDR(match); repl = SCM_CDR(repl); - if (AG_SCM_STRING_P(matchCar)) { + if (scm_is_string(matchCar)) { do_substitution(pzStr, *pStrLen, matchCar, replCar, &pzNxt, pStrLen); @@ -278,7 +281,7 @@ SCM ag_scm_mk_gettextable(SCM txt) { - if (AG_SCM_STRING_P(txt)) { + if (scm_is_string(txt)) { char const * pz = ag_scm2zchars(txt, "txt"); optionPrintParagraphs(pz, false, cur_fpstack->stk_fp); } @@ -303,18 +306,18 @@ SCM car; char const * pz1; - if (! AG_SCM_STRING_P(obj)) + if (! scm_is_string(obj)) return SCM_UNDEFINED; pz1 = scm_i_string_chars(obj); - lenz = AG_SCM_STRLEN(obj); + lenz = scm_c_string_length(obj); /* * If the second argument is a string somehow, then treat * this as a straight out string comparison */ - if (AG_SCM_STRING_P(list)) { - if ( (AG_SCM_STRLEN(list) == lenz) + if (scm_is_string(list)) { + if ( (scm_c_string_length(list) == lenz) && (strncmp(pz1, scm_i_string_chars(list), lenz) == 0)) return SCM_BOOL_T; return SCM_BOOL_F; @@ -337,13 +340,13 @@ * hands it to us, it magically becomes a nested list. * This unravels that. */ - if (! AG_SCM_STRING_P(car)) { + if (! scm_is_string(car)) { if (ag_scm_in_p(obj, car) == SCM_BOOL_T) return SCM_BOOL_T; continue; } - if ( (AG_SCM_STRLEN(car) == lenz) + if ( (scm_c_string_length(car) == lenz) && (strncmp(pz1, scm_i_string_chars(car), lenz) == 0) ) return SCM_BOOL_T; } @@ -376,15 +379,15 @@ char const * pzSep; char * pzScan; - if (! AG_SCM_STRING_P(sep)) + if (! scm_is_string(sep)) return SCM_UNDEFINED; sv_l_len = l_len = (int)scm_ilength(list); if (l_len == 0) - return AG_SCM_STR02SCM(zNil); + return scm_from_latin1_string(zNil); pzSep = scm_i_string_chars(sep); - sep_len = AG_SCM_STRLEN(sep); + sep_len = scm_c_string_length(sep); str_len = 0; /* @@ -400,14 +403,14 @@ * hands it to us, it magically becomes a nested list. * This unravels that. */ - if (! AG_SCM_STRING_P(car)) { + if (! scm_is_string(car)) { if (car != SCM_UNDEFINED) car = ag_scm_join(sep, car); - if (! AG_SCM_STRING_P(car)) + if (! scm_is_string(car)) return SCM_UNDEFINED; } - str_len += AG_SCM_STRLEN(car); + str_len += scm_c_string_length(car); if (--l_len <= 0) break; @@ -430,10 +433,10 @@ /* * This unravels nested lists. */ - if (! AG_SCM_STRING_P(car)) + if (! scm_is_string(car)) car = ag_scm_join(sep, car); - cpy_len = AG_SCM_STRLEN(car); + cpy_len = scm_c_string_length(car); memcpy(VOIDP(pzScan), scm_i_string_chars(car), cpy_len); pzScan += cpy_len; @@ -446,7 +449,7 @@ pzScan += sep_len; } - return AG_SCM_STR2SCM(pzRes, str_len); + return scm_from_latin1_stringn(pzRes, str_len); } @@ -516,7 +519,7 @@ * Trim trailing white space on the final line. */ scan = SPN_HORIZ_WHITE_BACK(r_str, scan); - return AG_SCM_STR2SCM(r_str, scan - r_str); + return scm_from_latin1_stringn(r_str, scan - r_str); case NL: /* @@ -564,7 +567,7 @@ data = ag_scm2zchars(obj, "AG Object"); { - size_t dtaSize = AG_SCM_STRLEN(obj) + 3; /* NUL + 2 quotes */ + size_t dtaSize = scm_c_string_length(obj) + 3; /* NUL + 2 quotes */ pz = data-1; for (;;) { pz = strchr(pz+1, '\''); @@ -625,7 +628,7 @@ returnString: { - SCM res = AG_SCM_STR02SCM(pzFree); + SCM res = scm_from_latin1_string(pzFree); AGFREE(pzFree); return res; } @@ -754,7 +757,7 @@ if (pDE->de_type != VALTYP_TEXT) return SCM_UNDEFINED; - str = AG_SCM_STR02SCM(pDE->de_val.dvu_text); + str = scm_from_latin1_string(pDE->de_val.dvu_text); *pos = scm_cons(str, SCM_EOL); pos = SCM_CDRLOC(*pos); } @@ -783,7 +786,7 @@ char const * pz = ag_scm2zchars(str, "krstr"); SCM res; pz = optionQuoteString(pz, KR_STRING_NEWLINE); - res = AG_SCM_STR02SCM(pz); + res = scm_from_latin1_string(pz); AGFREE(pz); return res; } @@ -814,11 +817,28 @@ char const * pz = ag_scm2zchars(str, "cstr"); SCM res; pz = optionQuoteString(pz, C_STRING_NEWLINE); - res = AG_SCM_STR02SCM(pz); + res = scm_from_latin1_string(pz); AGFREE(pz); return res; } +/** + * Map a character range for ag_scm_string_tr_x() + */ +static inline void +tr_char_range(unsigned char * ch_map, unsigned char * from, unsigned char * to) +{ + unsigned char fs = (unsigned char)from[-2]; // "from" start char + unsigned char fe = (unsigned char)from[0]; // "from" end char + unsigned char ts = (unsigned char)to[-2]; // "to" start char + unsigned char te = (unsigned char)to[0]; // "to" end char + + while (fs < fe) { + ch_map[ fs++ ] = ts; + if (ts < te) + ts++; + } +} /*=gfunc string_tr_x * @@ -863,18 +883,21 @@ goto map_done; case '-': - if ((i > 0) && (tch == '-')) { - unsigned char fs = (unsigned char)from[-2]; - unsigned char fe = (unsigned char)from[0]; - unsigned char ts = (unsigned char)to[-2]; - unsigned char te = (unsigned char)to[0]; - if (te != NUL) { - while (fs < fe) { - ch_map[ fs++ ] = ts; - if (ts < te) ts++; - } - break; - } + /* + * "from" char is a hyphen. + * IF we are beyond the first character AND + * the "to" character is a hyphen AND + * there is a "from" character after the hyphen + * there is a "to" character after the hyphen, + * THEN map a character range + */ + if ( (i > 0) + && (tch == '-') + && (from[0] != NUL) + && (to[0] != NUL)) { + tr_char_range(ch_map, (unsigned char *)from, + (unsigned char *)to); + break; } default: @@ -883,7 +906,7 @@ } map_done:; to = C(char *, scm_i_string_chars(str)); - i = (int)AG_SCM_STRLEN(str); + i = (int)scm_c_string_length(str); while (i-- > 0) { *to = (char)ch_map[ (int)*to ]; to++; @@ -906,8 +929,8 @@ SCM ag_scm_string_tr(SCM Str, SCM From, SCM To) { - size_t lenz = AG_SCM_STRLEN(Str); - SCM res = AG_SCM_STR2SCM(scm_i_string_chars(Str), lenz); + size_t lenz = scm_c_string_length(Str); + SCM res = scm_from_latin1_stringn(scm_i_string_chars(Str), lenz); return ag_scm_string_tr_x(res, From, To); } @@ -938,18 +961,18 @@ ssize_t len; SCM res; - if (! AG_SCM_STRING_P(str)) + if (! scm_is_string(str)) return SCM_UNDEFINED; text = scm_i_string_chars(str); - len = (ssize_t)AG_SCM_STRLEN(str); + len = (ssize_t)scm_c_string_length(str); - if (AG_SCM_STRING_P(Match)) + if (scm_is_string(Match)) do_substitution(text, len, Match, Repl, (char **)&text, &len); else do_multi_subs((char **)&text, &len, Match, Repl); - res = AG_SCM_STR2SCM(text, (size_t)len); + res = scm_from_latin1_stringn(text, (size_t)len); return res; } @@ -974,7 +997,7 @@ char const * pz; time_t time_period; - if (! AG_SCM_STRING_P(time_spec)) + if (! scm_is_string(time_spec)) return SCM_UNDEFINED; pz = scm_i_string_chars(time_spec); diff -Nru autogen-5.18.7/agen5/fmemopen.c autogen-5.18.12/agen5/fmemopen.c --- autogen-5.18.7/agen5/fmemopen.c 2015-10-03 16:49:53.000000000 +0000 +++ autogen-5.18.12/agen5/fmemopen.c 2016-03-08 17:00:36.000000000 +0000 @@ -25,7 +25,7 @@ /** * @file fmemopen.c * - * Copyright (C) 2004-2014 by Bruce Korb. All rights reserved. + * Copyright (C) 2004-2014, 2016 by Bruce Korb. All rights reserved. * * This code was inspired from software written by * Hanno Mueller, kontakt@hanno.de diff -Nru autogen-5.18.7/agen5/fsm-macro.tlib autogen-5.18.12/agen5/fsm-macro.tlib --- autogen-5.18.7/agen5/fsm-macro.tlib 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/fsm-macro.tlib 2016-03-08 17:00:36.000000000 +0000 @@ -1,7 +1,7 @@ [= AutoGen5 Template -*- Mode: Scheme -*- #; This file is part of AutoGen. -#; AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +#; AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved #; #; AutoGen is free software: you can redistribute it and/or modify it #; under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/fsm.tpl autogen-5.18.12/agen5/fsm.tpl --- autogen-5.18.7/agen5/fsm.tpl 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/fsm.tpl 2016-05-23 15:09:15.000000000 +0000 @@ -4,7 +4,7 @@ =] [= (define cright-years - "Copyright (C) 1992-2015 Bruce Korb - all rights reserved" + "Copyright (C) 1992-2016 Bruce Korb - all rights reserved" ) =][= # /* @@ -76,7 +76,7 @@ suitable for use in a procedure header. It is used to pass through arguments to implementation code. - transition Define the handling for a transition from one state to another. + transition Define the handling for a transition to a new state. It contains: tst the starting state(s). This may be one, or a list or '*' to indicate all states. diff -Nru autogen-5.18.7/agen5/fsm-trans.tlib autogen-5.18.12/agen5/fsm-trans.tlib --- autogen-5.18.7/agen5/fsm-trans.tlib 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/fsm-trans.tlib 2016-03-08 17:00:36.000000000 +0000 @@ -1,7 +1,7 @@ [= AutoGen5 Template -*- Mode: Text -*- ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/funcCase.c autogen-5.18.12/agen5/funcCase.c --- autogen-5.18.7/agen5/funcCase.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/funcCase.c 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/funcDef.c autogen-5.18.12/agen5/funcDef.c --- autogen-5.18.7/agen5/funcDef.c 2015-08-08 23:40:32.000000000 +0000 +++ autogen-5.18.12/agen5/funcDef.c 2016-05-23 15:09:15.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -505,7 +505,7 @@ } res = ag_eval(def_list->pzExpr); - if (AG_SCM_STRING_P(res)) { + if (scm_is_string(res)) { AGDUPSTR(def_list->de.de_val.dvu_text, ag_scm2zchars(res, "res"), "ev res"); } diff -Nru autogen-5.18.7/agen5/funcEval.c autogen-5.18.12/agen5/funcEval.c --- autogen-5.18.7/agen5/funcEval.c 2015-08-08 23:40:32.000000000 +0000 +++ autogen-5.18.12/agen5/funcEval.c 2016-05-23 15:09:15.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -32,6 +32,10 @@ static void tpl_warning(templ_t * tpl, macro_t * mac, char const * msg); +static char const * +is_mac_entry_ok(bool * allocated, def_ent_t * ent, + int * code, templ_t * tpl, macro_t * mac); + static void emit_insertion_file(char const * fname, FILE * outfp); @@ -123,6 +127,76 @@ fprintf(trace_fp, TPL_WARN_FMT, tpl->td_file, mac->md_line, msg); } +/** + * eval_mac_expr() helper function. Determine if the entry found is + * a text entry. If not, we return an empty string. + * + * @param allocated whether the returned string has been allocated + * @param ent The macro entry we found. Now testing validity. + * @param code flag word to indicate we found a valid string + * @param tpl the current template being parsed + * @param mac the current macro being invoked + * + * @returns a pointer to the macro substitution text + */ +static char const * +is_mac_entry_ok(bool * allocated, def_ent_t * ent, + int * code, templ_t * tpl, macro_t * mac) +{ + char const * res = (char *)zNil; + + if ((*code & EMIT_IF_ABSENT) != 0) + return res; + + if ( (ent->de_type != VALTYP_TEXT) + && ((*code & EMIT_PRIMARY_TYPE) == EMIT_VALUE) ) { + tpl_warning(tpl, mac, EVAL_EXPR_BLOCK_IN_EVAL); + return res; + } + + /* + * Compute the expression string. There are three possibilities: + * 1. There is an expression string in the macro, but it must + * be formatted with the text value. + * Make sure we have a value. + * 2. There is an expression string in the macro, but it is *NOT* + * to be formatted. Use it as is. Do *NOT* verify that + * the define value is text. + * 3. There is no expression with the macro invocation. + * The define value *must* be text. + */ + if ((*code & EMIT_FORMATTED) != 0) { + /* + * And make sure what we found is a text value + */ + if (ent->de_type != VALTYP_TEXT) { + tpl_warning(tpl, mac, EVAL_EXPR_BLOCK_IN_EVAL); + return res; + } + + *allocated = true; + res = aprf(tpl_text(tpl, mac), ent->de_val.dvu_text); + } + + else if (mac->md_txt_off != 0) + res = tpl->td_text + mac->md_txt_off; + + else { + /* + * And make sure what we found is a text value + */ + if (ent->de_type != VALTYP_TEXT) { + tpl_warning(tpl, mac, EVAL_EXPR_BLOCK_IN_EVAL); + return res; + } + + res = ent->de_val.dvu_text; + } + + *code &= EMIT_PRIMARY_TYPE; + return res; +} + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** * Evaluate an expression and return a string pointer. Always. @@ -201,55 +275,9 @@ * OTHERWISE, we found an entry. Make sure we were supposed to. */ else { - if ((code & EMIT_IF_ABSENT) != 0) - return (char *)zNil; - - if ( (ent->de_type != VALTYP_TEXT) - && ((code & EMIT_PRIMARY_TYPE) == EMIT_VALUE) ) { - tpl_warning(tpl, mac, EVAL_EXPR_BLOCK_IN_EVAL); - return (char *)zNil; - } - - /* - * Compute the expression string. There are three possibilities: - * 1. There is an expression string in the macro, but it must - * be formatted with the text value. - * Make sure we have a value. - * 2. There is an expression string in the macro, but it is *NOT* - * to be formatted. Use it as is. Do *NOT* verify that - * the define value is text. - * 3. There is no expression with the macro invocation. - * The define value *must* be text. - */ - if ((code & EMIT_FORMATTED) != 0) { - /* - * And make sure what we found is a text value - */ - if (ent->de_type != VALTYP_TEXT) { - tpl_warning(tpl, mac, EVAL_EXPR_BLOCK_IN_EVAL); - return (char *)zNil; - } - - *allocated = true; - text = aprf(tpl_text(tpl, mac), ent->de_val.dvu_text); - } - - else if (mac->md_txt_off != 0) - text = tpl->td_text + mac->md_txt_off; - - else { - /* - * And make sure what we found is a text value - */ - if (ent->de_type != VALTYP_TEXT) { - tpl_warning(tpl, mac, EVAL_EXPR_BLOCK_IN_EVAL); - return (char *)zNil; - } - - text = ent->de_val.dvu_text; - } - - code &= EMIT_PRIMARY_TYPE; + text = is_mac_entry_ok(allocated, ent, &code, tpl, mac); + if (text == zNil) + return text; } } @@ -376,7 +404,7 @@ if (scm_is_null(val)) break; - if (AG_SCM_STRING_P(val)) { + if (scm_is_string(val)) { fputs((char *)ag_scm2zchars(val, "emit val"), fp); fflush(fp); break; @@ -475,7 +503,7 @@ if (scm_is_null(val)) break; - if (AG_SCM_STRING_P(val)) { + if (scm_is_string(val)) { emit_insertion_file(ag_scm2zchars(val, "emit val"), fp); break; } @@ -527,7 +555,7 @@ (void)span_quote(pzTemp); expr = shell_cmd(pzTemp); AGFREE(pzTemp); - res = AG_SCM_STR02SCM((char *)expr); + res = scm_from_latin1_string((char *)expr); AGFREE(expr); break; @@ -540,7 +568,7 @@ /* FALLTHROUGH */ default: - res = AG_SCM_STR02SCM((char *)expr); + res = scm_from_latin1_string((char *)expr); if (allocated) AGFREE(expr); } diff -Nru autogen-5.18.7/agen5/funcFor.c autogen-5.18.12/agen5/funcFor.c --- autogen-5.18.7/agen5/funcFor.c 2015-08-22 19:10:18.000000000 +0000 +++ autogen-5.18.12/agen5/funcFor.c 2016-05-23 15:09:15.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -59,7 +59,7 @@ find_for_state(SCM which_scm) { ivk_info_t * srch = curr_ivk_info; - char const * which = AG_SCM_STRING_P(which_scm) + char const * which = scm_is_string(which_scm) ? ag_scm2zchars(which_scm, "which for") : NULL; for (; srch != NULL; srch = srch->ii_prev) { @@ -101,7 +101,7 @@ if (p == NULL) return SCM_UNDEFINED; - if (! AG_SCM_STRING_P(which)) + if (! scm_is_string(which)) return (for_state->for_isfirst) ? SCM_BOOL_T : SCM_BOOL_F; which = p->for_isfirst ? SCM_BOOL_T : SCM_BOOL_F; @@ -185,7 +185,7 @@ if ((! for_state->for_loading) || (! scm_is_number(from))) return SCM_UNDEFINED; - for_state->for_from = AG_SCM_TO_INT(from); + for_state->for_from = scm_to_int(from); return SCM_BOOL_T; } @@ -206,7 +206,7 @@ if ((! for_state->for_loading) || (! scm_is_number(to))) return SCM_UNDEFINED; - for_state->for_to = AG_SCM_TO_INT(to); + for_state->for_to = scm_to_int(to); return SCM_BOOL_T; } @@ -227,7 +227,7 @@ if ((! for_state->for_loading) || (! scm_is_number(by))) return SCM_UNDEFINED; - for_state->for_by = AG_SCM_TO_INT(by); + for_state->for_by = scm_to_int(by); return SCM_BOOL_T; } @@ -245,7 +245,7 @@ SCM ag_scm_for_sep(SCM obj) { - if ((! for_state->for_loading) || (! AG_SCM_STRING_P(obj))) + if ((! for_state->for_loading) || (! scm_is_string(obj))) return SCM_UNDEFINED; AGDUPSTR(for_state->for_sep_str, ag_scm2zchars(obj, "sep"), "seps"); @@ -326,7 +326,8 @@ def_ent_t * lde = (found->de_etwin != NULL) ? found->de_etwin : found; if (for_state->for_from == UNASSIGNED) - for_state->for_from = invert ? (int)lde->de_index : (int)found->de_index; + for_state->for_from = + invert ? (int)lde->de_index : (int)found->de_index; if (for_state->for_to == UNASSIGNED) for_state->for_to = invert ? (int)found->de_index : (int)lde->de_index; diff -Nru autogen-5.18.7/agen5/funcIf.c autogen-5.18.12/agen5/funcIf.c --- autogen-5.18.7/agen5/funcIf.c 2015-08-08 23:40:32.000000000 +0000 +++ autogen-5.18.12/agen5/funcIf.c 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/functions.c autogen-5.18.12/agen5/functions.c --- autogen-5.18.7/agen5/functions.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/functions.c 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/guile-iface.def autogen-5.18.12/agen5/guile-iface.def --- autogen-5.18.7/agen5/guile-iface.def 2015-08-09 00:38:15.000000000 +0000 +++ autogen-5.18.12/agen5/guile-iface.def 2016-05-23 15:09:15.000000000 +0000 @@ -3,7 +3,7 @@ * \file guile-iface.def * * This file is part of AutoGen. - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -51,48 +51,6 @@ }; iface = { - i-name = str02scm; - i-args = '_s'; - i-impl = { i-end = '201'; i-code = 'scm_from_latin1_string(_s)'; }; -}; - -iface = { - i-name = str2scm; - i-args = '_st,_sz'; - i-impl = { i-end = '201'; i-code = 'scm_from_latin1_stringn(_st,_sz)'; }; -}; - -iface = { - i-name = to_newstr; - i-args = '_s'; - i-impl = { i-end = '201'; i-code = 'scm_to_latin1_string(_s)'; }; -}; - -iface = { - i-name = string_p; - i-args = '_s'; - i-impl = { i-end = '201'; i-code = 'scm_is_string(_s)'; }; -}; - -iface = { - i-name = strlen; - i-args = '_s'; - i-impl = { i-end = '201'; i-code = 'scm_c_string_length(_s)'; }; -}; - -iface = { - i-name = sym_p; - i-args = '_s'; - i-impl = { i-end = '201'; i-code = 'scm_is_symbol(_s)'; }; -}; - -iface = { - i-name = to_int; - i-args = '_i'; - i-impl = { i-end = '201'; i-code = 'scm_to_int(_i)'; }; -}; - -iface = { i-name = to_long; i-args = '_v'; i-impl = { i-end = '201'; i-code = 'scm_to_long(_v)'; }; @@ -104,9 +62,4 @@ i-impl = { i-end = '201'; i-code = '((unsigned long)scm_to_ulong(_v))'; }; }; -iface = { - i-name = vec_p; - i-args = '_v'; - i-impl = { i-end = '201'; i-code = 'scm_is_vector(_v)'; }; -}; /* end of guile-iface.def */ diff -Nru autogen-5.18.7/agen5/guile-iface.h autogen-5.18.12/agen5/guile-iface.h --- autogen-5.18.7/agen5/guile-iface.h 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/guile-iface.h 2016-08-29 21:35:43.000000000 +0000 @@ -13,16 +13,8 @@ # define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p)) # define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l)) # define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p)) -# define AG_SCM_STR02SCM(_s) scm_from_latin1_string(_s) -# define AG_SCM_STR2SCM(_st,_sz) scm_from_latin1_stringn(_st,_sz) -# define AG_SCM_TO_NEWSTR(_s) scm_to_latin1_string(_s) -# define AG_SCM_STRING_P(_s) scm_is_string(_s) -# define AG_SCM_STRLEN(_s) scm_c_string_length(_s) -# define AG_SCM_SYM_P(_s) scm_is_symbol(_s) -# define AG_SCM_TO_INT(_i) scm_to_int(_i) # define AG_SCM_TO_LONG(_v) scm_to_long(_v) # define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v)) -# define AG_SCM_VEC_P(_v) scm_is_vector(_v) #else # error unknown GUILE_VERSION diff -Nru autogen-5.18.7/agen5/guile-iface.tpl autogen-5.18.12/agen5/guile-iface.tpl --- autogen-5.18.7/agen5/guile-iface.tpl 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/guile-iface.tpl 2016-03-08 17:00:36.000000000 +0000 @@ -2,7 +2,7 @@ [= ;;; This file is part of AutoGen. -;;; Copyright (C) 1992-2015 Bruce Korb - all rights reserved +;;; Copyright (C) 1992-2016 Bruce Korb - all rights reserved ;;; ;;; AutoGen is free software: you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/invoke-autogen.texi autogen-5.18.12/agen5/invoke-autogen.texi --- autogen-5.18.7/agen5/invoke-autogen.texi 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/invoke-autogen.texi 2016-08-29 21:35:43.000000000 +0000 @@ -66,7 +66,7 @@ @exampleindent 0 @example -autogen (GNU AutoGen) - The Automated Program Generator - Ver. 5.18.7 +autogen (GNU AutoGen) - The Automated Program Generator - Ver. 5.18.11 Usage: autogen [ - [] | --[@{=| @}] ]... [ ] The following options select definitions, templates and scheme functions @@ -165,7 +165,7 @@ or an integer from 0 through 6 AutoGen is a tool designed for generating program files that contain repetitive text with varied substitutions. -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-05-27) Report autogen bugs to bkorb@@gnu.org @end example @exampleindent 4 diff -Nru autogen-5.18.7/agen5/loadPseudo.c autogen-5.18.12/agen5/loadPseudo.c --- autogen-5.18.7/agen5/loadPseudo.c 2015-08-09 00:16:28.000000000 +0000 +++ autogen-5.18.12/agen5/loadPseudo.c 2016-03-08 17:00:36.000000000 +0000 @@ -12,7 +12,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/Makefile.am autogen-5.18.12/agen5/Makefile.am --- autogen-5.18.7/agen5/Makefile.am 2015-12-07 00:04:16.000000000 +0000 +++ autogen-5.18.12/agen5/Makefile.am 2016-08-29 21:35:46.000000000 +0000 @@ -3,7 +3,7 @@ ## Makefile.am -- process this file with automake to produce Makefile.in ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/Makefile.in autogen-5.18.12/agen5/Makefile.in --- autogen-5.18.7/agen5/Makefile.in 2015-12-07 00:04:42.000000000 +0000 +++ autogen-5.18.12/agen5/Makefile.in 2016-08-29 21:36:16.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -82,8 +92,6 @@ target_triplet = @target@ bin_PROGRAMS = autogen$(EXEEXT) subdir = agen5 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -100,6 +108,7 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -229,6 +238,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -492,7 +502,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu agen5/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu agen5/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -961,6 +970,8 @@ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-man uninstall-man1 uninstall-pkgdataDATA +.PRECIOUS: Makefile + ag.c : Makefile exec > $@ ; \ diff -Nru autogen-5.18.7/agen5/mk-stamps.sh autogen-5.18.12/agen5/mk-stamps.sh --- autogen-5.18.7/agen5/mk-stamps.sh 2015-08-25 18:00:32.000000000 +0000 +++ autogen-5.18.12/agen5/mk-stamps.sh 2016-03-08 17:00:36.000000000 +0000 @@ -3,7 +3,7 @@ # agen5/mk-stamps.sh # ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/opts.c autogen-5.18.12/agen5/opts.c --- autogen-5.18.7/agen5/opts.c 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/opts.c 2016-08-29 21:35:43.000000000 +0000 @@ -57,7 +57,7 @@ #endif extern FILE * option_usage_fp; #define zCopyright (autogen_opt_strs+0) -#define zLicenseDescrip (autogen_opt_strs+271) +#define zLicenseDescrip (autogen_opt_strs+272) /* * global included definitions @@ -101,13 +101,13 @@ /** * static const strings for autogen options */ -static char const autogen_opt_strs[3234] = -/* 0 */ "autogen (GNU AutoGen) 5.18.7\n" +static char const autogen_opt_strs[3237] = +/* 0 */ "autogen (GNU AutoGen) 5.18.12\n" "Copyright (C) 1992-2015 Bruce Korb, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the GNU General Public License,\n" "version 3 or later \n\0" -/* 271 */ "autogen is free software: you can redistribute it and/or modify it under\n" +/* 272 */ "autogen is free software: you can redistribute it and/or modify it under\n" "the terms of the GNU General Public License as published by the Free\n" "Software Foundation, either version 3 of the License, or (at your option)\n" "any later version.\n\n" @@ -117,122 +117,122 @@ "details.\n\n" "You should have received a copy of the GNU General Public License along\n" "with this program. If not, see .\n\0" -/* 874 */ "The following options select definitions, templates and scheme functions\n" +/* 875 */ "The following options select definitions, templates and scheme functions\n" "to use:\0" -/* 955 */ "Search for templates in DIR\0" -/* 983 */ "TEMPL_DIRS\0" -/* 994 */ "templ-dirs\0" -/* 1005 */ "Use TPL-FILE for the template\0" -/* 1035 */ "OVERRIDE_TPL\0" -/* 1048 */ "override-tpl\0" -/* 1061 */ "Load AutoGen macros from TPL-FILE (deprecated)\0" -/* 1108 */ "LIB_TEMPLATE\0" -/* 1121 */ "lib-template\0" -/* 1134 */ "Read definitions from FILE\0" -/* 1161 */ "DEFINITIONS\0" -/* 1173 */ "no-definitions\0" -/* 1188 */ "no\0" -/* 1191 */ "name or path name of shell to use\0" -/* 1225 */ "SHELL\0" -/* 1231 */ "shell\0" -/* 1237 */ "Do not use in-mem streams\0" -/* 1263 */ "NO_FMEMOPEN\0" -/* 1275 */ "no-fmemopen\0" -/* 1287 */ "characters considered equivalent\0" -/* 1320 */ "EQUATE\0" -/* 1327 */ "equate\0" -/* 1334 */ "_-^\0" -/* 1338 */ "The following options modify how output is handled:\0" -/* 1390 */ "Specify NAME as the base name for output\0" -/* 1431 */ "BASE_NAME\0" -/* 1441 */ "base-name\0" -/* 1451 */ "set mod times to latest source\0" -/* 1482 */ "SOURCE_TIME\0" -/* 1494 */ "no-source-time\0" -/* 1509 */ "Allow output files to be writable\0" -/* 1543 */ "WRITABLE\0" -/* 1552 */ "not-writable\0" -/* 1565 */ "not\0" -/* 1569 */ "The following options are often useful while debugging new templates:\0" -/* 1639 */ "Limit on increment loops\0" -/* 1664 */ "LOOP_LIMIT\0" -/* 1675 */ "loop-limit\0" -/* 1686 */ "Limit server shell operations to SECONDS\0" -/* 1727 */ "TIMEOUT\0" -/* 1735 */ "timeout\0" -/* 1743 */ "tracing level of detail\0" -/* 1767 */ "TRACE\0" -/* 1773 */ "trace\0" -/* 1779 */ "tracing output file or filter\0" -/* 1809 */ "TRACE_OUT\0" -/* 1819 */ "trace-out\0" -/* 1829 */ "Show the definition tree\0" -/* 1854 */ "SHOW_DEFS\0" -/* 1864 */ "show-defs\0" -/* 1874 */ "Show the definitions used\0" -/* 1900 */ "USED_DEFINES\0" -/* 1913 */ "used-defines\0" -/* 1926 */ "Leave a core dump on a failure exit\0" -/* 1962 */ "CORE\0" -/* 1967 */ "core\0" -/* 1972 */ "These options can be used to control what gets processed in the\n" +/* 956 */ "Search for templates in DIR\0" +/* 984 */ "TEMPL_DIRS\0" +/* 995 */ "templ-dirs\0" +/* 1006 */ "Use TPL-FILE for the template\0" +/* 1036 */ "OVERRIDE_TPL\0" +/* 1049 */ "override-tpl\0" +/* 1062 */ "Load AutoGen macros from TPL-FILE (deprecated)\0" +/* 1109 */ "LIB_TEMPLATE\0" +/* 1122 */ "lib-template\0" +/* 1135 */ "Read definitions from FILE\0" +/* 1162 */ "DEFINITIONS\0" +/* 1174 */ "no-definitions\0" +/* 1189 */ "no\0" +/* 1192 */ "name or path name of shell to use\0" +/* 1226 */ "SHELL\0" +/* 1232 */ "shell\0" +/* 1238 */ "Do not use in-mem streams\0" +/* 1264 */ "NO_FMEMOPEN\0" +/* 1276 */ "no-fmemopen\0" +/* 1288 */ "characters considered equivalent\0" +/* 1321 */ "EQUATE\0" +/* 1328 */ "equate\0" +/* 1335 */ "_-^\0" +/* 1339 */ "The following options modify how output is handled:\0" +/* 1391 */ "Specify NAME as the base name for output\0" +/* 1432 */ "BASE_NAME\0" +/* 1442 */ "base-name\0" +/* 1452 */ "set mod times to latest source\0" +/* 1483 */ "SOURCE_TIME\0" +/* 1495 */ "no-source-time\0" +/* 1510 */ "Allow output files to be writable\0" +/* 1544 */ "WRITABLE\0" +/* 1553 */ "not-writable\0" +/* 1566 */ "not\0" +/* 1570 */ "The following options are often useful while debugging new templates:\0" +/* 1640 */ "Limit on increment loops\0" +/* 1665 */ "LOOP_LIMIT\0" +/* 1676 */ "loop-limit\0" +/* 1687 */ "Limit server shell operations to SECONDS\0" +/* 1728 */ "TIMEOUT\0" +/* 1736 */ "timeout\0" +/* 1744 */ "tracing level of detail\0" +/* 1768 */ "TRACE\0" +/* 1774 */ "trace\0" +/* 1780 */ "tracing output file or filter\0" +/* 1810 */ "TRACE_OUT\0" +/* 1820 */ "trace-out\0" +/* 1830 */ "Show the definition tree\0" +/* 1855 */ "SHOW_DEFS\0" +/* 1865 */ "show-defs\0" +/* 1875 */ "Show the definitions used\0" +/* 1901 */ "USED_DEFINES\0" +/* 1914 */ "used-defines\0" +/* 1927 */ "Leave a core dump on a failure exit\0" +/* 1963 */ "CORE\0" +/* 1968 */ "core\0" +/* 1973 */ "These options can be used to control what gets processed in the\n" "definitions files and template files:\0" -/* 2074 */ "Skip the file with this SUFFIX\0" -/* 2105 */ "SKIP_SUFFIX\0" -/* 2117 */ "skip-suffix\0" -/* 2129 */ "specify this output suffix\0" -/* 2156 */ "SELECT_SUFFIX\0" -/* 2170 */ "select-suffix\0" -/* 2184 */ "name to add to definition list\0" -/* 2215 */ "DEFINE\0" -/* 2222 */ "define\0" -/* 2229 */ "definition list removal pattern\0" -/* 2261 */ "UNDEFINE\0" -/* 2270 */ "undefine\0" -/* 2279 */ "This option is used to automate dependency tracking:\0" -/* 2332 */ "emit make dependency file\0" -/* 2358 */ "MAKE_DEP\0" -/* 2367 */ "make-dep\0" -/* 2376 */ "help, version and option handling:\0" -/* 2411 */ "display extended usage information and exit\0" -/* 2455 */ "help\0" -/* 2460 */ "extended usage information passed thru pager\0" -/* 2505 */ "more-help\0" -/* 2515 */ "output version information and exit\0" -/* 2551 */ "version\0" -/* 2559 */ "reset an option's state\0" -/* 2583 */ "reset-option\0" -/* 2596 */ "abbreviated usage to stdout\0" -/* 2624 */ "usage\0" -/* 2630 */ "save the option state to a config file\0" -/* 2669 */ "save-opts\0" -/* 2679 */ "load options from a config file\0" -/* 2711 */ "LOAD_OPTS\0" -/* 2721 */ "no-load-opts\0" -/* 2734 */ "AUTOGEN\0" -/* 2742 */ "autogen (GNU AutoGen) - The Automated Program Generator - Ver. 5.18.7\n" +/* 2075 */ "Skip the file with this SUFFIX\0" +/* 2106 */ "SKIP_SUFFIX\0" +/* 2118 */ "skip-suffix\0" +/* 2130 */ "specify this output suffix\0" +/* 2157 */ "SELECT_SUFFIX\0" +/* 2171 */ "select-suffix\0" +/* 2185 */ "name to add to definition list\0" +/* 2216 */ "DEFINE\0" +/* 2223 */ "define\0" +/* 2230 */ "definition list removal pattern\0" +/* 2262 */ "UNDEFINE\0" +/* 2271 */ "undefine\0" +/* 2280 */ "This option is used to automate dependency tracking:\0" +/* 2333 */ "emit make dependency file\0" +/* 2359 */ "MAKE_DEP\0" +/* 2368 */ "make-dep\0" +/* 2377 */ "help, version and option handling:\0" +/* 2412 */ "display extended usage information and exit\0" +/* 2456 */ "help\0" +/* 2461 */ "extended usage information passed thru pager\0" +/* 2506 */ "more-help\0" +/* 2516 */ "output version information and exit\0" +/* 2552 */ "version\0" +/* 2560 */ "reset an option's state\0" +/* 2584 */ "reset-option\0" +/* 2597 */ "abbreviated usage to stdout\0" +/* 2625 */ "usage\0" +/* 2631 */ "save the option state to a config file\0" +/* 2670 */ "save-opts\0" +/* 2680 */ "load options from a config file\0" +/* 2712 */ "LOAD_OPTS\0" +/* 2722 */ "no-load-opts\0" +/* 2735 */ "AUTOGEN\0" +/* 2743 */ "autogen (GNU AutoGen) - The Automated Program Generator - Ver. 5.18.12\n" "Usage: %s [ - [] | --[{=| }] ]... [ ]\n\0" -/* 2885 */ "$HOME\0" -/* 2891 */ ".\0" -/* 2893 */ ".autogenrc\0" -/* 2904 */ "autogen-users@lists.sourceforge.net\0" -/* 2940 */ "AutoGen creates text files from templates using external definitions.\n\0" -/* 3011 */ "AutoGen is a tool designed for generating program files that contain\n" +/* 2887 */ "$HOME\0" +/* 2893 */ ".\0" +/* 2895 */ ".autogenrc\0" +/* 2906 */ "autogen-users@lists.sourceforge.net\0" +/* 2942 */ "AutoGen creates text files from templates using external definitions.\n\0" +/* 3013 */ "AutoGen is a tool designed for generating program files that contain\n" "repetitive text with varied substitutions.\n\0" -/* 3124 */ "autogen (GNU AutoGen) 5.18.7\0" -/* 3153 */ "nothing\0" -/* 3161 */ "debug-message\0" -/* 3175 */ "server-shell\0" -/* 3188 */ "templates\0" -/* 3198 */ "block-macros\0" -/* 3211 */ "expressions\0" -/* 3223 */ "everything"; +/* 3126 */ "autogen (GNU AutoGen) 5.18.12\0" +/* 3156 */ "nothing\0" +/* 3164 */ "debug-message\0" +/* 3178 */ "server-shell\0" +/* 3191 */ "templates\0" +/* 3201 */ "block-macros\0" +/* 3214 */ "expressions\0" +/* 3226 */ "everything"; /** * input-select option description: */ /** input-select option separation text */ -#define INPUT_SELECT_DESC (autogen_opt_strs+874) +#define INPUT_SELECT_DESC (autogen_opt_strs+875) #define INPUT_SELECT_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** @@ -240,11 +240,11 @@ */ /* TRANSLATORS: the option argument is a file name */ /** Descriptive text for the templ-dirs option */ -#define TEMPL_DIRS_DESC (autogen_opt_strs+955) +#define TEMPL_DIRS_DESC (autogen_opt_strs+956) /** Upper-cased name for the templ-dirs option */ -#define TEMPL_DIRS_NAME (autogen_opt_strs+983) +#define TEMPL_DIRS_NAME (autogen_opt_strs+984) /** Name string for the templ-dirs option */ -#define TEMPL_DIRS_name (autogen_opt_strs+994) +#define TEMPL_DIRS_name (autogen_opt_strs+995) /** Compiled in flag settings for the templ-dirs option */ #define TEMPL_DIRS_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -253,11 +253,11 @@ * override-tpl option description: */ /** Descriptive text for the override-tpl option */ -#define OVERRIDE_TPL_DESC (autogen_opt_strs+1005) +#define OVERRIDE_TPL_DESC (autogen_opt_strs+1006) /** Upper-cased name for the override-tpl option */ -#define OVERRIDE_TPL_NAME (autogen_opt_strs+1035) +#define OVERRIDE_TPL_NAME (autogen_opt_strs+1036) /** Name string for the override-tpl option */ -#define OVERRIDE_TPL_name (autogen_opt_strs+1048) +#define OVERRIDE_TPL_name (autogen_opt_strs+1049) /** Compiled in flag settings for the override-tpl option */ #define OVERRIDE_TPL_FLAGS (OPTST_DISABLED | OPTST_NO_INIT \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -266,11 +266,11 @@ * lib-template option description: */ /** Descriptive text for the lib-template option */ -#define LIB_TEMPLATE_DESC (autogen_opt_strs+1061) +#define LIB_TEMPLATE_DESC (autogen_opt_strs+1062) /** Upper-cased name for the lib-template option */ -#define LIB_TEMPLATE_NAME (autogen_opt_strs+1108) +#define LIB_TEMPLATE_NAME (autogen_opt_strs+1109) /** Name string for the lib-template option */ -#define LIB_TEMPLATE_name (autogen_opt_strs+1121) +#define LIB_TEMPLATE_name (autogen_opt_strs+1122) /** Compiled in flag settings for the lib-template option */ #define LIB_TEMPLATE_FLAGS (OPTST_DISABLED | OPTST_DEPRECATED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -279,13 +279,13 @@ * definitions option description: */ /** Descriptive text for the definitions option */ -#define DEFINITIONS_DESC (autogen_opt_strs+1134) +#define DEFINITIONS_DESC (autogen_opt_strs+1135) /** Upper-cased name for the definitions option */ -#define DEFINITIONS_NAME (autogen_opt_strs+1161) +#define DEFINITIONS_NAME (autogen_opt_strs+1162) /** disablement name for the definitions option */ -#define NOT_DEFINITIONS_name (autogen_opt_strs+1173) +#define NOT_DEFINITIONS_name (autogen_opt_strs+1174) /** disablement prefix for the definitions option */ -#define NOT_DEFINITIONS_PFX (autogen_opt_strs+1188) +#define NOT_DEFINITIONS_PFX (autogen_opt_strs+1189) /** Name string for the definitions option */ #define DEFINITIONS_name (NOT_DEFINITIONS_name + 3) /** Compiled in flag settings for the definitions option */ @@ -297,11 +297,11 @@ */ #ifdef SHELL_ENABLED /** Descriptive text for the shell option */ -#define SHELL_DESC (autogen_opt_strs+1191) +#define SHELL_DESC (autogen_opt_strs+1192) /** Upper-cased name for the shell option */ -#define SHELL_NAME (autogen_opt_strs+1225) +#define SHELL_NAME (autogen_opt_strs+1226) /** Name string for the shell option */ -#define SHELL_name (autogen_opt_strs+1231) +#define SHELL_name (autogen_opt_strs+1232) /** Compiled in flag settings for the shell option */ #define SHELL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -317,11 +317,11 @@ * no-fmemopen option description: */ /** Descriptive text for the no-fmemopen option */ -#define NO_FMEMOPEN_DESC (autogen_opt_strs+1237) +#define NO_FMEMOPEN_DESC (autogen_opt_strs+1238) /** Upper-cased name for the no-fmemopen option */ -#define NO_FMEMOPEN_NAME (autogen_opt_strs+1263) +#define NO_FMEMOPEN_NAME (autogen_opt_strs+1264) /** Name string for the no-fmemopen option */ -#define NO_FMEMOPEN_name (autogen_opt_strs+1275) +#define NO_FMEMOPEN_name (autogen_opt_strs+1276) /** Compiled in flag settings for the no-fmemopen option */ #define NO_FMEMOPEN_FLAGS (OPTST_DISABLED) @@ -329,13 +329,13 @@ * equate option description: */ /** Descriptive text for the equate option */ -#define EQUATE_DESC (autogen_opt_strs+1287) +#define EQUATE_DESC (autogen_opt_strs+1288) /** Upper-cased name for the equate option */ -#define EQUATE_NAME (autogen_opt_strs+1320) +#define EQUATE_NAME (autogen_opt_strs+1321) /** Name string for the equate option */ -#define EQUATE_name (autogen_opt_strs+1327) +#define EQUATE_name (autogen_opt_strs+1328) /** The compiled in default value for the equate option argument */ -#define EQUATE_DFT_ARG (autogen_opt_strs+1334) +#define EQUATE_DFT_ARG (autogen_opt_strs+1335) /** Compiled in flag settings for the equate option */ #define EQUATE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -344,18 +344,18 @@ * out-handling option description: */ /** out-handling option separation text */ -#define OUT_HANDLING_DESC (autogen_opt_strs+1338) +#define OUT_HANDLING_DESC (autogen_opt_strs+1339) #define OUT_HANDLING_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * base-name option description: */ /** Descriptive text for the base-name option */ -#define BASE_NAME_DESC (autogen_opt_strs+1390) +#define BASE_NAME_DESC (autogen_opt_strs+1391) /** Upper-cased name for the base-name option */ -#define BASE_NAME_NAME (autogen_opt_strs+1431) +#define BASE_NAME_NAME (autogen_opt_strs+1432) /** Name string for the base-name option */ -#define BASE_NAME_name (autogen_opt_strs+1441) +#define BASE_NAME_name (autogen_opt_strs+1442) /** Compiled in flag settings for the base-name option */ #define BASE_NAME_FLAGS (OPTST_DISABLED | OPTST_NO_INIT \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -364,13 +364,13 @@ * source-time option description: */ /** Descriptive text for the source-time option */ -#define SOURCE_TIME_DESC (autogen_opt_strs+1451) +#define SOURCE_TIME_DESC (autogen_opt_strs+1452) /** Upper-cased name for the source-time option */ -#define SOURCE_TIME_NAME (autogen_opt_strs+1482) +#define SOURCE_TIME_NAME (autogen_opt_strs+1483) /** disablement name for the source-time option */ -#define NOT_SOURCE_TIME_name (autogen_opt_strs+1494) +#define NOT_SOURCE_TIME_name (autogen_opt_strs+1495) /** disablement prefix for the source-time option */ -#define NOT_SOURCE_TIME_PFX (autogen_opt_strs+1188) +#define NOT_SOURCE_TIME_PFX (autogen_opt_strs+1189) /** Name string for the source-time option */ #define SOURCE_TIME_name (NOT_SOURCE_TIME_name + 3) /** Compiled in flag settings for the source-time option */ @@ -380,13 +380,13 @@ * writable option description: */ /** Descriptive text for the writable option */ -#define WRITABLE_DESC (autogen_opt_strs+1509) +#define WRITABLE_DESC (autogen_opt_strs+1510) /** Upper-cased name for the writable option */ -#define WRITABLE_NAME (autogen_opt_strs+1543) +#define WRITABLE_NAME (autogen_opt_strs+1544) /** disablement name for the writable option */ -#define NOT_WRITABLE_name (autogen_opt_strs+1552) +#define NOT_WRITABLE_name (autogen_opt_strs+1553) /** disablement prefix for the writable option */ -#define NOT_WRITABLE_PFX (autogen_opt_strs+1565) +#define NOT_WRITABLE_PFX (autogen_opt_strs+1566) /** Name string for the writable option */ #define WRITABLE_name (NOT_WRITABLE_name + 4) /** Compiled in flag settings for the writable option */ @@ -396,18 +396,18 @@ * debug-tpl option description: */ /** debug-tpl option separation text */ -#define DEBUG_TPL_DESC (autogen_opt_strs+1569) +#define DEBUG_TPL_DESC (autogen_opt_strs+1570) #define DEBUG_TPL_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * loop-limit option description: */ /** Descriptive text for the loop-limit option */ -#define LOOP_LIMIT_DESC (autogen_opt_strs+1639) +#define LOOP_LIMIT_DESC (autogen_opt_strs+1640) /** Upper-cased name for the loop-limit option */ -#define LOOP_LIMIT_NAME (autogen_opt_strs+1664) +#define LOOP_LIMIT_NAME (autogen_opt_strs+1665) /** Name string for the loop-limit option */ -#define LOOP_LIMIT_name (autogen_opt_strs+1675) +#define LOOP_LIMIT_name (autogen_opt_strs+1676) /** The compiled in default value for the loop-limit option argument */ #define LOOP_LIMIT_DFT_ARG ((char const*)256) /** Compiled in flag settings for the loop-limit option */ @@ -420,11 +420,11 @@ */ #ifdef SHELL_ENABLED /** Descriptive text for the timeout option */ -#define TIMEOUT_DESC (autogen_opt_strs+1686) +#define TIMEOUT_DESC (autogen_opt_strs+1687) /** Upper-cased name for the timeout option */ -#define TIMEOUT_NAME (autogen_opt_strs+1727) +#define TIMEOUT_NAME (autogen_opt_strs+1728) /** Name string for the timeout option */ -#define TIMEOUT_name (autogen_opt_strs+1735) +#define TIMEOUT_name (autogen_opt_strs+1736) /** Compiled in flag settings for the timeout option */ #define TIMEOUT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -440,11 +440,11 @@ * trace option description: */ /** Descriptive text for the trace option */ -#define TRACE_DESC (autogen_opt_strs+1743) +#define TRACE_DESC (autogen_opt_strs+1744) /** Upper-cased name for the trace option */ -#define TRACE_NAME (autogen_opt_strs+1767) +#define TRACE_NAME (autogen_opt_strs+1768) /** Name string for the trace option */ -#define TRACE_name (autogen_opt_strs+1773) +#define TRACE_name (autogen_opt_strs+1774) /** The compiled in default value for the trace option argument */ #define TRACE_DFT_ARG ((char const*)TRACE_NOTHING) /** Compiled in flag settings for the trace option */ @@ -455,11 +455,11 @@ * trace-out option description: */ /** Descriptive text for the trace-out option */ -#define TRACE_OUT_DESC (autogen_opt_strs+1779) +#define TRACE_OUT_DESC (autogen_opt_strs+1780) /** Upper-cased name for the trace-out option */ -#define TRACE_OUT_NAME (autogen_opt_strs+1809) +#define TRACE_OUT_NAME (autogen_opt_strs+1810) /** Name string for the trace-out option */ -#define TRACE_OUT_name (autogen_opt_strs+1819) +#define TRACE_OUT_name (autogen_opt_strs+1820) /** Compiled in flag settings for the trace-out option */ #define TRACE_OUT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -469,11 +469,11 @@ */ #ifdef DEBUG_ENABLED /** Descriptive text for the show-defs option */ -#define SHOW_DEFS_DESC (autogen_opt_strs+1829) +#define SHOW_DEFS_DESC (autogen_opt_strs+1830) /** Upper-cased name for the show-defs option */ -#define SHOW_DEFS_NAME (autogen_opt_strs+1854) +#define SHOW_DEFS_NAME (autogen_opt_strs+1855) /** Name string for the show-defs option */ -#define SHOW_DEFS_name (autogen_opt_strs+1864) +#define SHOW_DEFS_name (autogen_opt_strs+1865) /** Compiled in flag settings for the show-defs option */ #define SHOW_DEFS_FLAGS (OPTST_DISABLED | OPTST_NO_INIT) @@ -482,18 +482,18 @@ #define SHOW_DEFS_NAME NULL /** Descriptive text for the show-defs option */ #define SHOW_DEFS_DESC (NULL) -#define SHOW_DEFS_name (autogen_opt_strs+1864) +#define SHOW_DEFS_name (autogen_opt_strs+1865) #endif /* DEBUG_ENABLED */ /** * used-defines option description: */ /** Descriptive text for the used-defines option */ -#define USED_DEFINES_DESC (autogen_opt_strs+1874) +#define USED_DEFINES_DESC (autogen_opt_strs+1875) /** Upper-cased name for the used-defines option */ -#define USED_DEFINES_NAME (autogen_opt_strs+1900) +#define USED_DEFINES_NAME (autogen_opt_strs+1901) /** Name string for the used-defines option */ -#define USED_DEFINES_name (autogen_opt_strs+1913) +#define USED_DEFINES_name (autogen_opt_strs+1914) /** Compiled in flag settings for the used-defines option */ #define USED_DEFINES_FLAGS (OPTST_DISABLED | OPTST_NO_INIT) @@ -502,11 +502,11 @@ */ #ifdef HAVE_SYS_RESOURCE_H /** Descriptive text for the core option */ -#define CORE_DESC (autogen_opt_strs+1926) +#define CORE_DESC (autogen_opt_strs+1927) /** Upper-cased name for the core option */ -#define CORE_NAME (autogen_opt_strs+1962) +#define CORE_NAME (autogen_opt_strs+1963) /** Name string for the core option */ -#define CORE_name (autogen_opt_strs+1967) +#define CORE_name (autogen_opt_strs+1968) /** Compiled in flag settings for the core option */ #define CORE_FLAGS (OPTST_DISABLED) @@ -521,7 +521,7 @@ * processing option description: */ /** processing option separation text */ -#define PROCESSING_DESC (autogen_opt_strs+1972) +#define PROCESSING_DESC (autogen_opt_strs+1973) #define PROCESSING_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** @@ -529,11 +529,11 @@ * "Must also have options" and "Incompatible options": */ /** Descriptive text for the skip-suffix option */ -#define SKIP_SUFFIX_DESC (autogen_opt_strs+2074) +#define SKIP_SUFFIX_DESC (autogen_opt_strs+2075) /** Upper-cased name for the skip-suffix option */ -#define SKIP_SUFFIX_NAME (autogen_opt_strs+2105) +#define SKIP_SUFFIX_NAME (autogen_opt_strs+2106) /** Name string for the skip-suffix option */ -#define SKIP_SUFFIX_name (autogen_opt_strs+2117) +#define SKIP_SUFFIX_name (autogen_opt_strs+2118) /** Other options that appear in conjunction with the skip-suffix option */ static int const aSkip_SuffixCantList[] = { INDEX_OPT_SELECT_SUFFIX, NO_EQUIVALENT }; @@ -545,11 +545,11 @@ * select-suffix option description: */ /** Descriptive text for the select-suffix option */ -#define SELECT_SUFFIX_DESC (autogen_opt_strs+2129) +#define SELECT_SUFFIX_DESC (autogen_opt_strs+2130) /** Upper-cased name for the select-suffix option */ -#define SELECT_SUFFIX_NAME (autogen_opt_strs+2156) +#define SELECT_SUFFIX_NAME (autogen_opt_strs+2157) /** Name string for the select-suffix option */ -#define SELECT_SUFFIX_name (autogen_opt_strs+2170) +#define SELECT_SUFFIX_name (autogen_opt_strs+2171) /** Compiled in flag settings for the select-suffix option */ #define SELECT_SUFFIX_FLAGS (OPTST_DISABLED | OPTST_NO_INIT \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -558,11 +558,11 @@ * define option description: */ /** Descriptive text for the define option */ -#define DEFINE_DESC (autogen_opt_strs+2184) +#define DEFINE_DESC (autogen_opt_strs+2185) /** Upper-cased name for the define option */ -#define DEFINE_NAME (autogen_opt_strs+2215) +#define DEFINE_NAME (autogen_opt_strs+2216) /** Name string for the define option */ -#define DEFINE_name (autogen_opt_strs+2222) +#define DEFINE_name (autogen_opt_strs+2223) /** Compiled in flag settings for the define option */ #define DEFINE_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -571,11 +571,11 @@ * undefine option description: */ /** Descriptive text for the undefine option */ -#define UNDEFINE_DESC (autogen_opt_strs+2229) +#define UNDEFINE_DESC (autogen_opt_strs+2230) /** Upper-cased name for the undefine option */ -#define UNDEFINE_NAME (autogen_opt_strs+2261) +#define UNDEFINE_NAME (autogen_opt_strs+2262) /** Name string for the undefine option */ -#define UNDEFINE_name (autogen_opt_strs+2270) +#define UNDEFINE_name (autogen_opt_strs+2271) /** Compiled in flag settings for the undefine option */ #define UNDEFINE_FLAGS (OPTST_DISABLED | OPTST_NO_INIT \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -584,18 +584,18 @@ * dep-track option description: */ /** dep-track option separation text */ -#define DEP_TRACK_DESC (autogen_opt_strs+2279) +#define DEP_TRACK_DESC (autogen_opt_strs+2280) #define DEP_TRACK_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /** * make-dep option description: */ /** Descriptive text for the make-dep option */ -#define MAKE_DEP_DESC (autogen_opt_strs+2332) +#define MAKE_DEP_DESC (autogen_opt_strs+2333) /** Upper-cased name for the make-dep option */ -#define MAKE_DEP_NAME (autogen_opt_strs+2358) +#define MAKE_DEP_NAME (autogen_opt_strs+2359) /** Name string for the make-dep option */ -#define MAKE_DEP_name (autogen_opt_strs+2367) +#define MAKE_DEP_name (autogen_opt_strs+2368) /** Compiled in flag settings for the make-dep option */ #define MAKE_DEP_FLAGS (OPTST_DISABLED | OPTST_NO_INIT \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | OPTST_ARG_OPTIONAL) @@ -604,17 +604,17 @@ * autoopts-opts option description: */ /** autoopts-opts option separation text */ -#define AUTOOPTS_OPTS_DESC (autogen_opt_strs+2376) +#define AUTOOPTS_OPTS_DESC (autogen_opt_strs+2377) #define AUTOOPTS_OPTS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (autogen_opt_strs+2411) -#define HELP_name (autogen_opt_strs+2455) +#define HELP_DESC (autogen_opt_strs+2412) +#define HELP_name (autogen_opt_strs+2456) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (autogen_opt_strs+2460) -#define MORE_HELP_name (autogen_opt_strs+2505) +#define MORE_HELP_DESC (autogen_opt_strs+2461) +#define MORE_HELP_name (autogen_opt_strs+2506) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -627,19 +627,19 @@ # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (autogen_opt_strs+2515) -#define VER_name (autogen_opt_strs+2551) -#define RESET_DESC (autogen_opt_strs+2559) -#define RESET_name (autogen_opt_strs+2583) +#define VER_DESC (autogen_opt_strs+2516) +#define VER_name (autogen_opt_strs+2552) +#define RESET_DESC (autogen_opt_strs+2560) +#define RESET_name (autogen_opt_strs+2584) #define RESET_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)|OPTST_NO_INIT) -#define USAGE_DESC (autogen_opt_strs+2596) -#define USAGE_name (autogen_opt_strs+2624) -#define SAVE_OPTS_DESC (autogen_opt_strs+2630) -#define SAVE_OPTS_name (autogen_opt_strs+2669) -#define LOAD_OPTS_DESC (autogen_opt_strs+2679) -#define LOAD_OPTS_NAME (autogen_opt_strs+2711) -#define NO_LOAD_OPTS_name (autogen_opt_strs+2721) -#define LOAD_OPTS_pfx (autogen_opt_strs+1188) +#define USAGE_DESC (autogen_opt_strs+2597) +#define USAGE_name (autogen_opt_strs+2625) +#define SAVE_OPTS_DESC (autogen_opt_strs+2631) +#define SAVE_OPTS_name (autogen_opt_strs+2670) +#define LOAD_OPTS_DESC (autogen_opt_strs+2680) +#define LOAD_OPTS_NAME (autogen_opt_strs+2712) +#define NO_LOAD_OPTS_name (autogen_opt_strs+2722) +#define LOAD_OPTS_pfx (autogen_opt_strs+1189) #define LOAD_OPTS_name (NO_LOAD_OPTS_name + 3) /** * Declare option callback procedures @@ -1099,24 +1099,24 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of autogen. */ -#define zPROGNAME (autogen_opt_strs+2734) +#define zPROGNAME (autogen_opt_strs+2735) /** Reference to the title line for autogen usage. */ -#define zUsageTitle (autogen_opt_strs+2742) +#define zUsageTitle (autogen_opt_strs+2743) /** autogen configuration file name. */ -#define zRcName (autogen_opt_strs+2893) +#define zRcName (autogen_opt_strs+2895) /** Directories to search for autogen config files. */ static char const * const apzHomeList[3] = { - autogen_opt_strs+2885, - autogen_opt_strs+2891, + autogen_opt_strs+2887, + autogen_opt_strs+2893, NULL }; /** The autogen program bug email address. */ -#define zBugsAddr (autogen_opt_strs+2904) +#define zBugsAddr (autogen_opt_strs+2906) /** Clarification/explanation of what autogen does. */ -#define zExplain (autogen_opt_strs+2940) +#define zExplain (autogen_opt_strs+2942) /** Extra detail explaining what autogen does. */ -#define zDetail (autogen_opt_strs+3011) +#define zDetail (autogen_opt_strs+3013) /** The full version string for autogen. */ -#define zFullVersion (autogen_opt_strs+3124) +#define zFullVersion (autogen_opt_strs+3126) /* extracted from optcode.tlib near line 364 */ #define OPTPROC_BASE OPTPROC_NONE @@ -1416,9 +1416,9 @@ /* extracted from optmain.tlib near line 945 */ static char const * const names[7] = { - autogen_opt_strs+3153, autogen_opt_strs+3161, autogen_opt_strs+3175, - autogen_opt_strs+3188, autogen_opt_strs+3198, autogen_opt_strs+3211, - autogen_opt_strs+3223 }; + autogen_opt_strs+3156, autogen_opt_strs+3164, autogen_opt_strs+3178, + autogen_opt_strs+3191, autogen_opt_strs+3201, autogen_opt_strs+3214, + autogen_opt_strs+3226 }; if (pOptions <= OPTPROC_EMIT_LIMIT) { (void) optionEnumerationVal(pOptions, pOptDesc, names, 7); diff -Nru autogen-5.18.7/agen5/opts.def autogen-5.18.12/agen5/opts.def --- autogen-5.18.7/agen5/opts.def 2015-12-07 00:03:48.000000000 +0000 +++ autogen-5.18.12/agen5/opts.def 2016-08-29 21:35:19.000000000 +0000 @@ -7,7 +7,7 @@ * "([12][90][0-9][0-9])" * * This file is part of AutoGen. - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/opts.h autogen-5.18.12/agen5/opts.h --- autogen-5.18.7/agen5/opts.h 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/opts.h 2016-08-29 21:35:43.000000000 +0000 @@ -105,9 +105,9 @@ /** count of all options for autogen */ #define OPTION_CT 35 /** autogen version */ -#define AUTOGEN_VERSION "5.18.7" +#define AUTOGEN_VERSION "5.18.12" /** Full autogen version text */ -#define AUTOGEN_FULL_VERSION "autogen (GNU AutoGen) 5.18.7" +#define AUTOGEN_FULL_VERSION "autogen (GNU AutoGen) 5.18.12" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff -Nru autogen-5.18.7/agen5/proto.h autogen-5.18.12/agen5/proto.h --- autogen-5.18.7/agen5/proto.h 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/proto.h 2016-08-29 21:35:44.000000000 +0000 @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: * * Prototypes for agen5 - * Generated Sun Dec 6 16:04:14 PST 2015 + * Generated Mon Aug 29 14:35:43 PDT 2016 */ #ifndef AGEN5_PROTO_H_GUARD #define AGEN5_PROTO_H_GUARD 1 @@ -10,7 +10,7 @@ * Extracted from agCgi.c */ static void -loadCgi(void); +load_cgi(void); /* * Extracted from agDep.c diff -Nru autogen-5.18.7/agen5/pseudo.def autogen-5.18.12/agen5/pseudo.def --- autogen-5.18.7/agen5/pseudo.def 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/pseudo.def 2016-03-08 17:00:36.000000000 +0000 @@ -4,7 +4,7 @@ * \file pseudo.def * * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/pseudo-fsm.h autogen-5.18.12/agen5/pseudo-fsm.h --- autogen-5.18.7/agen5/pseudo-fsm.h 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/agen5/pseudo-fsm.h 2016-08-29 21:35:43.000000000 +0000 @@ -8,7 +8,7 @@ * * Automated Finite State Machine * - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff -Nru autogen-5.18.7/agen5/schemedef.scm autogen-5.18.12/agen5/schemedef.scm --- autogen-5.18.7/agen5/schemedef.scm 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/schemedef.scm 2016-03-08 17:00:36.000000000 +0000 @@ -1,6 +1,6 @@ ;;; This file is part of AutoGen. -;;; AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +;;; AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ;;; ;;; AutoGen is free software: you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/scribble.c autogen-5.18.12/agen5/scribble.c --- autogen-5.18.7/agen5/scribble.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/scribble.c 2016-03-08 17:00:36.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of AutoGen. - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/scribble.h autogen-5.18.12/agen5/scribble.h --- autogen-5.18.7/agen5/scribble.h 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/scribble.h 2016-03-08 17:00:36.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of AutoGen. - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/snarf.tpl autogen-5.18.12/agen5/snarf.tpl --- autogen-5.18.7/agen5/snarf.tpl 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/snarf.tpl 2016-03-08 17:00:36.000000000 +0000 @@ -2,7 +2,7 @@ ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/alist.test autogen-5.18.12/agen5/test/alist.test --- autogen-5.18.7/agen5/test/alist.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/alist.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/case.test autogen-5.18.12/agen5/test/case.test --- autogen-5.18.7/agen5/test/case.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/case.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb # ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/columns.test autogen-5.18.12/agen5/test/columns.test --- autogen-5.18.7/agen5/test/columns.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/columns.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb # ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/daemon.test autogen-5.18.12/agen5/test/daemon.test --- autogen-5.18.7/agen5/test/daemon.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/daemon.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/debug.test autogen-5.18.12/agen5/test/debug.test --- autogen-5.18.7/agen5/test/debug.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/debug.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb # ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by diff -Nru autogen-5.18.7/agen5/test/define.test autogen-5.18.12/agen5/test/define.test --- autogen-5.18.7/agen5/test/define.test 2015-08-09 00:50:50.000000000 +0000 +++ autogen-5.18.12/agen5/test/define.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/defref.test autogen-5.18.12/agen5/test/defref.test --- autogen-5.18.7/agen5/test/defref.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/defref.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/directives.test autogen-5.18.12/agen5/test/directives.test --- autogen-5.18.7/agen5/test/directives.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/directives.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/dynref.test autogen-5.18.12/agen5/test/dynref.test --- autogen-5.18.7/agen5/test/dynref.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/dynref.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/endmac.test autogen-5.18.12/agen5/test/endmac.test --- autogen-5.18.7/agen5/test/endmac.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/endmac.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/error.test autogen-5.18.12/agen5/test/error.test --- autogen-5.18.7/agen5/test/error.test 2015-08-09 00:50:50.000000000 +0000 +++ autogen-5.18.12/agen5/test/error.test 2016-05-26 18:01:36.000000000 +0000 @@ -6,7 +6,7 @@ # Author: Bruce Korb # ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by @@ -25,8 +25,7 @@ verb_ok=true -ag_err() -{ +ag_err() { if ${VERBOSE} && ${verb_ok} then AUTOGEN_TRACE=everything @@ -41,6 +40,17 @@ touch ${testname}-task${seq}-OK } +strip_variable_msgs() { + sedcmd='/Giving up in/d + /is deprecated\./d + /erasing the .* environment variable/d + /Failing Guile command:/q + /^Aborte.*core dumped/q + p' + + ${SED} -n "${sedcmd}" $1 +} + # # # # # # # # # # # # # TEST 1 # # # # # # # # # # # # echo creating ${testname}.tpl @@ -85,10 +95,7 @@ test -f ${testname}-task1-OK \ && failure unexpected success for test-1 -${SED} '/Giving up in/d - /erasing the .* environment variable/d - /Failing Guile command:/,$d' ${testname}.err1 \ - > ${testname}.err +strip_variable_msgs ${testname}.err1 > ${testname}.err cmp -s ${testname}.err ${testname}.base1 || \ failure "expected->actual${nl}`diff -c ${testname}.base1 ${testname}.err`" @@ -104,13 +111,6 @@ This is a multi-line error to show how to exit your template -Failing Guile command: = = = = = - -(error "This is a multi-line - error to show how to exit - your template") - -================================= _EOF_ agopts="--no-def --base=${testname}" @@ -121,9 +121,7 @@ && failure unexpected success for test-2 verb_ok=true -omit_pat='Giving up in | is deprecated\.|erasing the .* environment variable' - -${EGREP} -v "$omit_pat" ${testname}.err2 > ${testname}.res2 +strip_variable_msgs ${testname}.err2 > ${testname}.res2 cmp -s ${testname}.base2 ${testname}.res2 || \ failure "expected->actual${nl}`diff -c ${testname}.base2 ${testname}.res2`" @@ -156,8 +154,8 @@ test -f ${testname}-task4-OK \ && failure unexpected success for test-4 -${EGREP} -v "$omit_pat" ${testname}.err4 | \ - ${SED} -n '/Failing Guile command:/q;p' > ${testname}.res4 +strip_variable_msgs ${testname}.err4 > ${testname}.res4 + cmp -s ${testname}.res4 ${testname}.base4 \ || failure "expected->actual${nl}`diff -c ${testname}.base4 ${testname}.res4`" @@ -174,8 +172,8 @@ test -f ${testname}-task5-OK \ && failure unexpected success for test-5 -${EGREP} -v "$omit_pat" ${testname}.err5 | \ - ${SED} -n '/Failing Guile command:/q;p' > ${testname}.res5 +strip_variable_msgs ${testname}.err5 > ${testname}.res5 + cat > ${testname}.base5 <<'EOF' Error in template error.tpl5, line 3 Unknown macro or invalid context in error.tpl5 line 3: @@ -207,16 +205,6 @@ cat > ${testname}.base6 < ${testname}.res6 +sedcmd="/^${testname}\\.tpl6:7:4:/d" +sedcmd="${sedcmd}${nl}/Failing Guile command:/q" +sedcmd="${sedcmd}${nl}/^Scheme evaluation error./,/^==========/p" +${SED} -n "${sedcmd}" ${testname}.err6 > ${testname}.res6 cmp -s ${testname}.base6 ${testname}.res6 || \ failure "expected->actual${nl}`diff -c ${testname}.base6 ${testname}.res6`" diff -Nru autogen-5.18.7/agen5/test/expr.test autogen-5.18.12/agen5/test/expr.test --- autogen-5.18.7/agen5/test/expr.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/expr.test 2016-03-08 17:00:36.000000000 +0000 @@ -6,7 +6,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/extract.test autogen-5.18.12/agen5/test/extract.test --- autogen-5.18.7/agen5/test/extract.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/extract.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/forfrom.test autogen-5.18.12/agen5/test/forfrom.test --- autogen-5.18.7/agen5/test/forfrom.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/forfrom.test 2016-03-08 17:00:36.000000000 +0000 @@ -7,7 +7,7 @@ # ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/forin.test autogen-5.18.12/agen5/test/forin.test --- autogen-5.18.7/agen5/test/forin.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/forin.test 2016-03-08 17:00:36.000000000 +0000 @@ -7,7 +7,7 @@ # ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/format.test autogen-5.18.12/agen5/test/format.test --- autogen-5.18.7/agen5/test/format.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/format.test 2016-03-08 17:00:36.000000000 +0000 @@ -6,7 +6,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/for.test autogen-5.18.12/agen5/test/for.test --- autogen-5.18.7/agen5/test/for.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/for.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/get.test autogen-5.18.12/agen5/test/get.test --- autogen-5.18.7/agen5/test/get.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/get.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/gperf.test autogen-5.18.12/agen5/test/gperf.test --- autogen-5.18.7/agen5/test/gperf.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/gperf.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/heredef.test autogen-5.18.12/agen5/test/heredef.test --- autogen-5.18.7/agen5/test/heredef.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/heredef.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/html.test autogen-5.18.12/agen5/test/html.test --- autogen-5.18.7/agen5/test/html.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/html.test 2016-03-08 17:00:36.000000000 +0000 @@ -6,7 +6,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/include.test autogen-5.18.12/agen5/test/include.test --- autogen-5.18.7/agen5/test/include.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/include.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/in.test autogen-5.18.12/agen5/test/in.test --- autogen-5.18.7/agen5/test/in.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/in.test 2016-03-08 17:00:36.000000000 +0000 @@ -6,7 +6,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/leave.test autogen-5.18.12/agen5/test/leave.test --- autogen-5.18.7/agen5/test/leave.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/leave.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/license.test autogen-5.18.12/agen5/test/license.test --- autogen-5.18.7/agen5/test/license.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/license.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/line.test autogen-5.18.12/agen5/test/line.test --- autogen-5.18.7/agen5/test/line.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/line.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/loop.test autogen-5.18.12/agen5/test/loop.test --- autogen-5.18.7/agen5/test/loop.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/loop.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/Makefile.am autogen-5.18.12/agen5/test/Makefile.am --- autogen-5.18.7/agen5/test/Makefile.am 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/Makefile.am 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ ## Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/Makefile.in autogen-5.18.12/agen5/test/Makefile.in --- autogen-5.18.7/agen5/test/Makefile.in 2015-12-07 00:04:13.000000000 +0000 +++ autogen-5.18.12/agen5/test/Makefile.in 2016-08-29 21:35:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = agen5/test -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -97,6 +105,7 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -323,6 +332,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/config/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AGEN5_TESTS = @AGEN5_TESTS@ @@ -532,7 +543,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu agen5/test/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu agen5/test/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -593,7 +603,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -868,6 +878,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \ uninstall uninstall-am +.PRECIOUS: Makefile + distclean-local: -rm -rf *-testd FAILURES defs diff -Nru autogen-5.18.7/agen5/test/make.test autogen-5.18.12/agen5/test/make.test --- autogen-5.18.7/agen5/test/make.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/make.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/match.test autogen-5.18.12/agen5/test/match.test --- autogen-5.18.7/agen5/test/match.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/match.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/opts.test autogen-5.18.12/agen5/test/opts.test --- autogen-5.18.7/agen5/test/opts.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/opts.test 2016-03-08 17:00:36.000000000 +0000 @@ -6,7 +6,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/output.test autogen-5.18.12/agen5/test/output.test --- autogen-5.18.7/agen5/test/output.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/output.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/pseudo.test autogen-5.18.12/agen5/test/pseudo.test --- autogen-5.18.7/agen5/test/pseudo.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/pseudo.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/reorder.test autogen-5.18.12/agen5/test/reorder.test --- autogen-5.18.7/agen5/test/reorder.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/reorder.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/return.test autogen-5.18.12/agen5/test/return.test --- autogen-5.18.7/agen5/test/return.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/return.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/shell.test autogen-5.18.12/agen5/test/shell.test --- autogen-5.18.7/agen5/test/shell.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/shell.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/snarf.test autogen-5.18.12/agen5/test/snarf.test --- autogen-5.18.7/agen5/test/snarf.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/snarf.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/stack.test autogen-5.18.12/agen5/test/stack.test --- autogen-5.18.7/agen5/test/stack.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/stack.test 2016-03-08 17:00:36.000000000 +0000 @@ -6,7 +6,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/str2m.test autogen-5.18.12/agen5/test/str2m.test --- autogen-5.18.7/agen5/test/str2m.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/str2m.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/stress.test autogen-5.18.12/agen5/test/stress.test --- autogen-5.18.7/agen5/test/stress.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/stress.test 2016-03-08 17:00:36.000000000 +0000 @@ -6,7 +6,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/string.test autogen-5.18.12/agen5/test/string.test --- autogen-5.18.7/agen5/test/string.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/string.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/strtable.test autogen-5.18.12/agen5/test/strtable.test --- autogen-5.18.7/agen5/test/strtable.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/strtable.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/strxform.test autogen-5.18.12/agen5/test/strxform.test --- autogen-5.18.7/agen5/test/strxform.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/strxform.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/suffix.test autogen-5.18.12/agen5/test/suffix.test --- autogen-5.18.7/agen5/test/suffix.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/suffix.test 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/test/time.test autogen-5.18.12/agen5/test/time.test --- autogen-5.18.7/agen5/test/time.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/test/time.test 2016-03-08 17:00:36.000000000 +0000 @@ -6,7 +6,7 @@ # Author: Bruce Korb ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/tpLoad.c autogen-5.18.12/agen5/tpLoad.c --- autogen-5.18.7/agen5/tpLoad.c 2015-08-09 01:00:18.000000000 +0000 +++ autogen-5.18.12/agen5/tpLoad.c 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -32,6 +32,15 @@ static char const * expand_dir(char const ** dir_pp, char * name_buf); +static inline bool +file_search_dirs( + char const * in_name, + char * res_name, + char const * const * sfx_list, + char const * referring_tpl, + size_t nm_len, + bool no_suffix); + static size_t cnt_macros(char const * pz); @@ -104,6 +113,103 @@ return res; } +static inline bool +file_search_dirs( + char const * in_name, + char * res_name, + char const * const * sfx_list, + char const * referring_tpl, + size_t nm_len, + bool no_suffix) +{ + /* + * Search each directory in our directory search list for the file. + * We always force two copies of this option, so we know it exists. + * Later entries are more recently added and are searched first. + * We start the "dirlist" pointing to the real last entry. + */ + int ct = STACKCT_OPT(TEMPL_DIRS); + char const ** dirlist = STACKLST_OPT(TEMPL_DIRS) + ct - 1; + char const * c_dir = FIND_FILE_CURDIR; + + /* + * IF the file name starts with a directory separator, + * then we only search once, looking for the exact file name. + */ + if (*in_name == '/') + ct = -1; + + for (;;) { + char * pzEnd; + + /* + * c_dir is always FIND_FILE_CURDIR the first time through + * and is never that value after that. + */ + if (c_dir == FIND_FILE_CURDIR) { + + memcpy(res_name, in_name, nm_len); + pzEnd = res_name + nm_len; + *pzEnd = NUL; + + } else { + unsigned int fmt_len; + + /* + * IF one of our template paths starts with '$', then expand it + * and replace it now and forever (the rest of this run, anyway). + */ + if (*c_dir == '$') + c_dir = expand_dir(dirlist+1, res_name); + + fmt_len = (unsigned)snprintf( + res_name, AG_PATH_MAX - MAX_SUFFIX_LEN, + FIND_FILE_DIR_FMT, c_dir, in_name); + if (fmt_len >= AG_PATH_MAX - MAX_SUFFIX_LEN) + break; // fail-return + pzEnd = res_name + fmt_len; + } + + if (read_okay(res_name)) + return true; + + /* + * IF the file does not already have a suffix, + * THEN try the ones that are okay for this file. + */ + if (no_suffix && (sfx_list != NULL)) { + char const * const * sfxl = sfx_list; + *(pzEnd++) = '.'; + + do { + strcpy(pzEnd, *(sfxl++)); /* must fit */ + if (read_okay(res_name)) + return true; + + } while (*sfxl != NULL); + } + + /* + * IF we've exhausted the search list, + * THEN see if we're done, else go through search dir list. + * + * We try one more thing if there is a referrer. + * If the searched-for file is a full path, "ct" will + * start at -1 and we will leave the loop here and now. + */ + if (--ct < 0) { + if ((referring_tpl == NULL) || (ct != -1)) + break; + c_dir = referring_tpl; + + } else { + c_dir = *(dirlist--); + } + } + + return false; +} + /** * Search for a file. * @@ -173,102 +279,16 @@ if (pz == NULL) referring_tpl = NULL; else { - AGDUPSTR(referring_tpl, referring_tpl, "referring_tpl"); + AGDUPSTR(referring_tpl, referring_tpl, "refer tpl"); pz = strrchr(referring_tpl, '/'); *pz = NUL; } } - { - /* - * Search each directory in our directory search list for the file. - * We always force two copies of this option, so we know it exists. - * Later entries are more recently added and are searched first. - * We start the "dirlist" pointing to the real last entry. - */ - int ct = STACKCT_OPT(TEMPL_DIRS); - char const ** dirlist = STACKLST_OPT(TEMPL_DIRS) + ct - 1; - char const * c_dir = FIND_FILE_CURDIR; - - /* - * IF the file name starts with a directory separator, - * then we only search once, looking for the exact file name. - */ - if (*in_name == '/') - ct = -1; - - for (;;) { - char * pzEnd; - - /* - * c_dir is always FIND_FILE_CURDIR the first time through - * and is never that value after that. - */ - if (c_dir == FIND_FILE_CURDIR) { - - memcpy(res_name, in_name, nm_len); - pzEnd = res_name + nm_len; - *pzEnd = NUL; - - } else { - unsigned int fmt_len; - - /* - * IF one of our template paths starts with '$', then expand it - * and replace it now and forever (the rest of this run, anyway). - */ - if (*c_dir == '$') - c_dir = expand_dir(dirlist+1, res_name); - - fmt_len = (unsigned)snprintf( - res_name, AG_PATH_MAX - MAX_SUFFIX_LEN, - FIND_FILE_DIR_FMT, c_dir, in_name); - if (fmt_len >= AG_PATH_MAX - MAX_SUFFIX_LEN) - break; // fail-return - pzEnd = res_name + fmt_len; - } - - if (read_okay(res_name)) - goto find_file_done; - - /* - * IF the file does not already have a suffix, - * THEN try the ones that are okay for this file. - */ - if (no_suffix && (sfx_list != NULL)) { - char const * const * sfxl = sfx_list; - *(pzEnd++) = '.'; - - do { - strcpy(pzEnd, *(sfxl++)); /* must fit */ - if (read_okay(res_name)) - goto find_file_done; - - } while (*sfxl != NULL); - } - - /* - * IF we've exhausted the search list, - * THEN see if we're done, else go through search dir list. - * - * We try one more thing if there is a referrer. - * If the searched-for file is a full path, "ct" will - * start at -1 and we will leave the loop here and now. - */ - if (--ct < 0) { - if ((referring_tpl == NULL) || (ct != -1)) - break; - c_dir = referring_tpl; - - } else { - c_dir = *(dirlist--); - } - } - } - - res = FAILURE; + if (! file_search_dirs(in_name, res_name, sfx_list, referring_tpl, + nm_len, no_suffix)) + res = FAILURE; - find_file_done: AGFREE(free_me); AGFREE(referring_tpl); return res; diff -Nru autogen-5.18.7/agen5/tpParse.c autogen-5.18.12/agen5/tpParse.c --- autogen-5.18.7/agen5/tpParse.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/agen5/tpParse.c 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * Copyright (C) 1992-2015 Bruce Korb - all rights reserved + * Copyright (C) 1992-2016 Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/agen5/tpProcess.c autogen-5.18.12/agen5/tpProcess.c --- autogen-5.18.7/agen5/tpProcess.c 2015-08-08 23:40:32.000000000 +0000 +++ autogen-5.18.12/agen5/tpProcess.c 2016-05-23 15:09:15.000000000 +0000 @@ -9,7 +9,7 @@ */ /* * This file is part of AutoGen. - * AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoGen is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -165,7 +165,7 @@ if (strneqvcmp(pzRes, DO_STDOUT_TPL_CONTENT, 13) != 0) fputs(DO_STDOUT_TPL_CONTENT, stdout); - fwrite(pzRes, AG_SCM_STRLEN(res), 1, stdout); + fwrite(pzRes, scm_c_string_length(res), 1, stdout); } fclose(stdout); @@ -201,6 +201,8 @@ } do { + out_spec_t * os; + /* * We cannot be in Scheme processing. We've either just started * or we've made a long jump from our own code. If we've made a @@ -214,22 +216,21 @@ */ switch (setjmp(abort_jmp_buf)) { case SUCCESS: - { - out_spec_t * ospec = output_specs; + os = output_specs; if (OPT_VALUE_TRACE >= TRACE_EVERYTHING) { - fprintf(trace_fp, PROC_TPL_START, ospec->os_sfx); + fprintf(trace_fp, PROC_TPL_START, os->os_sfx); fflush(trace_fp); } /* * Set the output file name buffer. * It may get switched inside open_output. */ - open_output(ospec); + open_output(os); memcpy(&out_root, cur_fpstack, sizeof(out_root)); AGFREE(cur_fpstack); cur_fpstack = &out_root; - curr_sfx = ospec->os_sfx; + curr_sfx = os->os_sfx; curr_def_ctx = root_def_ctx; cur_fpstack->stk_flags &= ~FPF_FREE; cur_fpstack->stk_prev = NULL; @@ -239,13 +240,11 @@ out_close(false); /* keep output */ } while (cur_fpstack->stk_prev != NULL); - output_specs = next_out_spec(ospec); + output_specs = next_out_spec(os); break; - } case PROBLEM: - { - out_spec_t * os = output_specs; + os = output_specs; /* * We got here by a long jump. Close/purge the open files * and go on to the next output. @@ -256,7 +255,6 @@ last_scm_cmd = NULL; /* "problem" means "drop current output". */ output_specs = next_out_spec(os); break; - } default: fprintf(trace_fp, PROC_TPL_BOGUS_RET, oops_pfx); @@ -264,8 +262,7 @@ /* FALLTHROUGH */ case FAILURE: - { - out_spec_t * os = output_specs; + os = output_specs; /* * We got here by a long jump. Close/purge the open files. @@ -284,7 +281,6 @@ exit(EXIT_FAILURE); /* NOTREACHED */ } - } } while (output_specs != NULL); } diff -Nru autogen-5.18.7/autoopts/ag-char-map.h autogen-5.18.12/autoopts/ag-char-map.h --- autogen-5.18.7/autoopts/ag-char-map.h 2015-12-07 00:03:52.000000000 +0000 +++ autogen-5.18.12/autoopts/ag-char-map.h 2016-08-29 21:35:22.000000000 +0000 @@ -1,6 +1,6 @@ /* * 29 bits for 46 character classifications - * generated by char-mapper on 12/06/15 at 16:03:52 + * generated by char-mapper on 08/29/16 at 14:35:22 * * This file contains the character classifications * used by AutoGen and AutoOpts for identifying tokens. @@ -8,7 +8,7 @@ * * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/alias.c autogen-5.18.12/autoopts/alias.c --- autogen-5.18.7/autoopts/alias.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/alias.c 2016-03-08 17:00:36.000000000 +0000 @@ -12,7 +12,7 @@ * * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/ao_string_tokenize.3 autogen-5.18.12/autoopts/ao_string_tokenize.3 --- autogen-5.18.7/autoopts/ao_string_tokenize.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/ao_string_tokenize.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH ao_string_tokenize 3 2015-12-06 "" "Programmer's Manual" +.TH ao_string_tokenize 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ao_string_tokenize.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/ao-strs.def autogen-5.18.12/autoopts/ao-strs.def --- autogen-5.18.7/autoopts/ao-strs.def 2015-08-08 23:58:40.000000000 +0000 +++ autogen-5.18.12/autoopts/ao-strs.def 2016-03-08 17:00:36.000000000 +0000 @@ -10,7 +10,7 @@ * everything else. * * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/autogen.map autogen-5.18.12/autoopts/autogen.map --- autogen-5.18.7/autoopts/autogen.map 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/autogen.map 2016-03-08 17:00:36.000000000 +0000 @@ -11,7 +11,7 @@ This file is part of AutoOpts, a companion to AutoGen. AutoOpts is free software. - AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved AutoOpts is available under any one of two licenses. The license in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/autoopts/options.h autogen-5.18.12/autoopts/autoopts/options.h --- autogen-5.18.7/autoopts/autoopts/options.h 2015-12-07 00:03:59.000000000 +0000 +++ autogen-5.18.12/autoopts/autoopts/options.h 2016-08-29 21:35:29.000000000 +0000 @@ -9,11 +9,11 @@ * This file defines all the global structures and special values * used in the automated option processing library. * - * Automated Options Copyright (C) 1992-2015 by Bruce Korb + * Automated Options Copyright (C) 1992-2016 by Bruce Korb * * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/autoopts/usage-txt.h autogen-5.18.12/autoopts/autoopts/usage-txt.h --- autogen-5.18.7/autoopts/autoopts/usage-txt.h 2015-12-07 00:03:57.000000000 +0000 +++ autogen-5.18.12/autoopts/autoopts/usage-txt.h 2016-08-29 21:35:27.000000000 +0000 @@ -384,11 +384,11 @@ puts(_("(AutoOpts bug): %s.\n")); #line 90 "../reset.c" puts(_("optionResetOpt() called, but reset-option not configured")); -#line 292 "../usage.c" +#line 295 "../usage.c" puts(_("could not locate the 'help' option")); #line 336 "../autoopts.c" puts(_("optionProcess() was called with invalid data")); -#line 748 "../usage.c" +#line 751 "../usage.c" puts(_("invalid argument type specified")); #line 598 "../find.c" puts(_("defaulted to option with optional arg")); @@ -437,9 +437,9 @@ puts(_(" or an integer from %d through %d\n")); #line 170 "../enum.c" puts(_(" or an integer from %d through %d\n")); -#line 747 "../usage.c" +#line 750 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); -#line 1081 "../usage.c" +#line 1084 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); #line 385 "../find.c" puts(_("%s: invalid option name: %s\n")); @@ -454,7 +454,7 @@ puts(_("%s: The '%s' option cannot have an argument.\n")); #line 151 "../check.c" puts(_("%s: Command line arguments are not allowed.\n")); -#line 535 "../save.c" +#line 536 "../save.c" puts(_("error %d (%s) creating %s\n")); #line 235 "../enum.c" puts(_("%s error: '%s' does not match any %s keywords.\n")); @@ -462,7 +462,7 @@ puts(_("%s error: The '%s' option requires an argument.\n")); #line 186 "../save.c" puts(_("error %d (%s) stat-ing %s\n")); -#line 238 "../save.c" +#line 239 "../save.c" puts(_("error %d (%s) stat-ing %s\n")); #line 143 "../restore.c" puts(_("%s error: no saved option state\n")); @@ -480,7 +480,7 @@ puts(_("%s error: '%s' is not a recognizable number.\n")); #line 201 "../enum.c" puts(_("%s error: %s exceeds %s keyword count\n")); -#line 330 "../usage.c" +#line 333 "../usage.c" puts(_("Try '%s %s' for more information.\n")); #line 45 "../alias.c" puts(_("one %s%s option allowed\n")); @@ -488,19 +488,19 @@ puts(_("standard output")); #line 943 "../makeshell.c" puts(_("standard output")); -#line 274 "../usage.c" +#line 277 "../usage.c" puts(_("standard output")); -#line 415 "../usage.c" +#line 418 "../usage.c" puts(_("standard output")); -#line 625 "../usage.c" +#line 628 "../usage.c" puts(_("standard output")); #line 175 "../version.c" puts(_("standard output")); -#line 274 "../usage.c" +#line 277 "../usage.c" puts(_("standard error")); -#line 415 "../usage.c" +#line 418 "../usage.c" puts(_("standard error")); -#line 625 "../usage.c" +#line 628 "../usage.c" puts(_("standard error")); #line 175 "../version.c" puts(_("standard error")); @@ -508,11 +508,11 @@ puts(_("write")); #line 943 "../makeshell.c" puts(_("write")); -#line 273 "../usage.c" +#line 276 "../usage.c" puts(_("write")); -#line 414 "../usage.c" +#line 417 "../usage.c" puts(_("write")); -#line 624 "../usage.c" +#line 627 "../usage.c" puts(_("write")); #line 174 "../version.c" puts(_("write")); @@ -524,38 +524,38 @@ puts(_("%s warning: cannot save options - %s not regular file\n")); #line 185 "../save.c" puts(_("%s warning: cannot save options - %s not regular file\n")); -#line 237 "../save.c" +#line 238 "../save.c" puts(_("%s warning: cannot save options - %s not regular file\n")); -#line 256 "../save.c" +#line 257 "../save.c" puts(_("%s warning: cannot save options - %s not regular file\n")); -#line 534 "../save.c" +#line 535 "../save.c" puts(_("%s warning: cannot save options - %s not regular file\n")); /* END-LIBOPTS-MESSAGES */ /* USAGE-TEXT: */ -#line 873 "../usage.c" +#line 876 "../usage.c" puts(_("\t\t\t\t- an alternate for '%s'\n")); -#line 1148 "../usage.c" +#line 1151 "../usage.c" puts(_("Version, usage and configuration options:")); -#line 924 "../usage.c" +#line 927 "../usage.c" puts(_("\t\t\t\t- default option for unnamed options\n")); -#line 837 "../usage.c" +#line 840 "../usage.c" puts(_("\t\t\t\t- disabled as '--%s'\n")); -#line 1117 "../usage.c" +#line 1120 "../usage.c" puts(_(" --- %-14s %s\n")); -#line 1115 "../usage.c" +#line 1118 "../usage.c" puts(_("This option has been disabled")); -#line 864 "../usage.c" +#line 867 "../usage.c" puts(_("\t\t\t\t- enabled by default\n")); #line 40 "../alias.c" puts(_("%s error: only ")); -#line 1194 "../usage.c" +#line 1197 "../usage.c" puts(_(" - examining environment variables named %s_*\n")); #line 168 "../file.c" puts(_("\t\t\t\t- file must not pre-exist\n")); #line 172 "../file.c" puts(_("\t\t\t\t- file must pre-exist\n")); -#line 380 "../usage.c" +#line 383 "../usage.c" puts(_("Options are specified by doubled hyphens and their name or by a single\n" "hyphen and the flag character.\n")); #line 921 "../makeshell.c" @@ -565,33 +565,33 @@ "a shell script to parse the options for %s:\n\n")); #line 167 "../enum.c" puts(_(" or an integer mask with any of the lower %d bits set\n")); -#line 897 "../usage.c" +#line 900 "../usage.c" puts(_("\t\t\t\t- is a set membership option\n")); -#line 918 "../usage.c" +#line 921 "../usage.c" puts(_("\t\t\t\t- must appear between %d and %d times\n")); -#line 382 "../usage.c" +#line 385 "../usage.c" puts(_("Options are specified by single or double hyphens and their name.\n")); -#line 904 "../usage.c" +#line 907 "../usage.c" puts(_("\t\t\t\t- may appear multiple times\n")); -#line 891 "../usage.c" +#line 894 "../usage.c" puts(_("\t\t\t\t- may not be preset\n")); -#line 1309 "../usage.c" +#line 1312 "../usage.c" puts(_(" Arg Option-Name Description\n")); -#line 1245 "../usage.c" +#line 1248 "../usage.c" puts(_(" Flg Arg Option-Name Description\n")); -#line 1303 "../usage.c" +#line 1306 "../usage.c" puts(_(" Flg Arg Option-Name Description\n")); -#line 1304 "../usage.c" +#line 1307 "../usage.c" puts(_(" %3s %s")); -#line 1310 "../usage.c" +#line 1313 "../usage.c" puts(_(" %3s %s")); -#line 387 "../usage.c" +#line 390 "../usage.c" puts(_("The '-#' option may omit the hash char\n")); -#line 383 "../usage.c" +#line 386 "../usage.c" puts(_("All arguments are named options.\n")); -#line 971 "../usage.c" +#line 974 "../usage.c" puts(_(" - reading file %s")); -#line 409 "../usage.c" +#line 412 "../usage.c" puts(_("\n" "Please send bug reports to: <%s>\n")); #line 100 "../version.c" @@ -600,17 +600,17 @@ #line 129 "../version.c" puts(_("\n" "Please send bug reports to: <%s>\n")); -#line 903 "../usage.c" +#line 906 "../usage.c" puts(_("\t\t\t\t- may NOT appear - preset only\n")); -#line 944 "../usage.c" +#line 947 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 1192 "../usage.c" +#line 1195 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 682 "../usage.c" +#line 685 "../usage.c" puts(_("prohibits these options:\n")); -#line 677 "../usage.c" +#line 680 "../usage.c" puts(_("prohibits the option '%s'\n")); #line 81 "../numeric.c" puts(_("%s%ld to %ld")); @@ -628,28 +628,28 @@ puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n")); #line 77 "../numeric.c" puts(_("%sless than or equal to %ld")); -#line 390 "../usage.c" +#line 393 "../usage.c" puts(_("Operands and options may be intermixed. They will be reordered.\n")); -#line 652 "../usage.c" - puts(_("requires the option '%s'\n")); #line 655 "../usage.c" + puts(_("requires the option '%s'\n")); +#line 658 "../usage.c" puts(_("requires these options:\n")); -#line 1321 "../usage.c" +#line 1324 "../usage.c" puts(_(" Arg Option-Name Req? Description\n")); -#line 1315 "../usage.c" +#line 1318 "../usage.c" puts(_(" Flg Arg Option-Name Req? Description\n")); #line 168 "../enum.c" puts(_("or you may use a numeric representation. Preceding these with a '!'\n" "will clear the bits, specifying 'none' will clear all bits, and 'all'\n" "will set them all. Multiple entries may be passed as an option\n" "argument list.\n")); -#line 910 "../usage.c" +#line 913 "../usage.c" puts(_("\t\t\t\t- may appear up to %d times\n")); #line 77 "../enum.c" puts(_("The valid \"%s\" option keywords are:\n")); -#line 1152 "../usage.c" +#line 1155 "../usage.c" puts(_("The next option supports vendor supported extra options:")); -#line 773 "../usage.c" +#line 776 "../usage.c" puts(_("These additional options are:")); /* END-USAGE-TEXT */ } diff -Nru autogen-5.18.7/autoopts/autoopts.c autogen-5.18.12/autoopts/autoopts.c --- autogen-5.18.7/autoopts/autoopts.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/autoopts.c 2016-03-08 17:00:36.000000000 +0000 @@ -13,7 +13,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/autoopts-config.1 autogen-5.18.12/autoopts/autoopts-config.1 --- autogen-5.18.7/autoopts/autoopts-config.1 2015-12-07 00:04:07.000000000 +0000 +++ autogen-5.18.12/autoopts/autoopts-config.1 2016-08-29 21:35:37.000000000 +0000 @@ -6,7 +6,7 @@ \" From the definitions aoconf.def \" and the template file aoconf.tpl \" -.TH autoopts-config 1 2015-12-06 "" "Programmer's Manual" +.TH autoopts-config 1 2016-08-29 "" "Programmer's Manual" .SH NAME autoopts-config \- script to get information about installed version of autoopts diff -Nru autogen-5.18.7/autoopts/autoopts-config.in autogen-5.18.12/autoopts/autoopts-config.in --- autogen-5.18.7/autoopts/autoopts-config.in 2015-12-07 00:04:07.000000000 +0000 +++ autogen-5.18.12/autoopts/autoopts-config.in 2016-08-29 21:35:37.000000000 +0000 @@ -2,7 +2,7 @@ ## --------------------------------------------------------------------- ## autoopts-config.in -- Describe AutoOpts configuration ## -## Autoopts Copyright (C) 1992-2015 by Bruce Korb +## Autoopts Copyright (C) 1992-2016 by Bruce Korb ## ## DO NOT EDIT THIS FILE (autoopts-config.in) ## diff -Nru autogen-5.18.7/autoopts/autoopts.h autogen-5.18.12/autoopts/autoopts.h --- autogen-5.18.7/autoopts/autoopts.h 2015-10-03 16:52:04.000000000 +0000 +++ autogen-5.18.12/autoopts/autoopts.h 2016-03-08 17:00:36.000000000 +0000 @@ -11,7 +11,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/autoopts.m4 autogen-5.18.12/autoopts/autoopts.m4 --- autogen-5.18.7/autoopts/autoopts.m4 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/autoopts.m4 2016-03-08 17:00:36.000000000 +0000 @@ -5,7 +5,7 @@ dnl Author: Gary V. Vaughan dnl This file is part of AutoOpts, a companion to AutoGen. dnl AutoOpts is free software. -dnl AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +dnl AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved dnl dnl AutoOpts is available under any one of two licenses. The license dnl in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/boolean.c autogen-5.18.12/autoopts/boolean.c --- autogen-5.18.7/autoopts/boolean.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/boolean.c 2016-03-08 17:00:36.000000000 +0000 @@ -13,7 +13,7 @@ * * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/bootstrap.dir autogen-5.18.12/autoopts/bootstrap.dir --- autogen-5.18.7/autoopts/bootstrap.dir 2015-08-25 19:00:15.000000000 +0000 +++ autogen-5.18.12/autoopts/bootstrap.dir 2016-03-08 17:00:36.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/echo This_file_must_be_sourced,_not_executed ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/check.c autogen-5.18.12/autoopts/check.c --- autogen-5.18.7/autoopts/check.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/check.c 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/configfile.c autogen-5.18.12/autoopts/configfile.c --- autogen-5.18.7/autoopts/configfile.c 2015-08-08 23:33:36.000000000 +0000 +++ autogen-5.18.12/autoopts/configfile.c 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/configFileLoad.3 autogen-5.18.12/autoopts/configFileLoad.3 --- autogen-5.18.7/autoopts/configFileLoad.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/configFileLoad.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH configFileLoad 3 2015-12-06 "" "Programmer's Manual" +.TH configFileLoad 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (configFileLoad.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/cook.c autogen-5.18.12/autoopts/cook.c --- autogen-5.18.7/autoopts/cook.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/cook.c 2016-04-20 17:07:38.000000000 +0000 @@ -10,7 +10,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control @@ -30,6 +30,9 @@ */ /* = = = START-STATIC-FORWARD = = = */ +static char * +nl_count(char * start, char * end, int * lnct_p); + static bool contiguous_quote(char ** pps, char * pq, int * lnct_p); /* = = = END-STATIC-FORWARD = = = */ @@ -135,6 +138,18 @@ return res; } +/** + * count newlines between start and end + */ +static char * +nl_count(char * start, char * end, int * lnct_p) +{ + while (start < end) { + if (*(start++) == NL) + (*lnct_p)++; + } + return end; +} /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -168,38 +183,22 @@ */ switch (ps[1]) { default: - *pps = NULL; - return false; + goto fail_return; case '/': /* * Skip to end of line */ ps = strchr(ps, NL); - if (ps == NULL) { - *pps = NULL; - return false; - } + if (ps == NULL) + goto fail_return; break; case '*': - { - char * p = strstr( ps+2, "*/" ); - /* - * Skip to terminating star slash - */ - if (p == NULL) { - *pps = NULL; - return false; - } - - while (ps < p) { - if (*(ps++) == NL) - (*lnct_p)++; - } - - ps = p + 2; - } + ps = nl_count(ps + 2, strstr(ps + 2, "*/"), lnct_p); + if (ps == NULL) + goto fail_return; + ps += 2; } continue; @@ -212,6 +211,10 @@ return false; } } + + fail_return: + *pps = NULL; + return false; } /*=export_func ao_string_cook diff -Nru autogen-5.18.7/autoopts/enum.c autogen-5.18.12/autoopts/enum.c --- autogen-5.18.7/autoopts/enum.c 2015-08-08 23:33:36.000000000 +0000 +++ autogen-5.18.12/autoopts/enum.c 2016-03-08 17:00:36.000000000 +0000 @@ -14,7 +14,7 @@ * * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/env.c autogen-5.18.12/autoopts/env.c --- autogen-5.18.7/autoopts/env.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/env.c 2016-03-08 17:00:36.000000000 +0000 @@ -13,7 +13,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/file.c autogen-5.18.12/autoopts/file.c --- autogen-5.18.7/autoopts/file.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/file.c 2016-03-08 17:00:36.000000000 +0000 @@ -10,7 +10,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/find.c autogen-5.18.12/autoopts/find.c --- autogen-5.18.7/autoopts/find.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/find.c 2016-03-08 17:00:36.000000000 +0000 @@ -12,7 +12,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/funcs.def autogen-5.18.12/autoopts/funcs.def --- autogen-5.18.7/autoopts/funcs.def 2015-12-07 00:03:59.000000000 +0000 +++ autogen-5.18.12/autoopts/funcs.def 2016-08-29 21:35:29.000000000 +0000 @@ -50,7 +50,7 @@ fairly clear about this, too.'; -#line 217 "cook.c" +#line 220 "cook.c" export_func = { name = 'ao_string_cook'; private; @@ -76,11 +76,11 @@ precede another backslash or a single quote character.'; err = '@code{NULL} is returned if the string(s) is/are mal-formed.'; srcfile = 'cook.c'; - linenum = '217'; + linenum = '220'; }; -#line 37 "cook.c" +#line 40 "cook.c" export_func = { name = 'ao_string_cook_escape_char'; private; @@ -115,7 +115,7 @@ 0x7F and never emit a 0x7F.'; err = '@code{NULL} is returned if the string is mal-formed.'; srcfile = 'cook.c'; - linenum = '37'; + linenum = '40'; }; @@ -723,7 +723,7 @@ }; -#line 813 "nested.c" +#line 824 "nested.c" export_func = { name = 'optionNestedVal'; private; @@ -741,7 +741,7 @@ doc = 'Nested value was found on the command line'; srcfile = 'nested.c'; - linenum = '813'; + linenum = '824'; }; @@ -804,7 +804,7 @@ }; -#line 240 "usage.c" +#line 243 "usage.c" export_func = { name = 'optionOnlyUsage'; what = 'Print usage text for just the options'; @@ -823,7 +823,7 @@ This function may be used when the emitted usage must incorporate information not available to AutoOpts.'; srcfile = 'usage.c'; - linenum = '240'; + linenum = '243'; }; @@ -868,7 +868,7 @@ }; -#line 442 "usage.c" +#line 445 "usage.c" export_func = { name = 'optionPrintParagraphs'; private; @@ -904,7 +904,7 @@ If \'plain\' is true, we are emitting text for a user to see. So, if it is true and NLS is not enabled, then just write the whole thing at once.'; srcfile = 'usage.c'; - linenum = '442'; + linenum = '445'; }; @@ -1089,7 +1089,7 @@ }; -#line 688 "save.c" +#line 689 "save.c" export_func = { name = 'optionSaveFile'; what = 'saves the option state to a file'; @@ -1118,7 +1118,7 @@ and do nothing. If the output file cannot be created or updated, a message will be printed to @code{stderr} and the routine will return.'; srcfile = 'save.c'; - linenum = '688'; + linenum = '689'; }; @@ -1324,7 +1324,7 @@ }; -#line 552 "usage.c" +#line 555 "usage.c" export_func = { name = 'optionUsage'; private; @@ -1348,7 +1348,7 @@ If "exitCode" is "AO_EXIT_REQ_USAGE" (normally 64), then output will to to stdout and the actual exit code will be "EXIT_SUCCESS".'; srcfile = 'usage.c'; - linenum = '552'; + linenum = '555'; }; diff -Nru autogen-5.18.7/autoopts/genshell.c autogen-5.18.12/autoopts/genshell.c --- autogen-5.18.7/autoopts/genshell.c 2015-12-07 00:03:56.000000000 +0000 +++ autogen-5.18.12/autoopts/genshell.c 2016-08-29 21:35:26.000000000 +0000 @@ -571,11 +571,11 @@ puts(_("(AutoOpts bug): %s.\n")); #line 90 "../reset.c" puts(_("optionResetOpt() called, but reset-option not configured")); -#line 292 "../usage.c" +#line 295 "../usage.c" puts(_("could not locate the 'help' option")); #line 336 "../autoopts.c" puts(_("optionProcess() was called with invalid data")); -#line 748 "../usage.c" +#line 751 "../usage.c" puts(_("invalid argument type specified")); #line 598 "../find.c" puts(_("defaulted to option with optional arg")); @@ -624,9 +624,9 @@ puts(_(" or an integer from %d through %d\n")); #line 170 "../enum.c" puts(_(" or an integer from %d through %d\n")); -#line 747 "../usage.c" +#line 750 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); -#line 1081 "../usage.c" +#line 1084 "../usage.c" puts(_("%s error: invalid option descriptor for %s\n")); #line 385 "../find.c" puts(_("%s: invalid option name: %s\n")); @@ -641,7 +641,7 @@ puts(_("%s: The '%s' option cannot have an argument.\n")); #line 151 "../check.c" puts(_("%s: Command line arguments are not allowed.\n")); -#line 535 "../save.c" +#line 536 "../save.c" puts(_("error %d (%s) creating %s\n")); #line 235 "../enum.c" puts(_("%s error: '%s' does not match any %s keywords.\n")); @@ -649,7 +649,7 @@ puts(_("%s error: The '%s' option requires an argument.\n")); #line 186 "../save.c" puts(_("error %d (%s) stat-ing %s\n")); -#line 238 "../save.c" +#line 239 "../save.c" puts(_("error %d (%s) stat-ing %s\n")); #line 143 "../restore.c" puts(_("%s error: no saved option state\n")); @@ -667,7 +667,7 @@ puts(_("%s error: '%s' is not a recognizable number.\n")); #line 201 "../enum.c" puts(_("%s error: %s exceeds %s keyword count\n")); -#line 330 "../usage.c" +#line 333 "../usage.c" puts(_("Try '%s %s' for more information.\n")); #line 45 "../alias.c" puts(_("one %s%s option allowed\n")); @@ -675,19 +675,19 @@ puts(_("standard output")); #line 943 "../makeshell.c" puts(_("standard output")); -#line 274 "../usage.c" +#line 277 "../usage.c" puts(_("standard output")); -#line 415 "../usage.c" +#line 418 "../usage.c" puts(_("standard output")); -#line 625 "../usage.c" +#line 628 "../usage.c" puts(_("standard output")); #line 175 "../version.c" puts(_("standard output")); -#line 274 "../usage.c" +#line 277 "../usage.c" puts(_("standard error")); -#line 415 "../usage.c" +#line 418 "../usage.c" puts(_("standard error")); -#line 625 "../usage.c" +#line 628 "../usage.c" puts(_("standard error")); #line 175 "../version.c" puts(_("standard error")); @@ -695,11 +695,11 @@ puts(_("write")); #line 943 "../makeshell.c" puts(_("write")); -#line 273 "../usage.c" +#line 276 "../usage.c" puts(_("write")); -#line 414 "../usage.c" +#line 417 "../usage.c" puts(_("write")); -#line 624 "../usage.c" +#line 627 "../usage.c" puts(_("write")); #line 174 "../version.c" puts(_("write")); @@ -711,38 +711,38 @@ puts(_("%s warning: cannot save options - %s not regular file\n")); #line 185 "../save.c" puts(_("%s warning: cannot save options - %s not regular file\n")); -#line 237 "../save.c" +#line 238 "../save.c" puts(_("%s warning: cannot save options - %s not regular file\n")); -#line 256 "../save.c" +#line 257 "../save.c" puts(_("%s warning: cannot save options - %s not regular file\n")); -#line 534 "../save.c" +#line 535 "../save.c" puts(_("%s warning: cannot save options - %s not regular file\n")); /* END-LIBOPTS-MESSAGES */ /* USAGE-TEXT: */ -#line 873 "../usage.c" +#line 876 "../usage.c" puts(_("\t\t\t\t- an alternate for '%s'\n")); -#line 1148 "../usage.c" +#line 1151 "../usage.c" puts(_("Version, usage and configuration options:")); -#line 924 "../usage.c" +#line 927 "../usage.c" puts(_("\t\t\t\t- default option for unnamed options\n")); -#line 837 "../usage.c" +#line 840 "../usage.c" puts(_("\t\t\t\t- disabled as '--%s'\n")); -#line 1117 "../usage.c" +#line 1120 "../usage.c" puts(_(" --- %-14s %s\n")); -#line 1115 "../usage.c" +#line 1118 "../usage.c" puts(_("This option has been disabled")); -#line 864 "../usage.c" +#line 867 "../usage.c" puts(_("\t\t\t\t- enabled by default\n")); #line 40 "../alias.c" puts(_("%s error: only ")); -#line 1194 "../usage.c" +#line 1197 "../usage.c" puts(_(" - examining environment variables named %s_*\n")); #line 168 "../file.c" puts(_("\t\t\t\t- file must not pre-exist\n")); #line 172 "../file.c" puts(_("\t\t\t\t- file must pre-exist\n")); -#line 380 "../usage.c" +#line 383 "../usage.c" puts(_("Options are specified by doubled hyphens and their name or by a single\n" "hyphen and the flag character.\n")); #line 921 "../makeshell.c" @@ -752,33 +752,33 @@ "a shell script to parse the options for %s:\n\n")); #line 167 "../enum.c" puts(_(" or an integer mask with any of the lower %d bits set\n")); -#line 897 "../usage.c" +#line 900 "../usage.c" puts(_("\t\t\t\t- is a set membership option\n")); -#line 918 "../usage.c" +#line 921 "../usage.c" puts(_("\t\t\t\t- must appear between %d and %d times\n")); -#line 382 "../usage.c" +#line 385 "../usage.c" puts(_("Options are specified by single or double hyphens and their name.\n")); -#line 904 "../usage.c" +#line 907 "../usage.c" puts(_("\t\t\t\t- may appear multiple times\n")); -#line 891 "../usage.c" +#line 894 "../usage.c" puts(_("\t\t\t\t- may not be preset\n")); -#line 1309 "../usage.c" +#line 1312 "../usage.c" puts(_(" Arg Option-Name Description\n")); -#line 1245 "../usage.c" +#line 1248 "../usage.c" puts(_(" Flg Arg Option-Name Description\n")); -#line 1303 "../usage.c" +#line 1306 "../usage.c" puts(_(" Flg Arg Option-Name Description\n")); -#line 1304 "../usage.c" +#line 1307 "../usage.c" puts(_(" %3s %s")); -#line 1310 "../usage.c" +#line 1313 "../usage.c" puts(_(" %3s %s")); -#line 387 "../usage.c" +#line 390 "../usage.c" puts(_("The '-#' option may omit the hash char\n")); -#line 383 "../usage.c" +#line 386 "../usage.c" puts(_("All arguments are named options.\n")); -#line 971 "../usage.c" +#line 974 "../usage.c" puts(_(" - reading file %s")); -#line 409 "../usage.c" +#line 412 "../usage.c" puts(_("\n" "Please send bug reports to: <%s>\n")); #line 100 "../version.c" @@ -787,17 +787,17 @@ #line 129 "../version.c" puts(_("\n" "Please send bug reports to: <%s>\n")); -#line 903 "../usage.c" +#line 906 "../usage.c" puts(_("\t\t\t\t- may NOT appear - preset only\n")); -#line 944 "../usage.c" +#line 947 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 1192 "../usage.c" +#line 1195 "../usage.c" puts(_("\n" "The following option preset mechanisms are supported:\n")); -#line 682 "../usage.c" +#line 685 "../usage.c" puts(_("prohibits these options:\n")); -#line 677 "../usage.c" +#line 680 "../usage.c" puts(_("prohibits the option '%s'\n")); #line 81 "../numeric.c" puts(_("%s%ld to %ld")); @@ -815,28 +815,28 @@ puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n")); #line 77 "../numeric.c" puts(_("%sless than or equal to %ld")); -#line 390 "../usage.c" +#line 393 "../usage.c" puts(_("Operands and options may be intermixed. They will be reordered.\n")); -#line 652 "../usage.c" - puts(_("requires the option '%s'\n")); #line 655 "../usage.c" + puts(_("requires the option '%s'\n")); +#line 658 "../usage.c" puts(_("requires these options:\n")); -#line 1321 "../usage.c" +#line 1324 "../usage.c" puts(_(" Arg Option-Name Req? Description\n")); -#line 1315 "../usage.c" +#line 1318 "../usage.c" puts(_(" Flg Arg Option-Name Req? Description\n")); #line 168 "../enum.c" puts(_("or you may use a numeric representation. Preceding these with a '!'\n" "will clear the bits, specifying 'none' will clear all bits, and 'all'\n" "will set them all. Multiple entries may be passed as an option\n" "argument list.\n")); -#line 910 "../usage.c" +#line 913 "../usage.c" puts(_("\t\t\t\t- may appear up to %d times\n")); #line 77 "../enum.c" puts(_("The valid \"%s\" option keywords are:\n")); -#line 1152 "../usage.c" +#line 1155 "../usage.c" puts(_("The next option supports vendor supported extra options:")); -#line 773 "../usage.c" +#line 776 "../usage.c" puts(_("These additional options are:")); /* END-USAGE-TEXT */ } diff -Nru autogen-5.18.7/autoopts/genshell.def autogen-5.18.12/autoopts/genshell.def --- autogen-5.18.7/autoopts/genshell.def 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/genshell.def 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ * library and is _only_ available under the terms of the GNU General * Public License. * - * Genshell Copyright (C) 1999-2015 by Bruce Korb - all rights reserved + * Genshell Copyright (C) 1999-2016 by Bruce Korb - all rights reserved * Genshell is free software. * This file is part of AutoGen. * diff -Nru autogen-5.18.7/autoopts/gettext.h autogen-5.18.12/autoopts/gettext.h --- autogen-5.18.7/autoopts/gettext.h 2015-12-07 00:03:49.000000000 +0000 +++ autogen-5.18.12/autoopts/gettext.h 2016-08-29 21:35:20.000000000 +0000 @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2015 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -225,15 +225,17 @@ if (msg_ctxt_id != NULL) #endif { + int found_translation; memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); msg_ctxt_id[msgctxt_len - 1] = '\004'; memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); translation = dcgettext (domain, msg_ctxt_id, category); + found_translation = (translation != msg_ctxt_id); #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS if (msg_ctxt_id != buf) free (msg_ctxt_id); #endif - if (translation != msg_ctxt_id) + if (found_translation) return translation; } return msgid; @@ -271,15 +273,17 @@ if (msg_ctxt_id != NULL) #endif { + int found_translation; memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); msg_ctxt_id[msgctxt_len - 1] = '\004'; memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); + found_translation = !(translation == msg_ctxt_id || translation == msgid_plural); #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS if (msg_ctxt_id != buf) free (msg_ctxt_id); #endif - if (!(translation == msg_ctxt_id || translation == msgid_plural)) + if (found_translation) return translation; } return (n == 1 ? msgid : msgid_plural); diff -Nru autogen-5.18.7/autoopts/init.c autogen-5.18.12/autoopts/init.c --- autogen-5.18.7/autoopts/init.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/init.c 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/install-hook.sh autogen-5.18.12/autoopts/install-hook.sh --- autogen-5.18.7/autoopts/install-hook.sh 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/install-hook.sh 2016-03-08 17:00:36.000000000 +0000 @@ -2,7 +2,7 @@ ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under either of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/intprops.h autogen-5.18.12/autoopts/intprops.h --- autogen-5.18.7/autoopts/intprops.h 2015-12-07 00:03:49.000000000 +0000 +++ autogen-5.18.12/autoopts/intprops.h 2016-05-04 19:44:14.000000000 +0000 @@ -1,10 +1,10 @@ /* intprops.h -- properties of integer types - Copyright (C) 2001-2005, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2001-2016 Free Software Foundation, Inc. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -21,9 +21,9 @@ #define _GL_INTPROPS_H #include +#include -/* Return an integer value, converted to the same type as the integer - expression E after integer type promotion. V is the unconverted value. */ +/* Return a value with the common real type of E and V and the value of V. */ #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) /* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see @@ -37,37 +37,18 @@ an integer. */ #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1) -/* True if negative values of the signed integer type T use two's - complement, ones' complement, or signed magnitude representation, - respectively. Much GNU code assumes two's complement, but some - people like to be portable to all possible C hosts. */ -#define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1) -#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0) -#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1) - -/* True if the signed integer expression E uses two's complement. */ -#define _GL_INT_TWOS_COMPLEMENT(e) (~ _GL_INT_CONVERT (e, 0) == -1) - -/* True if the arithmetic type T is signed. */ +/* True if the real type T is signed. */ #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) -/* Return 1 if the integer expression E, after integer promotion, has - a signed type. */ -#define _GL_INT_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) +/* Return 1 if the real expression E, after promotion, has a + signed or floating type. */ +#define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) -/* Minimum and maximum values for integer types and expressions. These - macros have undefined behavior if T is signed and has padding bits. - If this is a problem for you, please let us know how to fix it for - your host. */ +/* Minimum and maximum values for integer types and expressions. */ /* The maximum and minimum values for the integer type T. */ -#define TYPE_MINIMUM(t) \ - ((t) (! TYPE_SIGNED (t) \ - ? (t) 0 \ - : TYPE_SIGNED_MAGNITUDE (t) \ - ? ~ (t) 0 \ - : ~ TYPE_MAXIMUM (t))) +#define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) #define TYPE_MAXIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ ? (t) -1 \ @@ -76,18 +57,35 @@ /* The maximum and minimum values for the type of the expression E, after integer promotion. E should not have side effects. */ #define _GL_INT_MINIMUM(e) \ - (_GL_INT_SIGNED (e) \ - ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e) \ + (EXPR_SIGNED (e) \ + ? ~ _GL_SIGNED_INT_MAXIMUM (e) \ : _GL_INT_CONVERT (e, 0)) #define _GL_INT_MAXIMUM(e) \ - (_GL_INT_SIGNED (e) \ + (EXPR_SIGNED (e) \ ? _GL_SIGNED_INT_MAXIMUM (e) \ : _GL_INT_NEGATE_CONVERT (e, 1)) #define _GL_SIGNED_INT_MAXIMUM(e) \ (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1) +/* This include file assumes that signed types are two's complement without + padding bits; the above macros have undefined behavior otherwise. + If this is a problem for you, please let us know how to fix it for your host. + As a sanity check, test the assumption for some signed types that + bounds. */ +verify (TYPE_MINIMUM (signed char) == SCHAR_MIN); +verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX); +verify (TYPE_MINIMUM (short int) == SHRT_MIN); +verify (TYPE_MAXIMUM (short int) == SHRT_MAX); +verify (TYPE_MINIMUM (int) == INT_MIN); +verify (TYPE_MAXIMUM (int) == INT_MAX); +verify (TYPE_MINIMUM (long int) == LONG_MIN); +verify (TYPE_MAXIMUM (long int) == LONG_MAX); +#ifdef LLONG_MAX +verify (TYPE_MINIMUM (long long int) == LLONG_MIN); +verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); +#endif -/* Return 1 if the __typeof__ keyword works. This could be done by +/* Does the __typeof__ keyword work? This could be done by 'configure', but for now it's easier to do it by hand. */ #if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ || (0x5110 <= __SUNPRO_C && !__STDC__)) @@ -263,22 +261,29 @@ : (a) % - (b)) \ == 0) - -/* Integer overflow checks. +/* Check for integer overflow, and report low order bits of answer. The INT__OVERFLOW macros return 1 if the corresponding C operators might not yield numerically correct answers due to arithmetic overflow. - They work correctly on all known practical hosts, and do not rely + The INT__WRAPV macros also store the low-order bits of the answer. + These macros work correctly on all known practical hosts, and do not rely on undefined behavior due to signed arithmetic overflow. - Example usage: + Example usage, assuming A and B are long int: - long int i = ...; - long int j = ...; - if (INT_MULTIPLY_OVERFLOW (i, j)) - printf ("multiply would overflow"); + if (INT_MULTIPLY_OVERFLOW (a, b)) + printf ("result would overflow\n"); else - printf ("product is %ld", i * j); + printf ("result is %ld (no overflow)\n", a * b); + + Example usage with WRAPV flavor: + + long int result; + bool overflow = INT_MULTIPLY_WRAPV (a, b, &result); + printf ("result is %ld (%s)\n", result, + overflow ? "after overflow" : "no overflow"); + + Restrictions on these macros: These macros do not check for all possible numerical problems or undefined or unspecified behavior: they do not check for division @@ -287,6 +292,9 @@ These macros may evaluate their arguments zero or multiple times, so the arguments should not have side effects. + The WRAPV macros are not constant expressions. They support only + +, binary -, and *. The result type must be signed. + These macros are tuned for their last argument being a constant. Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B, @@ -317,4 +325,104 @@ _GL_INT_MINIMUM (0 * (b) + (a)), \ _GL_INT_MAXIMUM (0 * (b) + (a))) +/* Compute A + B, A - B, A * B, respectively, storing the result into *R. + Return 1 if the result overflows. See above for restrictions. */ +#define INT_ADD_WRAPV(a, b, r) \ + _GL_INT_OP_WRAPV (a, b, r, +, __builtin_add_overflow, INT_ADD_OVERFLOW) +#define INT_SUBTRACT_WRAPV(a, b, r) \ + _GL_INT_OP_WRAPV (a, b, r, -, __builtin_sub_overflow, INT_SUBTRACT_OVERFLOW) +#define INT_MULTIPLY_WRAPV(a, b, r) \ + _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW) + +#ifndef __has_builtin +# define __has_builtin(x) 0 +#endif + +/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 + https://llvm.org/bugs/show_bug.cgi?id=25390 + For now, assume all versions of GCC-like compilers generate bogus + warnings for _Generic. This matters only for older compilers that + lack __builtin_add_overflow. */ +#if __GNUC__ +# define _GL__GENERIC_BOGUS 1 +#else +# define _GL__GENERIC_BOGUS 0 +#endif + +/* Store A B into *R, where OP specifies the operation. + BUILTIN is the builtin operation, and OVERFLOW the overflow predicate. + See above for restrictions. */ +#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow) +# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r) +#elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS +# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ + (_Generic \ + (*(r), \ + signed char: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \ + signed char, SCHAR_MIN, SCHAR_MAX), \ + short int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \ + short int, SHRT_MIN, SHRT_MAX), \ + int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + int, INT_MIN, INT_MAX), \ + long int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + long int, LONG_MIN, LONG_MAX), \ + long long int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ + long long int, LLONG_MIN, LLONG_MAX))) +#else +# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ + (sizeof *(r) == sizeof (signed char) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \ + signed char, SCHAR_MIN, SCHAR_MAX) \ + : sizeof *(r) == sizeof (short int) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \ + short int, SHRT_MIN, SHRT_MAX) \ + : sizeof *(r) == sizeof (int) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + int, INT_MIN, INT_MAX) \ + : _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow)) +# ifdef LLONG_MAX +# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ + (sizeof *(r) == sizeof (long int) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + long int, LONG_MIN, LONG_MAX) \ + : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ + long long int, LLONG_MIN, LLONG_MAX)) +# else +# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + long int, LONG_MIN, LONG_MAX)) +# endif +#endif + +/* Store the low-order bits of A B into *R, where the operation + is given by OP. Use the unsigned type UT for calculation to avoid + overflow problems. *R's type is T, with extremal values TMIN and + TMAX. T must be a signed integer type. */ +#define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \ + (sizeof ((a) op (b)) < sizeof (t) \ + ? _GL_INT_OP_CALC1 ((t) (a), (t) (b), r, op, overflow, ut, t, tmin, tmax) \ + : _GL_INT_OP_CALC1 (a, b, r, op, overflow, ut, t, tmin, tmax)) +#define _GL_INT_OP_CALC1(a, b, r, op, overflow, ut, t, tmin, tmax) \ + ((overflow (a, b) \ + || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \ + || (tmax) < ((a) op (b))) \ + ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 1) \ + : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 0)) + +/* Return A B, where the operation is given by OP. Use the + unsigned type UT for calculation to avoid overflow problems. + Convert the result to type T without overflow by subtracting TMIN + from large values before converting, and adding it afterwards. + Compilers can optimize all the operations except OP. */ +#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t, tmin, tmax) \ + (((ut) (a) op (ut) (b)) <= (tmax) \ + ? (t) ((ut) (a) op (ut) (b)) \ + : ((t) (((ut) (a) op (ut) (b)) - (tmin)) + (tmin))) + #endif /* _GL_INTPROPS_H */ diff -Nru autogen-5.18.7/autoopts/load.c autogen-5.18.12/autoopts/load.c --- autogen-5.18.7/autoopts/load.c 2015-08-08 23:33:36.000000000 +0000 +++ autogen-5.18.12/autoopts/load.c 2016-03-08 17:00:36.000000000 +0000 @@ -12,7 +12,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/Makefile.am autogen-5.18.12/autoopts/Makefile.am --- autogen-5.18.7/autoopts/Makefile.am 2015-12-07 00:04:06.000000000 +0000 +++ autogen-5.18.12/autoopts/Makefile.am 2016-08-29 21:35:37.000000000 +0000 @@ -4,7 +4,7 @@ ## ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control @@ -113,6 +113,7 @@ endif MOSTLYCLEANFILES += stdnoreturn.h stdnoreturn.h-t EXTRA_DIST += stdnoreturn.in.h +EXTRA_DIST += verify.h GENHDRS = autoopts/options.h autoopts/usage-txt.h genshell.h \ option-xat-attribute.h option-value-type.h ao-strs.h \ diff -Nru autogen-5.18.7/autoopts/Makefile.in autogen-5.18.12/autoopts/Makefile.in --- autogen-5.18.7/autoopts/Makefile.in 2015-12-07 00:04:13.000000000 +0000 +++ autogen-5.18.12/autoopts/Makefile.in 2016-08-29 21:35:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,9 +93,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = autoopts -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/mk-autoopts-pc.in $(srcdir)/autoopts-config.in \ - $(top_srcdir)/config/depcomp $(nobase_include_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -102,6 +109,8 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(nobase_include_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = mk-autoopts-pc autoopts-config @@ -238,6 +247,8 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/autoopts-config.in \ + $(srcdir)/mk-autoopts-pc.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -442,7 +453,7 @@ EXTRA_DIST = $(top_srcdir)/config/gendocs.sh gettext.h intprops.h \ parse-duration.c parse-duration.h \ $(top_srcdir)/config/snippet/_Noreturn.h stdnoreturn.in.h \ - $(SRC) $(EXTRA_DATA) $(man_MANS) $(DEF_FILES) + verify.h $(SRC) $(EXTRA_DATA) $(man_MANS) $(DEF_FILES) GENMAN = $(PATHFIND_MAN) \ ao_string_tokenize.3 configFileLoad.3 \ optionFileLoad.3 optionFindNextValue.3 \ @@ -553,7 +564,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu autoopts/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu autoopts/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1213,6 +1223,8 @@ uninstall-nodist_libdataDATA uninstall-nodist_pkgdataDATA \ uninstall-pkgconfigDATA uninstall-pkgdataDATA +.PRECIOUS: Makefile + # We need the following in order to create when the system # doesn't have one that works. @GL_GENERATE_STDNORETURN_H_TRUE@stdnoreturn.h: stdnoreturn.in.h $(top_builddir)/config.status $(_NORETURN_H) diff -Nru autogen-5.18.7/autoopts/makeshell.c autogen-5.18.12/autoopts/makeshell.c --- autogen-5.18.7/autoopts/makeshell.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/makeshell.c 2016-03-08 17:00:36.000000000 +0000 @@ -11,7 +11,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/mk-autoopts-pc.in autogen-5.18.12/autoopts/mk-autoopts-pc.in --- autogen-5.18.7/autoopts/mk-autoopts-pc.in 2015-12-07 00:04:07.000000000 +0000 +++ autogen-5.18.12/autoopts/mk-autoopts-pc.in 2016-08-29 21:35:37.000000000 +0000 @@ -2,7 +2,7 @@ ## --------------------------------------------------------------------- ## mk-autoopts-pc.in -- Describe AutoOpts configuration ## -## Autoopts Copyright (C) 1992-2015 by Bruce Korb +## Autoopts Copyright (C) 1992-2016 by Bruce Korb ## ## DO NOT EDIT THIS FILE (mk-autoopts-pc.in) ## diff -Nru autogen-5.18.7/autoopts/mk-tpl-config.sh autogen-5.18.12/autoopts/mk-tpl-config.sh --- autogen-5.18.7/autoopts/mk-tpl-config.sh 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/mk-tpl-config.sh 2016-03-08 17:00:36.000000000 +0000 @@ -2,7 +2,7 @@ ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/nested.c autogen-5.18.12/autoopts/nested.c --- autogen-5.18.7/autoopts/nested.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/nested.c 2016-07-31 21:07:49.000000000 +0000 @@ -12,7 +12,7 @@ * * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control @@ -783,12 +783,23 @@ text = scan_name(text, res_val); else switch (*text) { - case NUL: goto scan_done; - case '<': text = scan_xml(text, res_val); - if (text == NULL) goto woops; - if (*text == ',') text++; break; - case '#': text = strchr(text, NL); break; - default: goto woops; + case NUL: + goto scan_done; + + case '<': + text = scan_xml(text, res_val); + if (text == NULL) + goto woops; + if (*text == ',') + text++; + break; + + case '#': + text = strchr(text, NL); + break; + + default: + goto woops; } } while (text != NULL); scan_done:; diff -Nru autogen-5.18.7/autoopts/numeric.c autogen-5.18.12/autoopts/numeric.c --- autogen-5.18.7/autoopts/numeric.c 2015-08-13 16:25:33.000000000 +0000 +++ autogen-5.18.12/autoopts/numeric.c 2016-03-08 17:00:36.000000000 +0000 @@ -10,7 +10,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/optionFileLoad.3 autogen-5.18.12/autoopts/optionFileLoad.3 --- autogen-5.18.7/autoopts/optionFileLoad.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionFileLoad.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionFileLoad 3 2015-12-06 "" "Programmer's Manual" +.TH optionFileLoad 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionFileLoad.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionFindNextValue.3 autogen-5.18.12/autoopts/optionFindNextValue.3 --- autogen-5.18.7/autoopts/optionFindNextValue.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionFindNextValue.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionFindNextValue 3 2015-12-06 "" "Programmer's Manual" +.TH optionFindNextValue 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionFindNextValue.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionFindValue.3 autogen-5.18.12/autoopts/optionFindValue.3 --- autogen-5.18.7/autoopts/optionFindValue.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionFindValue.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionFindValue 3 2015-12-06 "" "Programmer's Manual" +.TH optionFindValue 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionFindValue.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionFree.3 autogen-5.18.12/autoopts/optionFree.3 --- autogen-5.18.7/autoopts/optionFree.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionFree.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionFree 3 2015-12-06 "" "Programmer's Manual" +.TH optionFree 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionFree.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionGetValue.3 autogen-5.18.12/autoopts/optionGetValue.3 --- autogen-5.18.7/autoopts/optionGetValue.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionGetValue.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionGetValue 3 2015-12-06 "" "Programmer's Manual" +.TH optionGetValue 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionGetValue.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionLoadLine.3 autogen-5.18.12/autoopts/optionLoadLine.3 --- autogen-5.18.7/autoopts/optionLoadLine.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionLoadLine.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionLoadLine 3 2015-12-06 "" "Programmer's Manual" +.TH optionLoadLine 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionLoadLine.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionMemberList.3 autogen-5.18.12/autoopts/optionMemberList.3 --- autogen-5.18.7/autoopts/optionMemberList.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionMemberList.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionMemberList 3 2015-12-06 "" "Programmer's Manual" +.TH optionMemberList 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionMemberList.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionNextValue.3 autogen-5.18.12/autoopts/optionNextValue.3 --- autogen-5.18.7/autoopts/optionNextValue.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionNextValue.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionNextValue 3 2015-12-06 "" "Programmer's Manual" +.TH optionNextValue 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionNextValue.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionOnlyUsage.3 autogen-5.18.12/autoopts/optionOnlyUsage.3 --- autogen-5.18.7/autoopts/optionOnlyUsage.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionOnlyUsage.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionOnlyUsage 3 2015-12-06 "" "Programmer's Manual" +.TH optionOnlyUsage 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionOnlyUsage.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionPrintVersion.3 autogen-5.18.12/autoopts/optionPrintVersion.3 --- autogen-5.18.7/autoopts/optionPrintVersion.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionPrintVersion.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionPrintVersion 3 2015-12-06 "" "Programmer's Manual" +.TH optionPrintVersion 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionPrintVersion.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionPrintVersionAndReturn.3 autogen-5.18.12/autoopts/optionPrintVersionAndReturn.3 --- autogen-5.18.7/autoopts/optionPrintVersionAndReturn.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionPrintVersionAndReturn.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionPrintVersionAndReturn 3 2015-12-06 "" "Programmer's Manual" +.TH optionPrintVersionAndReturn 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionPrintVersionAndReturn.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionProcess.3 autogen-5.18.12/autoopts/optionProcess.3 --- autogen-5.18.7/autoopts/optionProcess.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionProcess.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionProcess 3 2015-12-06 "" "Programmer's Manual" +.TH optionProcess 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionProcess.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionRestore.3 autogen-5.18.12/autoopts/optionRestore.3 --- autogen-5.18.7/autoopts/optionRestore.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionRestore.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionRestore 3 2015-12-06 "" "Programmer's Manual" +.TH optionRestore 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionRestore.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionSaveFile.3 autogen-5.18.12/autoopts/optionSaveFile.3 --- autogen-5.18.7/autoopts/optionSaveFile.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionSaveFile.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionSaveFile 3 2015-12-06 "" "Programmer's Manual" +.TH optionSaveFile 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionSaveFile.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionSaveState.3 autogen-5.18.12/autoopts/optionSaveState.3 --- autogen-5.18.7/autoopts/optionSaveState.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionSaveState.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionSaveState 3 2015-12-06 "" "Programmer's Manual" +.TH optionSaveState 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionSaveState.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionUnloadNested.3 autogen-5.18.12/autoopts/optionUnloadNested.3 --- autogen-5.18.7/autoopts/optionUnloadNested.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionUnloadNested.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionUnloadNested 3 2015-12-06 "" "Programmer's Manual" +.TH optionUnloadNested 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionUnloadNested.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/optionVersion.3 autogen-5.18.12/autoopts/optionVersion.3 --- autogen-5.18.7/autoopts/optionVersion.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/optionVersion.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH optionVersion 3 2015-12-06 "" "Programmer's Manual" +.TH optionVersion 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (optionVersion.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/parse-duration.c autogen-5.18.12/autoopts/parse-duration.c --- autogen-5.18.7/autoopts/parse-duration.c 2015-12-07 00:03:49.000000000 +0000 +++ autogen-5.18.12/autoopts/parse-duration.c 2016-08-29 21:35:20.000000000 +0000 @@ -1,5 +1,5 @@ /* Parse a time duration and return a seconds count - Copyright (C) 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2008-2016 Free Software Foundation, Inc. Written by Bruce Korb , 2008. This program is free software: you can redistribute it and/or modify diff -Nru autogen-5.18.7/autoopts/parse-duration.h autogen-5.18.12/autoopts/parse-duration.h --- autogen-5.18.7/autoopts/parse-duration.h 2015-12-07 00:03:49.000000000 +0000 +++ autogen-5.18.12/autoopts/parse-duration.h 2016-08-29 21:35:20.000000000 +0000 @@ -1,5 +1,5 @@ /* Parse a time duration and return a seconds count - Copyright (C) 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2008-2016 Free Software Foundation, Inc. Written by Bruce Korb , 2008. This program is free software: you can redistribute it and/or modify diff -Nru autogen-5.18.7/autoopts/pgusage.c autogen-5.18.12/autoopts/pgusage.c --- autogen-5.18.7/autoopts/pgusage.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/pgusage.c 2016-03-08 17:00:36.000000000 +0000 @@ -13,7 +13,7 @@ * * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/po/usage-txt.pot autogen-5.18.12/autoopts/po/usage-txt.pot --- autogen-5.18.7/autoopts/po/usage-txt.pot 2015-12-07 00:03:57.000000000 +0000 +++ autogen-5.18.12/autoopts/po/usage-txt.pot 2016-08-29 21:35:27.000000000 +0000 @@ -1,5 +1,5 @@ # Automated Option parsing usage text. -# Copyright (C) 1999-2015 by Bruce Korb - all rights reserved +# Copyright (C) 1999-2016 by Bruce Korb - all rights reserved # This file is distributed under the same licenses as the AutoOpts package. # Bruce Korb # @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: autogen \n" "Report-Msgid-Bugs-To: autogen-users@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-12-06 16:03-0800\n" +"POT-Creation-Date: 2016-08-29 14:35-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,13 +45,13 @@ #: ../reset.c:90 msgid "optionResetOpt() called, but reset-option not configured" -#: ../usage.c:292 +#: ../usage.c:295 msgid "could not locate the 'help' option" #: ../autoopts.c:336 msgid "optionProcess() was called with invalid data" -#: ../usage.c:748 +#: ../usage.c:751 msgid "invalid argument type specified" #: ../find.c:598 @@ -96,16 +96,16 @@ #: ../alias.c:38 msgid "-equivalence" -#: ../usage.c:1254 ../usage.c:1268 +#: ../usage.c:1257 ../usage.c:1271 msgid "=T/F" -#: ../usage.c:1250 ../usage.c:1268 +#: ../usage.c:1253 ../usage.c:1271 msgid "=KWd" -#: ../usage.c:1249 ../usage.c:1268 +#: ../usage.c:1252 ../usage.c:1271 msgid "=num" -#: ../usage.c:1247 ../usage.c:1268 +#: ../usage.c:1250 ../usage.c:1271 msgid "=str" #: ../find.c:469 ../reset.c:110 @@ -120,7 +120,7 @@ #: ../enum.c:160 ../enum.c:170 msgid " or an integer from %d through %d\n" -#: ../usage.c:747 ../usage.c:1081 +#: ../usage.c:750 ../usage.c:1084 msgid "%s error: invalid option descriptor for %s\n" #: ../find.c:385 @@ -142,7 +142,7 @@ #: ../check.c:151 msgid "%s: Command line arguments are not allowed.\n" -#: ../save.c:535 +#: ../save.c:536 msgid "error %d (%s) creating %s\n" #: ../enum.c:235 @@ -151,7 +151,7 @@ #: ../reset.c:93 msgid "%s error: The '%s' option requires an argument.\n" -#: ../save.c:186 ../save.c:238 +#: ../save.c:186 ../save.c:239 msgid "error %d (%s) stat-ing %s\n" #: ../restore.c:143 @@ -178,19 +178,19 @@ #: ../enum.c:201 msgid "%s error: %s exceeds %s keyword count\n" -#: ../usage.c:330 +#: ../usage.c:333 msgid "Try '%s %s' for more information.\n" #: ../alias.c:45 msgid "one %s%s option allowed\n" -#: ../makeshell.c:208 ../makeshell.c:943 ../usage.c:274 ../usage.c:415 ../usage.c:625 ../version.c:175 +#: ../makeshell.c:208 ../makeshell.c:943 ../usage.c:277 ../usage.c:418 ../usage.c:628 ../version.c:175 msgid "standard output" -#: ../usage.c:274 ../usage.c:415 ../usage.c:625 ../version.c:175 +#: ../usage.c:277 ../usage.c:418 ../usage.c:628 ../version.c:175 msgid "standard error" -#: ../makeshell.c:208 ../makeshell.c:943 ../usage.c:273 ../usage.c:414 ../usage.c:624 ../version.c:174 +#: ../makeshell.c:208 ../makeshell.c:943 ../usage.c:276 ../usage.c:417 ../usage.c:627 ../version.c:174 msgid "write" #: ../numeric.c:60 @@ -199,34 +199,34 @@ #: ../check.c:44 msgid "%s error: %s option requires the %s option\n" -#: ../save.c:130 ../save.c:185 ../save.c:237 ../save.c:256 ../save.c:534 +#: ../save.c:130 ../save.c:185 ../save.c:238 ../save.c:257 ../save.c:535 msgid "%s warning: cannot save options - %s not regular file\n" -#: ../usage.c:873 +#: ../usage.c:876 msgid "\t\t\t\t- an alternate for '%s'\n" -#: ../usage.c:1148 +#: ../usage.c:1151 msgid "Version, usage and configuration options:" -#: ../usage.c:924 +#: ../usage.c:927 msgid "\t\t\t\t- default option for unnamed options\n" -#: ../usage.c:837 +#: ../usage.c:840 msgid "\t\t\t\t- disabled as '--%s'\n" -#: ../usage.c:1117 +#: ../usage.c:1120 msgid " --- %-14s %s\n" -#: ../usage.c:1115 +#: ../usage.c:1118 msgid "This option has been disabled" -#: ../usage.c:864 +#: ../usage.c:867 msgid "\t\t\t\t- enabled by default\n" #: ../alias.c:40 msgid "%s error: only " -#: ../usage.c:1194 +#: ../usage.c:1197 msgid " - examining environment variables named %s_*\n" #: ../file.c:168 @@ -235,7 +235,7 @@ #: ../file.c:172 msgid "\t\t\t\t- file must pre-exist\n" -#: ../usage.c:380 +#: ../usage.c:383 msgid "Options are specified by doubled hyphens and their name or by a single\n" "hyphen and the flag character.\n" @@ -248,54 +248,54 @@ #: ../enum.c:167 msgid " or an integer mask with any of the lower %d bits set\n" -#: ../usage.c:897 +#: ../usage.c:900 msgid "\t\t\t\t- is a set membership option\n" -#: ../usage.c:918 +#: ../usage.c:921 msgid "\t\t\t\t- must appear between %d and %d times\n" -#: ../usage.c:382 +#: ../usage.c:385 msgid "Options are specified by single or double hyphens and their name.\n" -#: ../usage.c:904 +#: ../usage.c:907 msgid "\t\t\t\t- may appear multiple times\n" -#: ../usage.c:891 +#: ../usage.c:894 msgid "\t\t\t\t- may not be preset\n" -#: ../usage.c:1309 +#: ../usage.c:1312 msgid " Arg Option-Name Description\n" -#: ../usage.c:1245 ../usage.c:1303 +#: ../usage.c:1248 ../usage.c:1306 msgid " Flg Arg Option-Name Description\n" -#: ../usage.c:1304 ../usage.c:1310 +#: ../usage.c:1307 ../usage.c:1313 msgid " %3s %s" -#: ../usage.c:387 +#: ../usage.c:390 msgid "The '-#' option may omit the hash char\n" -#: ../usage.c:383 +#: ../usage.c:386 msgid "All arguments are named options.\n" -#: ../usage.c:971 +#: ../usage.c:974 msgid " - reading file %s" -#: ../usage.c:409 ../version.c:100 ../version.c:129 +#: ../usage.c:412 ../version.c:100 ../version.c:129 msgid "\n" "Please send bug reports to: <%s>\n" -#: ../usage.c:903 +#: ../usage.c:906 msgid "\t\t\t\t- may NOT appear - preset only\n" -#: ../usage.c:944 ../usage.c:1192 +#: ../usage.c:947 ../usage.c:1195 msgid "\n" "The following option preset mechanisms are supported:\n" -#: ../usage.c:682 +#: ../usage.c:685 msgid "prohibits these options:\n" -#: ../usage.c:677 +#: ../usage.c:680 msgid "prohibits the option '%s'\n" #: ../numeric.c:81 @@ -322,19 +322,19 @@ #: ../numeric.c:77 msgid "%sless than or equal to %ld" -#: ../usage.c:390 +#: ../usage.c:393 msgid "Operands and options may be intermixed. They will be reordered.\n" -#: ../usage.c:652 +#: ../usage.c:655 msgid "requires the option '%s'\n" -#: ../usage.c:655 +#: ../usage.c:658 msgid "requires these options:\n" -#: ../usage.c:1321 +#: ../usage.c:1324 msgid " Arg Option-Name Req? Description\n" -#: ../usage.c:1315 +#: ../usage.c:1318 msgid " Flg Arg Option-Name Req? Description\n" #: ../enum.c:168 @@ -343,14 +343,14 @@ "will set them all. Multiple entries may be passed as an option\n" "argument list.\n" -#: ../usage.c:910 +#: ../usage.c:913 msgid "\t\t\t\t- may appear up to %d times\n" #: ../enum.c:77 msgid "The valid \"%s\" option keywords are:\n" -#: ../usage.c:1152 +#: ../usage.c:1155 msgid "The next option supports vendor supported extra options:" -#: ../usage.c:773 +#: ../usage.c:776 msgid "These additional options are:" \ No newline at end of file diff -Nru autogen-5.18.7/autoopts/project.h autogen-5.18.12/autoopts/project.h --- autogen-5.18.7/autoopts/project.h 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/project.h 2016-03-08 17:00:36.000000000 +0000 @@ -4,7 +4,7 @@ * * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/proto.h autogen-5.18.12/autoopts/proto.h --- autogen-5.18.7/autoopts/proto.h 2015-12-07 00:04:07.000000000 +0000 +++ autogen-5.18.12/autoopts/proto.h 2016-08-29 21:35:37.000000000 +0000 @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: * * Prototypes for autoopts - * Generated Sun Dec 6 16:04:07 PST 2015 + * Generated Mon Aug 29 14:35:37 PDT 2016 */ #ifndef AUTOOPTS_PROTO_H_GUARD #define AUTOOPTS_PROTO_H_GUARD 1 diff -Nru autogen-5.18.7/autoopts/putshell.c autogen-5.18.12/autoopts/putshell.c --- autogen-5.18.7/autoopts/putshell.c 2015-08-08 23:33:36.000000000 +0000 +++ autogen-5.18.12/autoopts/putshell.c 2016-05-27 20:38:31.000000000 +0000 @@ -12,7 +12,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control @@ -183,7 +183,7 @@ *(out++) = '"'; *(out++) = NUL; #ifndef NDEBUG - if ((out - res) > out_sz) { + if ((size_t)(out - res) > out_sz) { fputs(misguess_len, stderr); option_exits(EXIT_FAILURE); } diff -Nru autogen-5.18.7/autoopts/reset.c autogen-5.18.12/autoopts/reset.c --- autogen-5.18.7/autoopts/reset.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/reset.c 2016-03-08 17:00:36.000000000 +0000 @@ -10,7 +10,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/restore.c autogen-5.18.12/autoopts/restore.c --- autogen-5.18.7/autoopts/restore.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/restore.c 2016-03-08 17:00:36.000000000 +0000 @@ -12,7 +12,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/save.c autogen-5.18.12/autoopts/save.c --- autogen-5.18.7/autoopts/save.c 2015-08-08 23:33:36.000000000 +0000 +++ autogen-5.18.12/autoopts/save.c 2016-05-27 20:38:31.000000000 +0000 @@ -12,7 +12,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control @@ -215,11 +215,12 @@ * THEN tack on the config file name */ if (S_ISDIR(stBuf.st_mode)) { - size_t sz = strlen(pzDir) + strlen(opts->pzRcName) + 2; { + size_t sz = strlen(pzDir) + strlen(opts->pzRcName) + 2; char * pzPath = (char *)AGALOC(sz, "file name"); - if (snprintf(pzPath, sz, "%s/%s", pzDir, opts->pzRcName) >= sz) + if ( snprintf(pzPath, sz, "%s/%s", pzDir, opts->pzRcName) + >= (int)sz) option_exits(EXIT_FAILURE); if (free_dir_name) diff -Nru autogen-5.18.7/autoopts/sort.c autogen-5.18.12/autoopts/sort.c --- autogen-5.18.7/autoopts/sort.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/sort.c 2016-03-08 17:00:36.000000000 +0000 @@ -10,7 +10,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/stack.c autogen-5.18.12/autoopts/stack.c --- autogen-5.18.7/autoopts/stack.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/stack.c 2016-03-08 17:00:36.000000000 +0000 @@ -11,7 +11,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/stdnoreturn.in.h autogen-5.18.12/autoopts/stdnoreturn.in.h --- autogen-5.18.7/autoopts/stdnoreturn.in.h 2015-12-07 00:03:49.000000000 +0000 +++ autogen-5.18.12/autoopts/stdnoreturn.in.h 2016-08-29 21:35:20.000000000 +0000 @@ -1,6 +1,6 @@ /* A substitute for ISO C11 . - Copyright 2012-2015 Free Software Foundation, Inc. + Copyright 2012-2016 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff -Nru autogen-5.18.7/autoopts/strequate.3 autogen-5.18.12/autoopts/strequate.3 --- autogen-5.18.7/autoopts/strequate.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/strequate.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH strequate 3 2015-12-06 "" "Programmer's Manual" +.TH strequate 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (strequate.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/streqvcmp.3 autogen-5.18.12/autoopts/streqvcmp.3 --- autogen-5.18.7/autoopts/streqvcmp.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/streqvcmp.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH streqvcmp 3 2015-12-06 "" "Programmer's Manual" +.TH streqvcmp 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (streqvcmp.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/streqvcmp.c autogen-5.18.12/autoopts/streqvcmp.c --- autogen-5.18.7/autoopts/streqvcmp.c 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/streqvcmp.c 2016-03-08 17:00:36.000000000 +0000 @@ -15,7 +15,7 @@ /* * This file is part of AutoOpts, a companion to AutoGen. * AutoOpts is free software. - * AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved + * AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved * * AutoOpts is available under any one of two licenses. The license * in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/streqvmap.3 autogen-5.18.12/autoopts/streqvmap.3 --- autogen-5.18.7/autoopts/streqvmap.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/streqvmap.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH streqvmap 3 2015-12-06 "" "Programmer's Manual" +.TH streqvmap 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (streqvmap.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/strneqvcmp.3 autogen-5.18.12/autoopts/strneqvcmp.3 --- autogen-5.18.7/autoopts/strneqvcmp.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/strneqvcmp.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH strneqvcmp 3 2015-12-06 "" "Programmer's Manual" +.TH strneqvcmp 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (strneqvcmp.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/strtransform.3 autogen-5.18.12/autoopts/strtransform.3 --- autogen-5.18.7/autoopts/strtransform.3 2015-12-07 00:05:24.000000000 +0000 +++ autogen-5.18.12/autoopts/strtransform.3 2016-08-29 21:37:03.000000000 +0000 @@ -1,4 +1,4 @@ -.TH strtransform 3 2015-12-06 "" "Programmer's Manual" +.TH strtransform 3 2016-08-29 "" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (strtransform.3) .\" .\" It has been AutoGen-ed diff -Nru autogen-5.18.7/autoopts/test/alias.test autogen-5.18.12/autoopts/test/alias.test --- autogen-5.18.7/autoopts/test/alias.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/test/alias.test 2016-03-08 17:00:36.000000000 +0000 @@ -6,7 +6,7 @@ ## ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/test/argument.test autogen-5.18.12/autoopts/test/argument.test --- autogen-5.18.7/autoopts/test/argument.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/test/argument.test 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ ## ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/test/cfg-edit.test autogen-5.18.12/autoopts/test/cfg-edit.test --- autogen-5.18.7/autoopts/test/cfg-edit.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/test/cfg-edit.test 2016-03-08 17:00:36.000000000 +0000 @@ -7,7 +7,7 @@ ## ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/test/cond.test autogen-5.18.12/autoopts/test/cond.test --- autogen-5.18.7/autoopts/test/cond.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/test/cond.test 2016-03-08 17:00:36.000000000 +0000 @@ -7,7 +7,7 @@ ## ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/test/config.test autogen-5.18.12/autoopts/test/config.test --- autogen-5.18.7/autoopts/test/config.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/test/config.test 2016-03-08 17:00:36.000000000 +0000 @@ -7,7 +7,7 @@ ## ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/test/defs.in autogen-5.18.12/autoopts/test/defs.in --- autogen-5.18.7/autoopts/test/defs.in 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/test/defs.in 2016-03-08 17:00:39.000000000 +0000 @@ -7,7 +7,7 @@ # ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control @@ -88,7 +88,7 @@ ) || eval 'local() { : ; }' vars=`set | ${SED} -n '/^\(LANG\|LC_[A-Z_]*\)=/s/=.*//p'` 2>/dev/null - unset AUTOOPTS_USAGE $vars + unset AUTOOPTS_USAGE $vars CONTENT_LENGTH REQUEST_METHOD QUERY_STRING } # If only the "rm(1)" command could be relied upon.... diff -Nru autogen-5.18.7/autoopts/test/doc.test autogen-5.18.12/autoopts/test/doc.test --- autogen-5.18.7/autoopts/test/doc.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/test/doc.test 2016-03-08 17:00:36.000000000 +0000 @@ -7,7 +7,7 @@ # ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/test/enums.test autogen-5.18.12/autoopts/test/enums.test --- autogen-5.18.7/autoopts/test/enums.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/test/enums.test 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ ## ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/test/equiv.test autogen-5.18.12/autoopts/test/equiv.test --- autogen-5.18.7/autoopts/test/equiv.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/test/equiv.test 2016-03-08 17:00:36.000000000 +0000 @@ -7,7 +7,7 @@ ## ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/test/errors.test autogen-5.18.12/autoopts/test/errors.test --- autogen-5.18.7/autoopts/test/errors.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/test/errors.test 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ ## ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/test/getopt.test autogen-5.18.12/autoopts/test/getopt.test --- autogen-5.18.7/autoopts/test/getopt.test 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/test/getopt.test 2016-03-08 17:00:36.000000000 +0000 @@ -7,7 +7,7 @@ # ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/test/handler.test autogen-5.18.12/autoopts/test/handler.test --- autogen-5.18.7/autoopts/test/handler.test 2015-08-08 23:33:36.000000000 +0000 +++ autogen-5.18.12/autoopts/test/handler.test 2016-03-08 17:00:36.000000000 +0000 @@ -9,7 +9,7 @@ ## ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/test/Makefile.am autogen-5.18.12/autoopts/test/Makefile.am --- autogen-5.18.7/autoopts/test/Makefile.am 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/test/Makefile.am 2016-03-08 17:00:36.000000000 +0000 @@ -6,7 +6,7 @@ ## ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control diff -Nru autogen-5.18.7/autoopts/test/Makefile.in autogen-5.18.12/autoopts/test/Makefile.in --- autogen-5.18.7/autoopts/test/Makefile.in 2015-12-07 00:04:13.000000000 +0000 +++ autogen-5.18.12/autoopts/test/Makefile.in 2016-08-29 21:35:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = autoopts/test -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/defs.in $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -97,6 +105,7 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = defs @@ -323,6 +332,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/defs.in \ + $(top_srcdir)/config/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AGEN5_TESTS = @AGEN5_TESTS@ @@ -513,7 +524,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu autoopts/test/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu autoopts/test/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -576,7 +586,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -851,6 +861,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \ uninstall uninstall-am +.PRECIOUS: Makefile + getopt.test : ../$(libsrc) ../$(libsrc): diff -Nru autogen-5.18.7/autoopts/text_mmap.c autogen-5.18.12/autoopts/text_mmap.c --- autogen-5.18.7/autoopts/text_mmap.c 2015-11-18 20:56:01.000000000 +0000 +++ autogen-5.18.12/autoopts/text_mmap.c 2016-03-08 16:58:38.000000000 +0000 @@ -353,16 +353,15 @@ #ifdef HAVE_MMAP (void)munmap(mi->txt_data, mi->txt_full_size); -#else /* don't HAVE_MMAP */ +#else // don't HAVE_MMAP /* * IF the memory is writable *AND* it is not private (copy-on-write) * *AND* the memory is "sharable" (seen by other processes) * THEN rewrite the data. Emulate mmap visibility. */ - if ( FILE_WRITABLE(mi->txt_prot, mi->txt_flags) - && (lseek(mi->txt_fd, 0, SEEK_SET) >= 0) ) { + if ( FILE_WRITABLE(mi->txt_prot, mi->txt_flags) + && (lseek(mi->txt_fd, 0, SEEK_SET) >= 0) ) write(mi->txt_fd, mi->txt_data, mi->txt_size); - } free(mi->txt_data); #endif /* HAVE_MMAP */ diff -Nru autogen-5.18.7/autoopts/time.c autogen-5.18.12/autoopts/time.c --- autogen-5.18.7/autoopts/time.c 2015-08-08 23:33:36.000000000 +0000 +++ autogen-5.18.12/autoopts/time.c 2016-05-27 20:38:31.000000000 +0000 @@ -92,7 +92,7 @@ static char const fmt[] = "DATEMSK=%s/datemsk"; size_t sz = sizeof(fmt) + strlen(opts->pzPkgDataDir); envptr = AGALOC(sz, fmt); - if (snprintf(envptr, sz, fmt, opts->pzPkgDataDir) >= sz) + if (snprintf(envptr, sz, fmt, opts->pzPkgDataDir) >= (int)sz) option_exits(EXIT_FAILURE); putenv(envptr); diff -Nru autogen-5.18.7/autoopts/tpl/cmd-doc.tlib autogen-5.18.12/autoopts/tpl/cmd-doc.tlib --- autogen-5.18.7/autoopts/tpl/cmd-doc.tlib 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/autoopts/tpl/cmd-doc.tlib 2016-05-09 17:55:20.000000000 +0000 @@ -940,9 +940,9 @@ arg-optional Oc :+][+: ENDIF :+][+: - IF (exist? "disable") - :+], " Fl \-[+:(. dis-name):+]"[+: - ENDIF :+][+: + (if (exist? "disable") + (string-append ", Fl \\-" dis-name) + "") :+][+: ENDIF :+][+: ENDIF :+] [+: (get "descrip" "") :+].[+: diff -Nru autogen-5.18.7/autoopts/usage.c autogen-5.18.12/autoopts/usage.c --- autogen-5.18.7/autoopts/usage.c 2015-08-08 23:33:36.000000000 +0000 +++ autogen-5.18.12/autoopts/usage.c 2016-04-20 17:57:25.000000000 +0000 @@ -37,6 +37,9 @@ * 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.mbsd */ +#define GRAPH_CH(_ch) \ + ((((unsigned)_ch) <= 0x7E) && (((unsigned)_ch) > ' ')) + /* = = = START-STATIC-FORWARD = = = */ static unsigned int parse_usage_flags(ao_flag_names_t const * fnt, char const * txt); @@ -777,7 +780,7 @@ do { size_t l; if ( ((od->fOptState & not_vended_mask) != 0) - || IS_GRAPHIC_CHAR(od->optValue)) + || GRAPH_CH(od->optValue)) continue; l = strlen(od->pz_Name); @@ -795,7 +798,7 @@ do { if ( ((od->fOptState & not_vended_mask) != 0) - || IS_GRAPHIC_CHAR(od->optValue)) + || GRAPH_CH(od->optValue)) continue; prt_one_vendor(opts, od, &argTypes, vfmt); @@ -1005,7 +1008,7 @@ if ((opts->fOptSet & OPTPROC_SHORTOPT) == 0) fputs(at->pzSpc, option_usage_fp); - else if (! IS_GRAPHIC_CHAR(od->optValue)) { + else if (! GRAPH_CH(od->optValue)) { if ( (opts->fOptSet & (OPTPROC_GNUUSAGE|OPTPROC_LONGOPT)) == (OPTPROC_GNUUSAGE|OPTPROC_LONGOPT)) fputc(' ', option_usage_fp); @@ -1132,7 +1135,7 @@ /* Skip name only options when we have a vendor option */ if ( ((opts->fOptSet & OPTPROC_VENDOR_OPT) != 0) - && (! IS_GRAPHIC_CHAR(od->optValue))) + && (! GRAPH_CH(od->optValue))) continue; /* diff -Nru autogen-5.18.7/autoopts/verify.h autogen-5.18.12/autoopts/verify.h --- autogen-5.18.7/autoopts/verify.h 1970-01-01 00:00:00.000000000 +0000 +++ autogen-5.18.12/autoopts/verify.h 2016-08-29 21:35:20.000000000 +0000 @@ -0,0 +1,279 @@ +/* Compile-time assert-like macros. + + Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ + +/* Written by Paul Eggert, Bruno Haible, and Jim Meyering. */ + +#ifndef _GL_VERIFY_H +#define _GL_VERIFY_H + + +/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11. + This is supported by GCC 4.6.0 and later, in C mode, and its use + here generates easier-to-read diagnostics when verify (R) fails. + + Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11. + This will likely be supported by future GCC versions, in C++ mode. + + Use this only with GCC. If we were willing to slow 'configure' + down we could also use it with other compilers, but since this + affects only the quality of diagnostics, why bother? */ +#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \ + && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \ + && !defined __cplusplus) +# define _GL_HAVE__STATIC_ASSERT 1 +#endif +/* The condition (99 < __GNUC__) is temporary, until we know about the + first G++ release that supports static_assert. */ +#if (99 < __GNUC__) && defined __cplusplus +# define _GL_HAVE_STATIC_ASSERT 1 +#endif + +/* FreeBSD 9.1 , included by and lots of other + system headers, defines a conflicting _Static_assert that is no + better than ours; override it. */ +#ifndef _GL_HAVE_STATIC_ASSERT +# include +# undef _Static_assert +#endif + +/* Each of these macros verifies that its argument R is nonzero. To + be portable, R should be an integer constant expression. Unlike + assert (R), there is no run-time overhead. + + If _Static_assert works, verify (R) uses it directly. Similarly, + _GL_VERIFY_TRUE works by packaging a _Static_assert inside a struct + that is an operand of sizeof. + + The code below uses several ideas for C++ compilers, and for C + compilers that do not support _Static_assert: + + * The first step is ((R) ? 1 : -1). Given an expression R, of + integral or boolean or floating-point type, this yields an + expression of integral type, whose value is later verified to be + constant and nonnegative. + + * Next this expression W is wrapped in a type + struct _gl_verify_type { + unsigned int _gl_verify_error_if_negative: W; + }. + If W is negative, this yields a compile-time error. No compiler can + deal with a bit-field of negative size. + + One might think that an array size check would have the same + effect, that is, that the type struct { unsigned int dummy[W]; } + would work as well. However, inside a function, some compilers + (such as C++ compilers and GNU C) allow local parameters and + variables inside array size expressions. With these compilers, + an array size check would not properly diagnose this misuse of + the verify macro: + + void function (int n) { verify (n < 0); } + + * For the verify macro, the struct _gl_verify_type will need to + somehow be embedded into a declaration. To be portable, this + declaration must declare an object, a constant, a function, or a + typedef name. If the declared entity uses the type directly, + such as in + + struct dummy {...}; + typedef struct {...} dummy; + extern struct {...} *dummy; + extern void dummy (struct {...} *); + extern struct {...} *dummy (void); + + two uses of the verify macro would yield colliding declarations + if the entity names are not disambiguated. A workaround is to + attach the current line number to the entity name: + + #define _GL_CONCAT0(x, y) x##y + #define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) + extern struct {...} * _GL_CONCAT (dummy, __LINE__); + + But this has the problem that two invocations of verify from + within the same macro would collide, since the __LINE__ value + would be the same for both invocations. (The GCC __COUNTER__ + macro solves this problem, but is not portable.) + + A solution is to use the sizeof operator. It yields a number, + getting rid of the identity of the type. Declarations like + + extern int dummy [sizeof (struct {...})]; + extern void dummy (int [sizeof (struct {...})]); + extern int (*dummy (void)) [sizeof (struct {...})]; + + can be repeated. + + * Should the implementation use a named struct or an unnamed struct? + Which of the following alternatives can be used? + + extern int dummy [sizeof (struct {...})]; + extern int dummy [sizeof (struct _gl_verify_type {...})]; + extern void dummy (int [sizeof (struct {...})]); + extern void dummy (int [sizeof (struct _gl_verify_type {...})]); + extern int (*dummy (void)) [sizeof (struct {...})]; + extern int (*dummy (void)) [sizeof (struct _gl_verify_type {...})]; + + In the second and sixth case, the struct type is exported to the + outer scope; two such declarations therefore collide. GCC warns + about the first, third, and fourth cases. So the only remaining + possibility is the fifth case: + + extern int (*dummy (void)) [sizeof (struct {...})]; + + * GCC warns about duplicate declarations of the dummy function if + -Wredundant-decls is used. GCC 4.3 and later have a builtin + __COUNTER__ macro that can let us generate unique identifiers for + each dummy function, to suppress this warning. + + * This implementation exploits the fact that older versions of GCC, + which do not support _Static_assert, also do not warn about the + last declaration mentioned above. + + * GCC warns if -Wnested-externs is enabled and verify() is used + within a function body; but inside a function, you can always + arrange to use verify_expr() instead. + + * In C++, any struct definition inside sizeof is invalid. + Use a template type to work around the problem. */ + +/* Concatenate two preprocessor tokens. */ +#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) +#define _GL_CONCAT0(x, y) x##y + +/* _GL_COUNTER is an integer, preferably one that changes each time we + use it. Use __COUNTER__ if it works, falling back on __LINE__ + otherwise. __LINE__ isn't perfect, but it's better than a + constant. */ +#if defined __COUNTER__ && __COUNTER__ != __COUNTER__ +# define _GL_COUNTER __COUNTER__ +#else +# define _GL_COUNTER __LINE__ +#endif + +/* Generate a symbol with the given prefix, making it unique if + possible. */ +#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER) + +/* Verify requirement R at compile-time, as an integer constant expression + that returns 1. If R is false, fail at compile-time, preferably + with a diagnostic that includes the string-literal DIAGNOSTIC. */ + +#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \ + (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) + +#ifdef __cplusplus +# if !GNULIB_defined_struct__gl_verify_type +template + struct _gl_verify_type { + unsigned int _gl_verify_error_if_negative: w; + }; +# define GNULIB_defined_struct__gl_verify_type 1 +# endif +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + _gl_verify_type<(R) ? 1 : -1> +#elif defined _GL_HAVE__STATIC_ASSERT +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + struct { \ + _Static_assert (R, DIAGNOSTIC); \ + int _gl_dummy; \ + } +#else +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; } +#endif + +/* Verify requirement R at compile-time, as a declaration without a + trailing ';'. If R is false, fail at compile-time, preferably + with a diagnostic that includes the string-literal DIAGNOSTIC. + + Unfortunately, unlike C11, this implementation must appear as an + ordinary declaration, and cannot appear inside struct { ... }. */ + +#ifdef _GL_HAVE__STATIC_ASSERT +# define _GL_VERIFY _Static_assert +#else +# define _GL_VERIFY(R, DIAGNOSTIC) \ + extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ + [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] +#endif + +/* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */ +#ifdef _GL_STATIC_ASSERT_H +# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert +# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC) +# endif +# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert +# define static_assert _Static_assert /* C11 requires this #define. */ +# endif +#endif + +/* @assert.h omit start@ */ + +/* Each of these macros verifies that its argument R is nonzero. To + be portable, R should be an integer constant expression. Unlike + assert (R), there is no run-time overhead. + + There are two macros, since no single macro can be used in all + contexts in C. verify_true (R) is for scalar contexts, including + integer constant expression contexts. verify (R) is for declaration + contexts, e.g., the top level. */ + +/* Verify requirement R at compile-time, as an integer constant expression. + Return 1. This is equivalent to verify_expr (R, 1). + + verify_true is obsolescent; please use verify_expr instead. */ + +#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") + +/* Verify requirement R at compile-time. Return the value of the + expression E. */ + +#define verify_expr(R, E) \ + (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E)) + +/* Verify requirement R at compile-time, as a declaration without a + trailing ';'. */ + +#define verify(R) _GL_VERIFY (R, "verify (" #R ")") + +#ifndef __has_builtin +# define __has_builtin(x) 0 +#endif + +/* Assume that R always holds. This lets the compiler optimize + accordingly. R should not have side-effects; it may or may not be + evaluated. Behavior is undefined if R is false. */ + +#if (__has_builtin (__builtin_unreachable) \ + || 4 < __GNUC__ + (5 <= __GNUC_MINOR__)) +# define assume(R) ((R) ? (void) 0 : __builtin_unreachable ()) +#elif 1200 <= _MSC_VER +# define assume(R) __assume (R) +#elif (defined lint \ + && (__has_builtin (__builtin_trap) \ + || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__)))) + /* Doing it this way helps various packages when configured with + --enable-gcc-warnings, which compiles with -Dlint. It's nicer + when 'assume' silences warnings even with older GCCs. */ +# define assume(R) ((R) ? (void) 0 : __builtin_trap ()) +#else +# define assume(R) ((void) (0 && (R))) +#endif + +/* @assert.h omit end@ */ + +#endif diff -Nru autogen-5.18.7/ChangeLog autogen-5.18.12/ChangeLog --- autogen-5.18.7/ChangeLog 2015-12-07 00:03:51.000000000 +0000 +++ autogen-5.18.12/ChangeLog 2016-08-29 21:35:22.000000000 +0000 @@ -1,546 +1,119 @@ -2015-11-18 Bruce Korb +2016-08-29 Bruce Korb - windows werdness + update news -2015-10-15 Bruce Korb + use "which" to locate local tools - fix spelling + cross platform support + * config/misc.def (PKG_CONFIG): use an environment parameter + to select the correct pkg-config program for cross platform build + * configure.ac.pre (XXexe): in a cross platform environment, do not + select build products for any build rules -2015-10-03 Bruce Korb +2016-07-31 Bruce Korb - reproducible build tweaks - all changes are configuration tweaks to adapt to HURD or - ensure consistency in tarball structure or setting a - man page date. + fix bootstrap + finish the scan_data_buf inline function. -2015-09-12 Bruce Korb + * add-on/char-mapper/char-mapper.c (scan_data_buf): include + all the arguments needed to work correctly. - set release date + * autoopts/nested.c (optionLoadNested): warning patrol -2015-08-25 Bruce Korb + * config/libopts.def: accept POSIX_SHELL from the environment + during the configure step - suppress autoconf chaff +2016-05-27 Bruce Korb - remove debug stuff + update news - tar up autogen-ed files for bootstrap - If the autogen program is not available, untar the needed files - from stashed away tarballs. +2016-05-27 Bruce Korb -2015-08-22 Bruce Korb + miscelleaneous cleanups + * agen5/ag-text.def (MK_GPERF_SCRIPT): augment CFLAGS with "-g" + LDFLAGS might depend upon CFLAGS content. - even more ignorance + * configure.ac.pre (GUILE_VERSION): that is an output C define, + not a script variable. Use $ag_gv instead. - move version extraction to after version burn + * agen5/autogen.c : fix warnings + * agen5/expOutput.c : fix warnings + * autoopts/putshell.c : fix warnings + * autoopts/save.c : fix warnings + * autoopts/time.c : fix warnings + * config/misc.def : fix warnings - use git-version-gen for version number +2016-05-26 Bruce Korb - doc some of the recent changes + more error.test fixes -2015-08-16 Bruce Korb +2016-05-24 Bruce Korb - accept specified bootstrap executables + another adjustment for abort() call -2015-08-10 Bruce Korb + another adjustment for abort() call - when creating mdoc/man pages, prefer using MAN_PAGE_DATE - to using the date command for the page footer date. + adjust for abort() call -2015-08-08 Bruce Korb +2016-05-24 Bruce Korb - Allow SOURCE_DATE to override using the date program - for stamping the date in man page type docs. + NUL terminate CGI def text + Usually (99.44% of the time), CGI text gets NUL teriminated. + However, sometimes not. Fix it. - add (max-file-time) scheme function + * agen5/autogen.c (ag_abend_at): call abort() + * agen5/agCgi.c (ENV_TABLE) reorder to make easier to debug + * agen5/cgi-fsm.c (cgi_run_fsm): add NUL byte on separation transition. - finish de-daemonization +2016-05-24 Bruce Korb -2015-08-08 Bruce Korb + NUL terminate CGI def text + Usually (99.44% of the time), CGI text gets NUL teriminated. + However, sometimes not. Fix it. - make "date" output a bit more consistent - specify LC_ALL=C for its usage. Plus some cleanups. + * agen5/autogen.c (ag_abend_at): call abort() + * agen5/agCgi.c (ENV_TABLE) reorder to make easier to debug + * agen5/cgi-fsm.c (cgi_run_fsm): add NUL byte on separation transition. - * agen5/funcFor.c(for_by_step): extract out loop limitations - * config/misc.def(timeout): new configure option - * configure.ac.pre: take configured option instead of using configure time +2016-05-23 Bruce Korb -2015-08-01 Bruce Korb + add a couple of static procs to fwd decs - still more ignorance + remove some Guile wrappers + Some parts of the Guile interface have stabilized in the currently + supported versions of Guile (1.8 and later). Remove several + wrappers for these functions. - missing file + TODO: add manywarnings gnulib module - add --enable-static-autogen config option - This will force autogen to be linked to libopts statically. - * config/misc.def (daemon): unused, remove - (static_autogen): added - * agen5/Makefile.am.pre: the derived name is AG_STATIC_AUTOGEN +2016-05-09 Bruce Korb - re-installed file + remove quotes for disabled options in man pages - copy fake Makefile.am into place - automake must run before we are ready to figure out what all - goes into it. So copy a temp one into place to keep it happy. +2016-04-20 Bruce Korb - remove derived files from repo + Fix mal-formed usage text + Option "values" beyond the range of single letters were supposed to + indicate that there was no flag character for the option. The + "IS_GRAPHIC_CHAR()" macro did not properly test for this. -2015-08-01 Bruce Korb + * agen5/agUtils.c (span_quote): remove unneeded braces + * autoopts/cook.c (nl_count): new function to clarify code + (contiguous_quote): clarify with new function + * autoopts/usage.c (GRAPH_CH): new macro for testing for graphic chars. + Will not stumble on values beyond 0xFF. - bootstrap is idempotent - Still wiggles source though: +2016-03-08 Bruce Korb - # Changes not staged for commit: - # (use "git add ..." to update what will be committed) - # (use "git checkout -- ..." to discard changes in working directory) - # - # modified: Makefile.am - # modified: NEWS - # modified: agen5/Makefile.am - # modified: autoopts/Makefile.am - # modified: configure.ac - # modified: getdefs/getdefs.c - # modified: pkg/Makefile.am + update the NEWS -2015-08-01 Bruce Korb + update the NEWS - Doc requirement for gnulib + Ensure testing vars are unset + The CGI variables CONTENT_LENGTH REQUEST_METHOD and QUERY_STRING + need to be unset before starting a test suite. - First cut at INSTALL and bootstrap - Thanks to Eric Raymond. + happy new year & de-uglifications - Terminological fix, comment only. - -2015-07-20 Bruce Korb - - do not segfault - Guile cannot always handle scm_backtrace, so just do not use it. - * agen5/autogen.c (done_check): omit scm_backtrace call - * agen5/test/error.test: trim off variable messages from error output - -2015-07-18 Bruce Korb - - simplify building char-mapper for linux - -2015-07-18 Bruce Korb - - Remove dead interfaces - Mostly Guile 1.6 stuff, but some cleaning of sprintf, too - - * agen5/ag-text.def: unused string removal - * agen5/agInit.c (DAEMON_ENABLED): it will never be enabled - * agen5/autogen.c (main): re-exec if LC_ALL is defined, not empty and not "C" - - * agen5/agDep.c (start_dep_file): memcpy vs. sprintf. - * agen5/expExtract.c: memcpy vs. sprintf - * agen5/loadPseudo.c: memcpy vs. sprintf - - * agen5/expFormat.c: Guile 1.6 re-removal - * agen5/expGuile.c: Guile 1.6 re-removal - * agen5/expOutput.c: Guile 1.6 re-removal - * agen5/expPrint.c: Guile 1.6 re-removal - * agen5/expState.c: Guile 1.6 re-removal - * agen5/expString.c: Guile 1.6 re-removal - * agen5/funcDef.c: Guile 1.6 re-removal - * agen5/funcEval.c: Guile 1.6 re-removal - * agen5/funcFor.c: Guile 1.6 re-removal - * agen5/funcIf.c: Guile 1.6 re-removal - * agen5/guile-iface.def: Guile 1.6 re-removal - * agen5/tpProcess.c: Guile 1.6 re-removal - - * autoopts/ao-strs.def: reordered, add a message - * autoopts/configfile.c: memcpy vs. sprintf - * autoopts/enum.c: snprintf vs. sprintf - * autoopts/load.c: memcpy vs. sprintf - * autoopts/putshell.c: assert for sprintf - * autoopts/save.c: memcpy vs. sprintf - * autoopts/time.c: snprintf vs. sprintf - - * autoopts/tpl/optmain.tlib: fix exit code - * autoopts/test/handler.test: adjustment - -2015-06-28 Bruce Korb - - Unwind the removal of Guile wrapper macros. - -2015-06-07 Bruce Korb - - stylistic fix in mdoc2man - -2015-05-31 Bruce Korb - - improve license file description - -2015-04-30 Bruce Korb - - correct library version bump - -2015-04-26 Bruce Korb - - libopts need rev bump, too - -2015-04-25 Bruce Korb - - update NEWS - - more Guile-config somersaults - * config/misc.def: sometimes, "pkg-config --cflags-only-I" yields - multiple directories for Guile and that incantation is the only - way to find libguile/version.h and that header is the only way - to determine the micro version and the micro version is the best - way to check for certain types of breakage. (Testing is too - convoluted.) - -2015-04-18 Bruce Korb - - remove Guile 1.6 support - Also, prep for release - -2015-04-17 Bruce Korb - - remove support for Guile 1.6. - * agen5/guile-iface.def: remove all pre-1.7 entries - * agen5/*: remove a mess of macros that are now invariant - -2015-04-14 Bruce Korb - - in for-each-file main's, allow calle to free file text - * autoopts/tpl/optmain.tlib (validate_fname): - if the file text is read in and passed to the handler function, - omit the "free(3)" call in the presence of a "handler-frees" - attribute. - * doc/autogen-texi.txt: update documentation - -2015-02-25 Bruce Korb - - Add warning messages to the option code - When "warn-code" is specified in the options definitions, - warning_msg() and vwarning_msg() will be added to the - generated code. Calling either will ensure (eventually) - a non-zero exit when exit(2) is ultimately called. - - fix size computation - Thanks to siddharthkabra. - The PAGE_USAGE_FMT uses "fname" twice, so the requirement size - must double the string length. - -2015-02-05 Bruce Korb - - fix guile directory - * autoopts/mk-tpl-config.sh (fix_guile): invoke the find_libguiledir - function with GUILE_CFLAGS as separate tokens. - - fix guile directory - * autoopts/mk-tpl-config.sh (fix_guile): invoke the find_libguiledir - function with GUILE_CFLAGS as separate tokens. - -2015-01-17 Bruce Korb - - bump vers - - ensure chars are unsigned when used as index. - * autoopts/makeshell.c (to_uchar): inline that converts char to unsigned - (UPPER): macro that converts any char type to lower case - (LOWER): likewise - (*elsewhere*): use these - -2015-01-04 Bruce Korb - - cright-update cleanup - Finish handling embedded copyright mark expressions. - Replace "nobase_data_DATA" with "pkgconfig_DATA". - Update some copyright marks. - -2015-01-01 Bruce Korb - - happy 2015 - - pointer usage cleanup - -2014-11-29 Bruce Korb - - bump minor version - -2014-11-29 Bruce Korb - - use libdatadir for finding templates - Now that it has been added, it is also useful to use it. - - * agen5/agInit.c (prep_env): add LIBDATADIR to end of search list - * autoopts/Makefile.am (install-data-hook): add DESTlibdatadir to - install-hook environment - * autoopts/install-hook.sh: copy tpl-config.tlib to this directory. - -2014-11-23 Bruce Korb - - Finish adding libdatadir to build. - tpl-config.tlib needs to be installed in a target plaatform directory. - Thus, we put it into nodist_libdata_DATA. - - * */Makefile.am: renameing of GUILE macros due to guile.m4 - * config/bootstrap.local: install pkg.m4, too - * config/misc.def: remove Guile macros in favor of guile.m4, but also - add code to compute the full Guile micro version. Not provided by Guile. - -2014-11-23 Bruce Korb - - add libdatadir to build. - tpl-config.tlib needs to be installed in a target plaatform directory. - Thus, we put it into nodist_libdata_DATA. This is phase 1. - - * autoopts/bootstrap.dir: do so - * autoopts/init.c: remove ao_ver_string - * autoopts/mk-tpl-config.sh: generate ao_ver_string - * autoopts/install-hook.sh: After sedding tpl-config.tlib in place, - copy it to $DESTlibdatadir - -2014-09-14 Bruce Korb - - licensing & DASH shell tweak - * agen5/test/format.test: export AUTOGEN_DNE_DATE explicitly. - DASH does not export when the assignment is on the same line - as a shell function invocation. - * autoopts/tpl/*.pl: document the licensing of the perl scripts. - -2014-09-01 Bruce Korb - - put man page sections in SEC subdirectory - Some platforms to no support in-memory file io. These use the $tmp_dir - directory to stash temp files. The "cmd-doc.tlib" template assumes - that all files in that directory are man page sections. Oops. - - * autoopts/tpl/cmd-doc.tlib: rework to avoid this - * other files: strictly cleanup - -2014-08-30 Bruce Korb - - set release version - -2014-08-24 Bruce Korb - - remove unused strings - * agen5/ag-text.def: many of the strings are no longer used. - Also, in the shell initialization, ensure "set +o verbose" - has been processed. - * agen5/agUtils.c (fswarn): new, for when fs errors are not fatal. - * agen5/defDirect.c (file_size): use it - (doDir_include): use it - * agen5/expExtract.c (load_file): if fstat(3) fails, return errno - * agen5/funcEval.c (emit_insertion_file): use load_file() - * autoopts/tpl/cmd-doc.tlib: use new functionality - -2014-08-23 Bruce Korb - - add insert-file function - Sometimes, it is just easier to insert the contents of a file - than to go through "shell" and "cat" it into the output. - - * agen5/ag-text.def (LD_EXTRACT_BAD_READ): no longer used - * agen5/agUtils.c (open_trace_file): use "fserr" call instead of AG_ABEND - * agen5/expExtract.c (load_file): likewise - * agen5/funcEval.c (ag_scm_insert_file): new function to implement - - plus documentation and testing changes to support this. - -2014-08-22 Bruce Korb - - warn about using "test-main" - - minor tweaks - -2014-08-16 Bruce Korb - - tweak NEWS - - fix return macro, add warn function - * agen5/ag-text.def (WARN_FMT): for "warn" function - * agen5/expFormat.c (ag_scm_warn): implementation - * agen5/autogen.h (for_state_t): added fields to support RETURN - * agen5/funcFor.c (for_by_step): adjust for new context fields - (for_each): likewise - (free_for_context): rewritten to handle this stuff - * agen5/test/return.test: new test - -2014-08-15 Bruce Korb - - add documentation and testing - It is useful for folks to know how to use AUTOGEN_DNE_DATE. - -2014-08-14 Bruce Korb - - dne - Do Not Edit and AUTOGEN_DNE_DATE - This Scheme function has "traditionally" included a date and time stamp - in the resulting output and that could be suppressed by providing it a - "-d" option. Due to very reasonable complaints, the new default is to - not include the date and require a "-D" option to - enable dates. However, even that is not completely satisfactory. - The user of the template needs a way to select - behavior. Enter the newly recognized environment variable: - AUTOGEN_DNE_DATE If set, it will override any "-D" option in - the template. If set to the empty string or a string with the first - character being one of 0nNfF (zero or the first letter of - "false" or "no"), then the date will not be emitted. Otherwise, the - presence of this environment variable will cause the date to be emitted. - -2014-08-09 Bruce Korb - - Clarify start/end of AutoGen tracing - It is sometimes hard to match them up during a nested run - - * agen5/ag-text.def: mark the start and end of tracing more clearly - * agen5/agUtils.c (open_trace_file): local function - (check_make_dep_env): likewise - (count_nl): move to defLex.c -- the only place used - (skip_expr) DeCamelization - * agen5/defLex.c (count_nl): new - * agen5/test/debug.test: adjust for new start/end markers - * doc/Makefile.am: run_mktexi needs to specify the source directory - -2014-08-08 Bruce Korb - - remove timestamp from dne, add option to include it - Recording the timestamp in generated files creates unnecessary noise as - files that haven't really changed at all will show up as different when - comparing builds, which is something downstream distributions would like - to do. - - default to not adding date and version information (old behaviour when - '-d' was passed) and add a new option '-D' that restores the timestamp, - in case anyone desperately needs it. - -2014-08-08 Bruce Korb - - give credit where credit is due - All the documentation scripts + cleanup of the - libopts source library Makefile.am file. - - * THANKS: add Harlan Stenn - * autoopts/tpl/*.pl: Credit Harlan Stenn - * pkg/libopts/mklibsrc.sh: clean up Makefile.am output - -2014-07-07 Bruce Korb - - fix failures - From Andreas Schwab - -2014-07-06 Bruce Korb - - build stdnoreturn.h in tear-off lib - Pull in the gnulib stdnoreturn module. - - Modified files: - - * autoopts/version.c (optionPrintVersionAndReturn): export it - * config/bootstrap.local: stash the relevant makefile hackery - and _Noreturn.h header data - * config/libopts.def: invoke gl_STDNORETURN_H - * config/misc.def: do not invoke it twice - * pkg/libopts/mklibsrc.sh: incorporate stdnoreturn.in.h and - _Noterurn.h stuff in the library source. - -2014-07-05 Bruce Korb - - fix GFDL license - * pkg/gnudir.tpl: no need for 3 withs - -2014-07-02 Bruce Korb - - man page cleanup - Very noticable improvements to generated man pages - - Modified files: - - * autoopts/bootstrap.dir - * autoopts/mk-tpl-config.sh - * autoopts/tpl/Mdoc.pm - * autoopts/tpl/agman-cmd.tpl - * autoopts/tpl/agmdoc-cmd.tpl - * autoopts/tpl/cmd-doc.tlib - * autoopts/tpl/mdoc2man.pl - * autoopts/tpl/mdoc2man.sh - * autoopts/tpl/mdoc2texi.pl - -2014-07-01 Bruce Korb - - Fix up Guile fix up script - Guile both misuses the token "noreturn" in its headers - and rearranged its headers between releases. It is tricky - to fix up headers in different places and not fix headers - that finally got fixed - - * autoopts/mk-tpl-config.sh (find_libguiledir): - look for libguile.h in a specific order to maximize - the chances of finding the correct directory. - -2014-06-28 Bruce Korb - - facilitate version procs - In order to use the default version code and augment it, - there is now a version of optionPrintVersion that returns. - - Hex numbers in definition files need not be quoted any more. - - * agen5/defLex.c (gather_name): accept hex numbers - - * agen5/test/define.test: test it - - * autoopts/version.c (optionPrintVersionAndReturn): new - - * doc/autogen-texi.txt: augment getopt.tpl doc - -2014-06-15 Bruce Korb - - fix format-arg macro - "argc" is not defined in the test program. - -2014-05-17 Bruce Korb - - release version - -2014-05-10 Bruce Korb - - add delays to kill signals - It seems that on some platforms, if signals arrive too quickly, - the process winds up hanging instead of dying. Therefore, in - the shell die() function, wait a second between signals. - - * agen5/ag-text.def (SHELL_INIT_STR): wait one second after - the SIGTERM, SIGINT and SIGHUP signals. Afterwards, send - a SIGKILL signal. - - * autoopts/mk-tpl-config.sh (fix_guile): this function runs - under "set -e", so do not fail-exit if grep does not find - the "noreturn" word. - -2014-05-03 Bruce Korb - - clean up "noreturn" - This is a more rigorous fix for the libguile usage of the "noreturn" - token. It must *always* run, so it is folded into the - mk-tpl-config.sh script. - - fix month - -2014-04-19 Bruce Korb - - final release tweaks - -2014-04-13 Bruce Korb - - ATTRIBUTE_FORMAT_ARG is now used - The gettext() wrapper function needs to be markable as: - __attribute__((format_arg(1))) - but since not all compilers accept it, we wrap it. - - Also, a new template for handling perl program options is added. - -2014-03-29 Bruce Korb - - argument to aoGetsText() is type "format" - The aoGetsText() emitted i18n helper function needs its argument - to have the "format_arg" attribute. - -2014-03-23 Bruce Korb - - Only apply texi2mdoc when it is needed. - Several adjustments to tests, too. Also, update cright updater flags. + formatting changes diff -Nru autogen-5.18.7/columns/Makefile.in autogen-5.18.12/columns/Makefile.in --- autogen-5.18.7/columns/Makefile.in 2015-12-07 00:04:13.000000000 +0000 +++ autogen-5.18.12/columns/Makefile.in 2016-08-29 21:35:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,8 +91,6 @@ target_triplet = @target@ bin_PROGRAMS = columns$(EXEEXT) subdir = columns -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -99,6 +107,7 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_VPATH_FILES = @@ -202,6 +211,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AGEN5_TESTS = @AGEN5_TESTS@ @@ -398,7 +408,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu columns/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu columns/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -761,6 +770,8 @@ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-man uninstall-man1 +.PRECIOUS: Makefile + gen : $(BUILT_SOURCES) diff -Nru autogen-5.18.7/compat/Makefile.in autogen-5.18.12/compat/Makefile.in --- autogen-5.18.7/compat/Makefile.in 2015-12-07 00:04:13.000000000 +0000 +++ autogen-5.18.12/compat/Makefile.in 2016-08-29 21:35:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,7 +89,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = compat -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -96,6 +105,7 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -120,6 +130,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AGEN5_TESTS = @AGEN5_TESTS@ @@ -306,7 +317,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu compat/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu compat/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -482,6 +492,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + all: : diff -Nru autogen-5.18.7/compat/strsignal.h autogen-5.18.12/compat/strsignal.h --- autogen-5.18.7/compat/strsignal.h 2015-12-07 00:04:19.000000000 +0000 +++ autogen-5.18.12/compat/strsignal.h 2016-08-29 21:35:47.000000000 +0000 @@ -6,7 +6,7 @@ * From the definitions strsignal.def * and the template file strsignal * - * Generated for a 3.11.10-29-desktop Linux platform + * Generated for a 4.1.27-27-default Linux platform * * strsignal Copyright (C) 1992-2014 by Bruce Korb - all rights reserved * diff -Nru autogen-5.18.7/config/bootstrap autogen-5.18.12/config/bootstrap --- autogen-5.18.7/config/bootstrap 2015-08-25 22:54:35.000000000 +0000 +++ autogen-5.18.12/config/bootstrap 2016-03-08 17:00:36.000000000 +0000 @@ -121,8 +121,9 @@ pre_local() { - BOOTSTRAP=pre + BOOTSTRAP=pre REQUEST_METHOD= export BOOTSTRAP + unset REQUEST_METHOD source_bs pbs ${conf_dir}/bootstrap.local pre source_bs aobs autoopts/bootstrap.dir aoconf } diff -Nru autogen-5.18.7/config/compile autogen-5.18.12/config/compile --- autogen-5.18.7/config/compile 2013-12-31 19:36:18.000000000 +0000 +++ autogen-5.18.12/config/compile 2016-05-10 21:58:32.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff -Nru autogen-5.18.7/config/config.guess autogen-5.18.12/config/config.guess --- autogen-5.18.7/config/config.guess 2013-12-31 19:36:18.000000000 +0000 +++ autogen-5.18.12/config/config.guess 2016-05-10 21:58:32.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-11-29' +timestamp='2014-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -579,8 +579,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -826,7 +827,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +970,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1371,154 +1372,6 @@ exit ;; esac -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <, 1996 # diff -Nru autogen-5.18.7/config/config.sub autogen-5.18.12/config/config.sub --- autogen-5.18.7/config/config.sub 2013-12-31 19:36:18.000000000 +0000 +++ autogen-5.18.12/config/config.sub 2016-05-10 21:58:32.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-10-01' +timestamp='2014-12-03' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -68,7 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -283,8 +283,10 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -296,11 +298,11 @@ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -311,6 +313,7 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -325,6 +328,9 @@ c6x) basic_machine=tic6x-unknown ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -402,8 +408,10 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -415,6 +423,7 @@ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -432,6 +441,7 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -769,6 +779,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -824,6 +837,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1369,14 +1386,14 @@ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1594,9 +1611,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff -Nru autogen-5.18.7/config/depcomp autogen-5.18.12/config/depcomp --- autogen-5.18.7/config/depcomp 2013-12-31 19:36:18.000000000 +0000 +++ autogen-5.18.12/config/depcomp 2016-05-10 21:58:32.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru autogen-5.18.7/config/extensions.m4 autogen-5.18.12/config/extensions.m4 --- autogen-5.18.7/config/extensions.m4 2015-01-01 22:51:34.000000000 +0000 +++ autogen-5.18.12/config/extensions.m4 2016-03-05 16:59:21.000000000 +0000 @@ -1,7 +1,7 @@ # serial 13 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2015 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2016 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -Nru autogen-5.18.7/config/gendocs.sh autogen-5.18.12/config/gendocs.sh --- autogen-5.18.7/config/gendocs.sh 2015-05-22 16:24:22.000000000 +0000 +++ autogen-5.18.12/config/gendocs.sh 2016-03-05 16:59:21.000000000 +0000 @@ -2,9 +2,9 @@ # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -scriptversion=2015-05-05.16 +scriptversion=2016-01-01.00 -# Copyright 2003-2015 Free Software Foundation, Inc. +# Copyright 2003-2016 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -54,7 +54,7 @@ version="gendocs.sh $scriptversion -Copyright 2015 Free Software Foundation, Inc. +Copyright 2016 Free Software Foundation, Inc. There is NO warranty. You may redistribute this software under the terms of the GNU General Public License. For more information about these matters, see the files named COPYING." diff -Nru autogen-5.18.7/config/gnulib-cache.m4 autogen-5.18.12/config/gnulib-cache.m4 --- autogen-5.18.7/config/gnulib-cache.m4 2015-12-07 00:03:50.000000000 +0000 +++ autogen-5.18.12/config/gnulib-cache.m4 2016-08-29 21:35:21.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 2002-2016 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --local-dir=tmp --lib=do_not_make_me --source-base=autoopts --m4-base=config --doc-base=doc --tests-base=tests --aux-dir=config --lgpl=2 --makefile-name=gnulib.mk --no-conditional-dependencies --libtool --macro-prefix=gl extensions gendocs gettext-h parse-duration stdnoreturn +# gnulib-tool --import --local-dir=tmp --lib=do_not_make_me --source-base=autoopts --m4-base=config --doc-base=doc --tests-base=tests --aux-dir=config --lgpl=2 --makefile-name=gnulib.mk --no-conditional-dependencies --libtool --macro-prefix=gl extensions gendocs gettext-h parse-duration stdnoreturn # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([tmp]) diff -Nru autogen-5.18.7/config/gnulib-comp.m4 autogen-5.18.12/config/gnulib-comp.m4 --- autogen-5.18.7/config/gnulib-comp.m4 2015-12-07 00:03:50.000000000 +0000 +++ autogen-5.18.12/config/gnulib-comp.m4 2016-08-29 21:35:21.000000000 +0000 @@ -1,5 +1,5 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2015 Free Software Foundation, Inc. +# Copyright (C) 2002-2016 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -49,6 +49,7 @@ # Code from module parse-duration: # Code from module snippet/_Noreturn: # Code from module stdnoreturn: + # Code from module verify: ]) # This macro should be invoked from ./configure.ac, in the section @@ -213,6 +214,7 @@ lib/parse-duration.c lib/parse-duration.h lib/stdnoreturn.in.h + lib/verify.h m4/00gnulib.m4 m4/extensions.m4 m4/gnulib-common.m4 diff -Nru autogen-5.18.7/config/install-sh autogen-5.18.12/config/install-sh --- autogen-5.18.7/config/install-sh 2013-12-31 19:36:18.000000000 +0000 +++ autogen-5.18.12/config/install-sh 2016-05-10 21:58:32.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff -Nru autogen-5.18.7/config/lib-link.m4 autogen-5.18.12/config/lib-link.m4 --- autogen-5.18.7/config/lib-link.m4 2015-12-07 00:03:50.000000000 +0000 +++ autogen-5.18.12/config/lib-link.m4 2016-08-29 21:35:22.000000000 +0000 @@ -1,5 +1,5 @@ # lib-link.m4 serial 26 (gettext-0.18.2) -dnl Copyright (C) 2001-2015 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2016 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff -Nru autogen-5.18.7/config/libopts.def autogen-5.18.12/config/libopts.def --- autogen-5.18.7/config/libopts.def 2015-08-25 17:31:50.000000000 +0000 +++ autogen-5.18.12/config/libopts.def 2016-07-21 15:22:52.000000000 +0000 @@ -356,6 +356,7 @@ AC_PROG_SED [while : do + test -x "$POSIX_SHELL" && break POSIX_SHELL=`which bash` test -x "$POSIX_SHELL" && break POSIX_SHELL=`which dash` diff -Nru autogen-5.18.7/config/libtool.m4 autogen-5.18.12/config/libtool.m4 --- autogen-5.18.7/config/libtool.m4 2013-09-27 15:26:15.000000000 +0000 +++ autogen-5.18.12/config/libtool.m4 2015-10-25 07:54:06.000000000 +0000 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1326,7 +1326,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1348,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -Nru autogen-5.18.7/config/misc.def autogen-5.18.12/config/misc.def --- autogen-5.18.7/config/misc.def 2015-09-28 04:45:49.000000000 +0000 +++ autogen-5.18.12/config/misc.def 2016-08-29 17:26:13.000000000 +0000 @@ -340,7 +340,12 @@ do-always = <<- _END_ALWAYS_ GUILE_FLAGS - [ag_gv=`gdir=\`pkg-config --cflags-only-I \ + [test -x "${PKG_CONFIG}" || { + test -z "${PKG_CONFIG}" && PKG_CONFIG=pkg-config + f=`command -v ${PKG_CONFIG}` + test -x "${f}" && PKG_CONFIG="$f" + } + ag_gv=`gdir=\`${PKG_CONFIG} --cflags-only-I \ guile-${GUILE_EFFECTIVE_VERSION} | \ sed 's/-I *//;s/ *-I.*/ /g'\` test -z "$gdir" && gdir=/usr/include @@ -360,8 +365,7 @@ [define to a single number for Guile version]) INVOKE_LIBOPTS_MACROS - [echo 'test "X${ac_cv_header_sys_wait_h}" = Xyes' 1>&2 - test "X${ac_cv_header_sys_wait_h}" = Xyes || \ + [test "X${ac_cv_header_sys_wait_h}" = Xyes || \ ]AC_MSG_ERROR([you must have sys/wait.h on your system]) AC_CHECK_FUNCS([fopencookie funopen], [break]) diff -Nru autogen-5.18.7/config/missing autogen-5.18.12/config/missing --- autogen-5.18.7/config/missing 2013-12-31 19:36:18.000000000 +0000 +++ autogen-5.18.12/config/missing 2016-05-10 21:58:32.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru autogen-5.18.7/config/onceonly.m4 autogen-5.18.12/config/onceonly.m4 --- autogen-5.18.7/config/onceonly.m4 2015-01-01 22:51:34.000000000 +0000 +++ autogen-5.18.12/config/onceonly.m4 2016-03-05 16:59:21.000000000 +0000 @@ -1,5 +1,5 @@ # onceonly.m4 serial 9 -dnl Copyright (C) 2002-2003, 2005-2006, 2008-2015 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2008-2016 Free Software Foundation, dnl Inc. dnl dnl This file is free software; you can redistribute it and/or modify diff -Nru autogen-5.18.7/config/stdnoreturn.m4 autogen-5.18.12/config/stdnoreturn.m4 --- autogen-5.18.7/config/stdnoreturn.m4 2015-01-01 22:51:34.000000000 +0000 +++ autogen-5.18.12/config/stdnoreturn.m4 2016-03-05 16:59:21.000000000 +0000 @@ -1,6 +1,6 @@ # Check for stdnoreturn.h that conforms to C11. -dnl Copyright 2012-2015 Free Software Foundation, Inc. +dnl Copyright 2012-2016 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff -Nru autogen-5.18.7/config/test-driver autogen-5.18.12/config/test-driver --- autogen-5.18.7/config/test-driver 2013-12-31 19:36:18.000000000 +0000 +++ autogen-5.18.12/config/test-driver 2016-05-10 21:58:32.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -106,11 +106,14 @@ # Test script is run here. "$@" >$log_file 2>&1 estatus=$? + if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -119,6 +122,12 @@ *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name" diff -Nru autogen-5.18.7/configure autogen-5.18.12/configure --- autogen-5.18.7/configure 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/configure 2016-08-29 21:35:43.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU AutoGen 5.18.7. +# Generated by GNU Autoconf 2.69 for GNU AutoGen 5.18.12. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='GNU AutoGen' PACKAGE_TARNAME='autogen' -PACKAGE_VERSION='5.18.7' -PACKAGE_STRING='GNU AutoGen 5.18.7' +PACKAGE_VERSION='5.18.12' +PACKAGE_STRING='GNU AutoGen 5.18.12' PACKAGE_BUGREPORT='autogen-users@lists.sourceforge.net' PACKAGE_URL='http://www.gnu.org/software/autogen/' @@ -1397,7 +1397,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU AutoGen 5.18.7 to adapt to many kinds of systems. +\`configure' configures GNU AutoGen 5.18.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1468,7 +1468,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU AutoGen 5.18.7:";; + short | recursive ) echo "Configuration of GNU AutoGen 5.18.12:";; esac cat <<\_ACEOF @@ -1604,7 +1604,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU AutoGen configure 5.18.7 +GNU AutoGen configure 5.18.12 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2256,7 +2256,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU AutoGen $as_me 5.18.7, which was +It was created by GNU AutoGen $as_me 5.18.12, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2748,7 +2748,7 @@ d=`dirname $0` ag_top_srcdir=`cd $d && pwd` ag_top_builddir=`pwd` -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2920,8 +2920,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2940,7 +2940,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -3234,7 +3234,7 @@ # Define the identity of the package. PACKAGE='autogen' - VERSION='5.18.7' + VERSION='5.18.12' cat >>confdefs.h <<_ACEOF @@ -3268,8 +3268,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -3326,6 +3326,7 @@ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -7385,7 +7386,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -7403,7 +7404,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7422,7 +7426,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -17739,9 +17746,16 @@ AGnam=autogen${ac_exeext} GDnam=getdefs${ac_exeext} CLnam=columns${ac_exeext} -AGexe=${ag_top_builddir}/agen5/${AGnam} -GDexe=${ag_top_builddir}/getdefs/${GDnam} -CLexe=${ag_top_builddir}/columns/${CLnam} +if test "X$cross_compiling" = Xyes +then + AGexe=`which ${AGnam}` + GDexe=`which ${GDnam}` + CLexe=`which ${CLnam}` +else + AGexe=${ag_top_builddir}/agen5/${AGnam} + GDexe=${ag_top_builddir}/getdefs/${GDnam} + CLexe=${ag_top_builddir}/columns/${CLnam} +fi M4_SRC=`cd $srcdir/config ; echo [a-z]*.m4` ENABLE_STATIC=${enable_static} config_end_time=`date +%s 2>/dev/null` @@ -17783,7 +17797,7 @@ INCLIST="${INCLIST} -I\${top_builddir}/autoopts -I\${top_srcdir}/autoopts" fi -test ${GUILE_VERSION} -ge 108000 \ +test ${ag_gv} -ge 108000 \ -a "X${WERROR}" = Xyes \ -a "X${GCC}" = Xyes && \ CFLAGS=`echo $CFLAGS -Wall -Werror -Wcast-align -Wmissing-prototypes \ @@ -18382,7 +18396,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU AutoGen $as_me 5.18.7, which was +This file was extended by GNU AutoGen $as_me 5.18.12, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18450,7 +18464,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU AutoGen config.status 5.18.7 +GNU AutoGen config.status 5.18.12 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru autogen-5.18.7/configure.ac autogen-5.18.12/configure.ac --- autogen-5.18.7/configure.ac 2015-12-07 00:03:48.000000000 +0000 +++ autogen-5.18.12/configure.ac 2016-08-29 21:35:19.000000000 +0000 @@ -19,7 +19,7 @@ dnl You should have received a copy of the GNU General Public License along dnl with this program. If not, see . dnl -AC_INIT([GNU AutoGen],[5.18.7],[autogen-users@lists.sourceforge.net]) +AC_INIT([GNU AutoGen],[5.18.12],[autogen-users@lists.sourceforge.net]) AC_CONFIG_SRCDIR([agen5/autogen.c]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET @@ -167,9 +167,16 @@ AGnam=autogen${ac_exeext} GDnam=getdefs${ac_exeext} CLnam=columns${ac_exeext} -AGexe=${ag_top_builddir}/agen5/${AGnam} -GDexe=${ag_top_builddir}/getdefs/${GDnam} -CLexe=${ag_top_builddir}/columns/${CLnam} +if test "X$cross_compiling" = Xyes +then + AGexe=`which ${AGnam}` + GDexe=`which ${GDnam}` + CLexe=`which ${CLnam}` +else + AGexe=${ag_top_builddir}/agen5/${AGnam} + GDexe=${ag_top_builddir}/getdefs/${GDnam} + CLexe=${ag_top_builddir}/columns/${CLnam} +fi M4_SRC=`cd $srcdir/config ; echo [a-z]*.m4` ENABLE_STATIC=${enable_static} config_end_time=`date +%s 2>/dev/null` @@ -208,7 +215,7 @@ INCLIST="${INCLIST} -I\${top_builddir}/autoopts -I\${top_srcdir}/autoopts" fi ]AC_SUBST(INCLIST)[ -test ${GUILE_VERSION} -ge 108000 \ +test ${ag_gv} -ge 108000 \ -a "X${WERROR}" = Xyes \ -a "X${GCC}" = Xyes && \ CFLAGS=`echo $CFLAGS -Wall -Werror -Wcast-align -Wmissing-prototypes \ diff -Nru autogen-5.18.7/debian/autogen.lintian-overrides autogen-5.18.12/debian/autogen.lintian-overrides --- autogen-5.18.7/debian/autogen.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ autogen-5.18.12/debian/autogen.lintian-overrides 2018-01-06 15:07:28.000000000 +0000 @@ -0,0 +1,7 @@ +autogen binary: spelling-error-in-readme-debian file file (duplicate word) file +autogen binary: spelling-error-in-readme-debian many many (duplicate word) many +autogen binary: spelling-error-in-readme-debian no no (duplicate word) no +autogen binary: spelling-error-in-readme-debian none none (duplicate word) none +autogen binary: spelling-error-in-readme-debian parser parser (duplicate word) parser +autogen binary: spelling-error-in-readme-debian struct struct (duplicate word) struct +autogen binary: spelling-error-in-readme-debian yes yes (duplicate word) yes diff -Nru autogen-5.18.7/debian/changelog autogen-5.18.12/debian/changelog --- autogen-5.18.7/debian/changelog 2016-01-10 13:27:35.000000000 +0000 +++ autogen-5.18.12/debian/changelog 2020-01-11 00:03:12.000000000 +0000 @@ -1,3 +1,86 @@ +autogen (1:5.18.12-4~16.04.sav0) xenial; urgency=medium + + * Backport to Xenial + + -- Rob Savoury Fri, 10 Jan 2020 16:03:12 -0800 + +autogen (1:5.18.12-4) unstable; urgency=medium + + * Repository moved to salsa. + * [lintian] Drop trailing whitespace in debian/changelog. + * Use dh compat v10. + * Use dh_missing --fail-missing instead of dh_install --fail-missing. + * Point homepage and download location (including watch file) to https URL. + * [lintian] Stop invoking dpkg-parsechangelog in debian/rules, use + /usr/share/dpkg/pkg-info.mk. + * Add lintian override for duplicate words in README.Debian. + + -- Andreas Metzler Sat, 06 Jan 2018 16:07:28 +0100 + +autogen (1:5.18.12-3) unstable; urgency=medium + + * Add ${perl:Depends} to autogen's Depends. (Thanks, Paul Hardy!) + + -- Andreas Metzler Sun, 30 Oct 2016 13:24:25 +0100 + +autogen (1:5.18.12-2) unstable; urgency=medium + + * Upload to unstable. + + -- Andreas Metzler Sat, 17 Sep 2016 16:33:27 +0200 + +autogen (1:5.18.12-1) experimental; urgency=medium + + * New upstream version. + + Drop 04_crossbuild.diff and 21_test.error.diff. + + Drop config/misc.def part of 05_cross_pkg_config.diff. + + -- Andreas Metzler Sat, 03 Sep 2016 14:46:08 +0200 + +autogen (1:5.18.10-4) unstable; urgency=medium + + * Upload to unstable. + + -- Andreas Metzler Sat, 06 Aug 2016 13:04:34 +0200 + +autogen (1:5.18.10-3) experimental; urgency=low + + [ Helmut Grohne ] + * Fix FTCBFS. Closes: #833171 + + Invoke the triplet prefixed pkg-config. + + Always assume that the libc comes with a working libregex as autogen + doesn't work at all without it. + + -- Andreas Metzler Thu, 04 Aug 2016 19:24:27 +0200 + +autogen (1:5.18.10-2) unstable; urgency=low + + * Upload to unstable. + + -- Andreas Metzler Sun, 17 Jul 2016 13:19:19 +0200 + +autogen (1:5.18.10-1) experimental; urgency=medium + + * New upstream version, also pull 21_test.error.diff from upstream GIT. - + Should fix testsuite error on mips/armhf. + + Drop 20_remove-quotes-for-disabled-options-in-man-pages.patch. + * Point watchfile to rel([\d\.]+)/ subdirectory again. + + -- Andreas Metzler Sat, 28 May 2016 07:47:14 +0200 + +autogen (1:5.18.9-1) experimental; urgency=medium + + * New upstream version. + * Set DEB_BUILD_MAINT_OPTIONS := hardening=+all. + * Update upstream signing key, store ascii-armored copy in + debian/upstream/signing-key.asc instead of a binary copy (with mention in + debian/source/include-binaries) in debian/upstream-signing-key.pgp. + * Pull 20_remove-quotes-for-disabled-options-in-man-pages.patch from + upstream GIT to fix broken formatting in autogen-erated manpages. + Closes: #817859 + + -- Andreas Metzler Sun, 22 May 2016 18:17:34 +0200 + autogen (1:5.18.7-3) unstable; urgency=medium [ Helmut Grohne ] @@ -145,7 +228,7 @@ * New upstream version. + Drop 10_handle_grep_error.diff. + Autogen does not include timestamp in generated files anymore. - Closes: #762030 + Closes: #762030 * 10_licensing.diff from upstream GIT: Add missing licensing headers. * Update debian/copyright, fix DEP-5 format errors. * 11_fix_testsuite.error.diff fix testsuite error on dash. @@ -272,7 +355,7 @@ autogen (1:5.18-2) unstable; urgency=low * Upload to unstable. (The autobuilders did not try, but manual builds on - armel/mips/mipsel succeeded.) + armel/mips/mipsel succeeded.) -- Andreas Metzler Mon, 22 Jul 2013 07:56:42 +0200 @@ -909,7 +992,7 @@ autogen (1:5.5.5-2) unstable; urgency=low - * fix override disparity + * fix override disparity -- Luca Filipozzi Sat, 14 Jun 2003 10:42:21 -0700 @@ -927,7 +1010,7 @@ autogen (1:5.5.3-2) unstable; urgency=low - * fix override disparity + * fix override disparity -- Luca Filipozzi Sun, 16 Mar 2003 21:47:08 -0800 @@ -1054,7 +1137,7 @@ autogen (5.2.10-3) unstable; urgency=low - * created debian/autogen.info (Closes: Bug#117674) + * created debian/autogen.info (Closes: Bug#117674) -- Luca Filipozzi Mon, 5 Nov 2001 18:08:13 -0800 @@ -1091,7 +1174,7 @@ autogen (5.2.7-2) unstable; urgency=low * build-depend on tetex-bin and libguile9-dev (vice libguile6-dev) - (closes:bug#107267,bug#107280,bug#107592) + (closes:bug#107267,bug#107280,bug#107592) -- James R. Van Zandt Sat, 4 Aug 2001 18:30:29 -0400 @@ -1100,7 +1183,7 @@ * New upstream release (closes:bug#99470,bug#100599) * debian/control: move Build-Depends line to source section (closes:bug#104303), update to policy version 3.2.1, rename libopts3 - to libopts9. + to libopts9. * debian/control: build-depends on texinfo * debian/rules: honor DEB_BUILD_OPTIONS. Install .info files. * README.example, checkopt.def: update per example in autoopt.texi file @@ -1144,7 +1227,7 @@ * in copyright file, don't refer to former directory * upload everything, since the package unaccountably disappeared from unstable (closes:Bug#60308) - + -- James R. Van Zandt Sat, 4 Mar 2000 09:26:38 -0500 autogen (4.5.11-1) unstable; urgency=low diff -Nru autogen-5.18.7/debian/compat autogen-5.18.12/debian/compat --- autogen-5.18.7/debian/compat 2015-12-08 07:09:59.000000000 +0000 +++ autogen-5.18.12/debian/compat 2018-01-06 12:36:01.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru autogen-5.18.7/debian/control autogen-5.18.12/debian/control --- autogen-5.18.7/debian/control 2016-01-10 13:14:21.000000000 +0000 +++ autogen-5.18.12/debian/control 2018-01-06 13:04:34.000000000 +0000 @@ -2,10 +2,7 @@ Section: devel Priority: optional Maintainer: Andreas Metzler -Build-Depends: autotools-dev, - debhelper (>= 9.20141010), - dh-autoreconf, - dpkg-dev (>= 1.17.14), +Build-Depends: debhelper (>= 10), gperf, guile-2.0-dev (>= 2.0.11+1-0), libxml2-dev, @@ -13,15 +10,15 @@ tar (>= 1.28), autogen Build-Depends-Indep: texinfo, texlive, cm-super-minimal -Standards-Version: 3.9.6 -Homepage: http://www.gnu.org/software/autogen/ +Standards-Version: 4.1.3 +Homepage: https://www.gnu.org/software/autogen/ Vcs-Git: https://anonscm.debian.org/git/collab-maint/autogen.git Vcs-Browser: https://anonscm.debian.org/git/collab-maint/autogen.git Package: autogen Architecture: any Depends: ${shlibs:Depends}, libopts25-dev (= ${binary:Version}), - ${misc:Depends} + ${misc:Depends}, ${perl:Depends} Recommends: autogen-doc Multi-Arch: foreign Description: automated text file generator diff -Nru autogen-5.18.7/debian/copyright autogen-5.18.12/debian/copyright --- autogen-5.18.7/debian/copyright 2015-12-08 07:09:59.000000000 +0000 +++ autogen-5.18.12/debian/copyright 2018-01-06 12:58:38.000000000 +0000 @@ -1,10 +1,10 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: AutoGen Upstream-Contact: Bruce Korb -Source: ftp://ftp.gnu.org/gnu/autogen/ +Source: https://ftp.gnu.org/gnu/autogen/ Files: * -Copyright: (C) 1992-2015 by Bruce Korb +Copyright: (C) 1992-2016 by Bruce Korb License: GPL-3+ AutoGen is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -17,7 +17,7 @@ details. Files: autoopts/* -Copyright: (C) 1992-2015 by Bruce Korb +Copyright: (C) 1992-2016 by Bruce Korb License: LGPL-3+ or Modified_BSD AutoOpts is available under any one of two licenses. The license in use must be one of these two and the choice is under the control of the user of @@ -50,7 +50,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: autoopts/stdnoreturn.in.h -Copyright: Copyright 2012-2013 Free Software Foundation, Inc. +Copyright: Copyright 2012-2016 Free Software Foundation, Inc. License: LGPL-2.1+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -63,7 +63,7 @@ GNU Lesser General Public License for more details. Files: autoopts/gettext.h -Copyright: 1995-1998, 2000-2002, 2004-2006, 2009-2015 Free Software +Copyright: 1995-1998, 2000-2002, 2004-2006, 2009-2016 Free Software Foundation, Inc. License: LGPL-2.1+ This program is free software; you can redistribute it and/or modify @@ -77,7 +77,7 @@ GNU Lesser General Public License for more details. Files: autoopts/parse-duration.* -Copyright: 2008-2015 Free Software Foundation, Inc. +Copyright: 2008-2016 Free Software Foundation, Inc. License: LGPL-2.1+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -90,7 +90,7 @@ GNU Lesser General Public License for more details. Files: autoopts/intprops.h -Copyright: 2001-2005, 2009-2015 Free Software Foundation, Inc. +Copyright: 2001-2005, 2009-2016 Free Software Foundation, Inc. License: LGPL-2.1+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -251,7 +251,7 @@ Files: debian/* Copyright: (C) 2008-2012 Bradley Smith - (C) 2012-2015 Andreas Metzler + (C) 2012-2016 Andreas Metzler License: GPL-3+. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free diff -Nru autogen-5.18.7/debian/patches/04_crossbuild.diff autogen-5.18.12/debian/patches/04_crossbuild.diff --- autogen-5.18.7/debian/patches/04_crossbuild.diff 2015-12-08 07:09:59.000000000 +0000 +++ autogen-5.18.12/debian/patches/04_crossbuild.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -From: Helmut Grohne -Subject: Do not run host arch executables during cross build -Last-Update: 2014-09-16 - -When cross building autogen, one has to install autogen for the build -architecture, because it uses itself during build. - -Index: autogen-5.18.3/configure.ac -=================================================================== ---- autogen-5.18.3.orig/configure.ac 2014-05-17 16:49:39.000000000 +0200 -+++ autogen-5.18.3/configure.ac 2014-09-16 23:31:38.603484754 +0200 -@@ -167,9 +167,15 @@ - AGnam=autogen${ac_exeext} - GDnam=getdefs${ac_exeext} - CLnam=columns${ac_exeext} -+if test "$cross_compiling" = "yes"; then -+AGexe=${AGnam} -+GDexe=${GDnam} -+CLexe=${CLnam} -+else - AGexe=${ag_top_builddir}/agen5/${AGnam} - GDexe=${ag_top_builddir}/getdefs/${GDnam} - CLexe=${ag_top_builddir}/columns/${CLnam} -+fi - M4_SRC=`cd $srcdir/config ; echo [a-z]*.m4` - ENABLE_STATIC=${enable_static} - config_end_time=`date +%s 2>/dev/null` -Index: autogen-5.18.3/xml2ag/Makefile.am -=================================================================== ---- autogen-5.18.3.orig/xml2ag/Makefile.am 2014-01-10 20:20:57.000000000 +0100 -+++ autogen-5.18.3/xml2ag/Makefile.am 2014-09-17 11:31:21.755480980 +0200 -@@ -34,8 +34,6 @@ - DOCFILES = invoke-$(TARG).texi invoke-$(TARG).menu $(TARG).1 - DISTCLEANFILES = $(DOCFILES) $(nodist_xml2ag_SOURCES) stamp-* - AM_CPPFLAGS = @INCLIST@ $(LIBXML2_CFLAGS) --AGexe = $(top_builddir)/agen5/autogen --CLexe = $(top_builddir)/columns/columns - BOOTENV = top_srcdir="$(top_srcdir)" top_builddir="$(top_builddir)" \ - PATH=`cd ../columns;pwd`:"$$PATH" CLexe="$(CLexe)" - diff -Nru autogen-5.18.7/debian/patches/05_cross_pkg_config.diff autogen-5.18.12/debian/patches/05_cross_pkg_config.diff --- autogen-5.18.7/debian/patches/05_cross_pkg_config.diff 1970-01-01 00:00:00.000000000 +0000 +++ autogen-5.18.12/debian/patches/05_cross_pkg_config.diff 2018-01-06 12:11:41.000000000 +0000 @@ -0,0 +1,23 @@ +From: Helmut Grohne +Subject: Invoke the triplet prefixed pkg-config +Bug-Debian: http://bugs.debian.org/833171 +Forwarded: https://sourceforge.net/p/autogen/bugs/179/ +Origin: vendor +Last-Update: 2016-09-03 + +Otherwise pkg-config examines the build architecture which usually doesn't have +the relevant dependencies installed or whose flags is different. + +Index: autogen-5.18.10/config/ag_macros.m4 +=================================================================== +--- autogen-5.18.10.orig/config/ag_macros.m4 ++++ autogen-5.18.10/config/ag_macros.m4 +@@ -30,7 +30,7 @@ + AC_DEFUN([INVOKE_AG_MACROS_LAST],[ + [if test X${INVOKE_AG_MACROS_LAST_done} != Xyes ; then] + GUILE_FLAGS +- [ag_gv=`gdir=\`pkg-config --cflags-only-I \ ++ [ag_gv=`gdir=\`$PKG_CONFIG --cflags-only-I \ + guile-${GUILE_EFFECTIVE_VERSION} | \ + sed 's/-I *//;s/ *-I.*/ /g'\` + for d in $gdir diff -Nru autogen-5.18.7/debian/patches/series autogen-5.18.12/debian/patches/series --- autogen-5.18.7/debian/patches/series 2015-12-08 07:09:59.000000000 +0000 +++ autogen-5.18.12/debian/patches/series 2018-01-06 12:11:41.000000000 +0000 @@ -1,2 +1,2 @@ -04_crossbuild.diff +05_cross_pkg_config.diff 10_libopts_tarball_perms.diff diff -Nru autogen-5.18.7/debian/rules autogen-5.18.12/debian/rules --- autogen-5.18.7/debian/rules 2015-12-08 07:09:59.000000000 +0000 +++ autogen-5.18.12/debian/rules 2018-01-06 13:14:11.000000000 +0000 @@ -1,19 +1,27 @@ #!/usr/bin/make -f +include /usr/share/dpkg/architecture.mk +export DEB_BUILD_MAINT_OPTIONS := hardening=+all export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed export DEB_CFLAGS_MAINT_APPEND := -Wall -Wno-format-contains-nul export LC_COLLATE=C undefine LC_ALL + +include /usr/share/dpkg/pkg-info.mk # Used by 10_libopts_tarball_perms.diff -export BUILD_DATE := $(shell dpkg-parsechangelog --show-field Date) -export MAN_PAGE_DATE = $(shell env LC_ALL=C date -u -d '$(BUILD_DATE)' +%Y-%m-%d) +export MAN_PAGE_DATE = $(shell env LC_ALL=C date -u \ + -d '@$(SOURCE_DATE_EPOCH)' +%Y-%m-%d) + +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) +export libopts_cv_with_libregex=yes +endif override_dh_auto_configure: dh_auto_configure --verbose -- \ --disable-silent-rules \ --enable-timeout=78 \ - --with-libxml2-libs="$(shell pkg-config --libs libxml-2.0)" \ - --with-libxml2-cflags="$(shell pkg-config --cflags libxml-2.0)" + --with-libxml2-libs="$(shell $(DEB_HOST_GNU_TYPE)-pkg-config --libs libxml-2.0)" \ + --with-libxml2-cflags="$(shell $(DEB_HOST_GNU_TYPE)-pkg-config --cflags libxml-2.0)" override_dh_auto_build: dh_auto_build --verbose @@ -39,11 +47,11 @@ $(CURDIR)/debian/tmp/usr/lib/*/libopts.la \ $(CURDIR)/debian/tmp/usr/share/autogen/tpl-config.tlib -override_dh_install: - dh_install --fail-missing +override_dh_missing: + dh_missing --fail-missing override_dh_makeshlibs: dh_makeshlibs -V %: - dh $@ --with autoreconf + dh $@ diff -Nru autogen-5.18.7/debian/source/include-binaries autogen-5.18.12/debian/source/include-binaries --- autogen-5.18.7/debian/source/include-binaries 2015-12-08 07:09:59.000000000 +0000 +++ autogen-5.18.12/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/upstream-signing-key.pgp diff -Nru autogen-5.18.7/debian/upstream/signing-key.asc autogen-5.18.12/debian/upstream/signing-key.asc --- autogen-5.18.7/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 +++ autogen-5.18.12/debian/upstream/signing-key.asc 2018-01-06 12:11:41.000000000 +0000 @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQENBFcvxOMBCAC6N2AAOpqIlMjEUYcZiMucihV+PrvnJULVJCcyuEI68eUUxxyI +N9xaYnVBzcgE7Tl5xQTvp0zWGAVlfMQFiGRZLYbz5N8uJAEKGgO/ZdLpM7s5wqLG +zWKB8zLgl/f5FSCKq7xOmkIC1Q+CQQJdql5Dbpya8o0JPkFGQQjmOyOhx2dSueZv +HSMSEPRqSwT58uDYRJWOSsPTI6N2SqY5V/eiy2otEXkmFlY/iQLNP5yq7HE0wLt2 +/Zgs4yPit3Q5UaMK5LMhskttQ1MxwmBM5x5LJrPBh53MRzpOwiduE1A2enS1TgV5 +mk4nkJGh8nidK6O/q5EXHCqg3NS/Sv6o5EhLABEBAAG0IkJydWNlIEtvcmIgKE5v +bmUuKSA8YmtvcmJAZ251Lm9yZz6JATkEEwECACMFAlcvxOMCGwMHCwkIBwMCAQYV +CAIJCgsEFgIDAQIeAQIXgAAKCRDJ73bet07nYnLeB/wLeReifhoe3QgTKC0t2Dev +XleJBa9tzIFVRmpPnK+DLv+Sz7kMeXD1noWPW1uC3zgfQngsj9nx5E60u/lrO5eA +oRoOL+6OEVPPALkT3YgJLR/Tlo8I0n9z8sFJgAIIcKN/x3VLrqT99WdKbdy6lQtT +BsrrRf0ct8pkNrvuOiEn8ALeV7z3Nz4G9CdhV3fLYTXSzGQN4sFn1EUqxMMGitFy +zOhLgmYEwkmgIWFniJFoPz8+JOdzaMjUJUN8NQkG44XQQMjHCeD3Bw1wg9cLuW+S +mPFJBNtf+WclopBEKCwsgKFLfs/f7msi/XKEoTpbpY+r6UzxjmQajA6AnzwRphji +uQENBFcvxOMBCACYSVr8oAkt/KwlDlFGISSxfHCWU0IFvOlnc1EK2hndFJb9p38D +XWdwfycwcntyEgb9FDhjLDszAvk+JFl4nLMJiBEK8mRmFRllNWyZdxp3Igadt/ik +IgznvD3hxPA/TFP1E+D3Y2b5caxmtlkwEMHJzYb+pUAVxVrNkxS/TTqBKsB+VWVm +TODIp40GN0lkRejyosG/QQajOP0peAnzyacc2zxDjMv0aBh+/ArYARSgzXKAhpeY +8rVSMQ4p/1SVlqRa0Ql3xdC+RWzC9N9CVmrpmMnAULQD0omZU/112Xq6XlvFpx/c +Ls7N2xx3MqWHty8Vu8P1pwdV+sfCLCG2njsVABEBAAGJAR8EGAECAAkFAlcvxOMC +GwwACgkQye923rdO52Js2Qf+JPjOILUg2RI3D3Cgf99ZR1d3Tkz2djnbIwf2EOMg +FGgMr38g04Bb3wRNgZsoAhjIQgp0gYZ7YJNiGdJ88FzEfV91xSz62c1DraYLHB0z +82khC0K9kPDqK2zjY2vEff2viItbyAnGt/rJR5X2xQnjI3Zij2KBw0Xi+d2weELu +IN7jNbxf7/2XdCu5Ss8jrlDv8sMHUmtEjicgmzw4uirISbOKak9Ek7nHGZ+QurLI +3xB0T2E6lOzhaug/PAWHkqu+WS42O39mlURklNiEgIOTtWuP9OJmdMKWAxsN61Jf +/THlUd3rha5NUcKb7OFBA3Q7n8LLekuB85YzkaoHMZ+Aiw== +=Vlu0 +-----END PGP PUBLIC KEY BLOCK----- Binary files /tmp/tmpHn6MYX/qUTH9ujPqu/autogen-5.18.7/debian/upstream-signing-key.pgp and /tmp/tmpHn6MYX/YShLlTv5UK/autogen-5.18.12/debian/upstream-signing-key.pgp differ diff -Nru autogen-5.18.7/debian/watch autogen-5.18.12/debian/watch --- autogen-5.18.7/debian/watch 2015-12-08 07:09:59.000000000 +0000 +++ autogen-5.18.12/debian/watch 2018-01-06 13:01:04.000000000 +0000 @@ -1,4 +1,4 @@ version=3 opts=pgpsigurlmangle=s/$/.sig/ \ -ftp://ftp.gnu.org/gnu/autogen/autogen-([\d\.]+)\.tar\.(?:xz|bz2|gz) -#ftp://ftp.gnu.org/gnu/autogen/rel([\d\.]+)/autogen-([\d\.]+)\.tar\.(?:xz|bz2|gz) +https://ftp.gnu.org/gnu/autogen/rel([\d\.]+)/autogen-([\d\.]+)\.tar\.(?:xz|bz2|gz) +#ftp://ftp.gnu.org/gnu/autogen/autogen-([\d\.]+)\.tar\.(?:xz|bz2|gz) diff -Nru autogen-5.18.7/doc/agdoc.texi autogen-5.18.12/doc/agdoc.texi --- autogen-5.18.7/doc/agdoc.texi 2015-12-07 00:05:01.000000000 +0000 +++ autogen-5.18.12/doc/agdoc.texi 2016-08-29 21:36:40.000000000 +0000 @@ -3,7 +3,7 @@ @syncodeindex pg cp @c %**end of header @copying -This manual is for GNU AutoGen version 5.18, updated December 2015. +This manual is for GNU AutoGen version 5.18, updated August 2016. Copyright @copyright{} 1992-2015 by Bruce Korb. @@ -19,7 +19,7 @@ EDIT THIS FILE WITH CAUTION (agdoc.texi) It has been AutoGen-ed -From the definitions /u/bkorb/ag/ag/doc/ag-texi-18970.d/agdoc.def +From the definitions /u/bkorb/ag/ag/doc/ag-texi-14514.d/agdoc.def and the template file auto_gen.tpl Plus bits and pieces gathered from all over the source/build @@ -95,7 +95,7 @@ @finalout @titlepage @title AutoGen - The Automated Program Generator -@subtitle For version 5.18, December 2015 +@subtitle For version 5.18, August 2016 @author Bruce Korb @author @email{bkorb@@gnu.org} @@ -139,7 +139,7 @@ @xref{Add-Ons, Add-on packages for AutoGen}, section for additional programs and libraries associated with AutoGen. -This edition documents version 5.18, December 2015. +This edition documents version 5.18, August 2016. @ignore @@ -2017,7 +2017,7 @@ * SCM tpl-file-line:: @file{tpl-file-line} - get the template file+line number * SCM tpl-file-next-line:: @file{tpl-file-next-line} - get the template file plus next line number * SCM warn:: @file{warn} - display warning message and continue -* SCM autogen-version:: @file{autogen-version} - ``5.18.7'' +* SCM autogen-version:: @file{autogen-version} - ``5.18.12'' * SCM c-file-line-fmt:: format file info as, ``@code{#line nn "file"}'' @end menu @@ -2233,7 +2233,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/funcEval.c line 327. +Extracted from /u/bkorb/ag/ag/agen5/funcEval.c line 355. @end ignore Usage: (emit alist ...) @@ -2602,7 +2602,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/funcEval.c line 429. +Extracted from /u/bkorb/ag/ag/agen5/funcEval.c line 457. @end ignore Usage: (insert-file alist ...) @@ -2811,8 +2811,8 @@ Usage: (max-file-time) @* returns the time stamp of the most recently modified sourc file as the -number of seconds since the epoch. If any input is dynamic (a shell command), -then it will be the current time. +number of seconds since the epoch. If any input is dynamic +(a shell command), then it will be the current time. This Scheme function takes no arguments. @@ -2822,7 +2822,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 270. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 273. @end ignore Usage: (mk-gettextable string) @@ -3135,7 +3135,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 724. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 727. @end ignore Usage: (stack ag-name) @@ -3287,7 +3287,7 @@ This is a symbol defining the current AutoGen version number string. It was first defined in AutoGen-5.2.14. -It is currently ``5.18.7''. +It is currently ``5.18.12''. @node SCM c-file-line-fmt @subsection format file info as, ``@code{#line nn "file"}'' @@ -3391,7 +3391,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 771. +Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 775. @end ignore Usage: (agpl prog-name prefix) @@ -3411,7 +3411,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 818. +Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 824. @end ignore Usage: (bsd prog_name owner prefix) @@ -3433,7 +3433,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 792. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 795. @end ignore Usage: (c-string string) @@ -3458,7 +3458,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/funcEval.c line 308. +Extracted from /u/bkorb/ag/ag/agen5/funcEval.c line 336. @end ignore Usage: (error-source-line) @@ -3576,7 +3576,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expPrint.c line 297. +Extracted from /u/bkorb/ag/ag/agen5/expPrint.c line 298. @end ignore Usage: (format-arg-count format) @@ -3708,7 +3708,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 748. +Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 751. @end ignore Usage: (gpl prog-name prefix) @@ -3769,7 +3769,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 288. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 291. @end ignore Usage: (in? test-string string-list ...) @@ -3789,7 +3789,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 355. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 358. @end ignore Usage: (join separator list ...) @@ -3811,7 +3811,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 766. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 769. @end ignore Usage: (kr-string string) @@ -3832,7 +3832,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 794. +Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 799. @end ignore Usage: (lgpl prog_name owner prefix) @@ -3854,7 +3854,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 843. +Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 850. @end ignore Usage: (license lic_name prog_name owner prefix) @@ -3878,7 +3878,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 670. +Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 673. @end ignore Usage: (license-description license prog-name prefix [ owner ]) @@ -3904,7 +3904,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 613. +Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 616. @end ignore Usage: (license-full license prog-name prefix [ owner ] [ years ]) @@ -3965,7 +3965,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 694. +Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 697. @end ignore Usage: (license-info license prog-name prefix [ owner ] [ years ]) @@ -3995,7 +3995,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 721. +Extracted from /u/bkorb/ag/ag/agen5/expFormat.c line 724. @end ignore Usage: (license-name license) @@ -4168,7 +4168,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 453. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 456. @end ignore Usage: (prefix prefix text) @@ -4228,7 +4228,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 538. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 541. @end ignore Usage: (raw-shell-str string) @@ -4283,7 +4283,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 635. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 638. @end ignore Usage: (shell-str string) @@ -4392,7 +4392,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 422. +Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 426. @end ignore Usage: (string-capitalize str) @@ -4411,7 +4411,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 379. +Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 383. @end ignore Usage: (string-capitalize! str) @@ -4472,7 +4472,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 477. +Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 482. @end ignore Usage: (string-downcase str) @@ -4490,7 +4490,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 446. +Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 451. @end ignore Usage: (string-downcase! str) @@ -4805,7 +4805,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 914. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 937. @end ignore Usage: (string-substitute source match repl) @@ -5010,7 +5010,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 500. +Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 506. @end ignore Usage: (string->camelcase str) @@ -5029,7 +5029,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 894. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 917. @end ignore Usage: (string-tr source match translation) @@ -5051,7 +5051,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 823. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 843. @end ignore Usage: (string-tr! source match translation) @@ -5078,7 +5078,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 356. +Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 359. @end ignore Usage: (string-upcase str) @@ -5096,7 +5096,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 325. +Extracted from /u/bkorb/ag/ag/agen5/expGuile.c line 328. @end ignore Usage: (string-upcase! str) @@ -5113,7 +5113,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 705. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 708. @end ignore Usage: (sub-shell-str string) @@ -5149,7 +5149,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/expString.c line 956. +Extracted from /u/bkorb/ag/ag/agen5/expString.c line 979. @end ignore Usage: (time-string->number time_spec) @@ -5601,7 +5601,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/funcFor.c line 724. +Extracted from /u/bkorb/ag/ag/agen5/funcFor.c line 725. @end ignore @findex ENDFOR @@ -5653,7 +5653,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/funcEval.c line 552. +Extracted from /u/bkorb/ag/ag/agen5/funcEval.c line 580. @end ignore @findex EXPR @@ -5669,7 +5669,7 @@ @ignore Generated from auto_gen.tpl line 580. -Extracted from /u/bkorb/ag/ag/agen5/funcFor.c line 644. +Extracted from /u/bkorb/ag/ag/agen5/funcFor.c line 645. @end ignore @findex FOR @@ -12104,7 +12104,7 @@ The following option preset mechanisms are supported: - reading file errorsRC -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-08-29) Report test_errors bugs to bkorb@@gnu.org @end example @@ -12155,7 +12155,7 @@ If the script file already exists and contains Automated Option Processing text, the second line of the file through the ending tag will be replaced by the newly generated text. The first '#!' line will be regenerated. -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-08-29) Report genshellopt bugs to bkorb@@gnu.org = = = = = = = = @@ -12192,7 +12192,7 @@ All arguments are named options. If no 'input' argument is provided or is set to simply "-", and if 'stdin' is not a 'tty', then the list of input files will be read from 'stdin'. -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-08-29) Report getdefs bugs to bkorb@@gnu.org @end example @@ -12203,10 +12203,10 @@ # # # # # # # # # # -- do not modify this marker -- # # DO NOT EDIT THIS SECTION - OF /u/bkorb/ag/ag/doc/ag-texi-18970.d/.ag-it4Csy/genshellopt.sh + OF /u/bkorb/ag/ag/doc/ag-texi-14514.d/.ag-cjRsM3/genshellopt.sh # # From here to the next `-- do not modify this marker --', -# the text has been generated Sunday December 6, 2015 at 04:05:21 PM PST +# the text has been generated Monday August 29, 2016 at 02:37:00 PM PDT # From the GETDEFS option definitions # GETDEFS_LONGUSAGE_TEXT='getdefs (GNU AutoGen) - AutoGen Definition Extraction Tool - Ver. 1.5 @@ -12283,7 +12283,7 @@ - reading file /dev/null This program extracts AutoGen definitions from a list of source files. Definitions are delimited by '\''/*= \n'\'' and '\''=*/\n'\''. -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-08-29) Report getdefs bugs to bkorb@@gnu.org' GETDEFS_USAGE_TEXT='getdefs (GNU AutoGen) - AutoGen Definition Extraction Tool - Ver. 1.5 @@ -12315,7 +12315,7 @@ All arguments are named options. If no '\''input'\'' argument is provided or is set to simply "-", and if '\''stdin'\'' is not a '\''tty'\'', then the list of input files will be read from '\''stdin'\''. -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-08-29) Report getdefs bugs to bkorb@@gnu.org' diff -Nru autogen-5.18.7/doc/autogen.info autogen-5.18.12/doc/autogen.info --- autogen-5.18.7/doc/autogen.info 2015-12-07 00:05:22.000000000 +0000 +++ autogen-5.18.12/doc/autogen.info 2016-08-29 21:37:02.000000000 +0000 @@ -1,7 +1,7 @@ This is autogen.info, produced by makeinfo version 4.13 from /u/bkorb/ag/ag/doc//agdoc.texi. -This manual is for GNU AutoGen version 5.18, updated December 2015. +This manual is for GNU AutoGen version 5.18, updated August 2016. Copyright (C) 1992-2015 by Bruce Korb. @@ -36,490 +36,490 @@  Indirect: -autogen.info-1: 1453 -autogen.info-2: 299696 -autogen.info-3: 588872 +autogen.info-1: 1451 +autogen.info-2: 299695 +autogen.info-3: 588870  Tag Table: (Indirect) -Node: Top1453 -Node: Introduction2893 -Node: Generalities4563 -Node: Example Usage7367 -Node: csh/zsh caveat12606 -Node: Testimonial13971 -Node: Definitions File16182 -Node: Identification18087 -Node: Definitions19376 -Node: def-list21099 -Node: double-quote-string21988 -Node: single-quote-string22856 -Node: simple-string23591 -Node: shell-generated24350 -Node: scheme-generated25035 -Node: here-string25432 -Node: concat-string27450 -Node: Index Assignments28434 -Node: Dynamic Text29896 -Node: Directives31071 -Node: Predefines36577 -Node: Comments38340 -Node: Example38755 -Node: Full Syntax39489 -Node: Alternate Definition53824 -Node: Template File55899 -Node: pseudo macro57528 -Node: naming values63229 -Node: expression syntax64510 -Node: apply code65748 -Node: basic expression68258 -Node: AutoGen Functions70549 -Node: SCM ag-fprintf75536 -Node: SCM ag-function?76317 -Node: SCM base-name76695 -Node: SCM chdir77075 -Node: SCM count77544 -Node: SCM def-file78027 -Node: SCM def-file-line78397 -Node: SCM dne79318 -Node: SCM emit80969 -Node: SCM emit-string-table81478 -Node: SCM error81927 -Node: SCM exist?82850 -Node: SCM find-file83622 -Node: SCM first-for?84165 -Node: SCM for-by84649 -Node: SCM for-from85083 -Node: SCM for-index85522 -Node: SCM for-sep85977 -Node: SCM for-to86521 -Node: SCM found-for?86950 -Node: SCM get87385 -Node: SCM get-c-name87876 -Node: SCM get-down-name88436 -Node: SCM get-up-name89062 -Node: SCM high-lim89678 -Node: SCM insert-file90376 -Node: SCM insert-suspended90747 -Node: SCM last-for?91191 -Node: SCM len91667 -Node: SCM low-lim92181 -Node: SCM make-header-guard92518 -Node: SCM make-tmp-dir94278 -Node: SCM match-value?94634 -Node: SCM max-file-time95537 -Node: SCM mk-gettextable96056 -Node: SCM out-delete96506 -Node: SCM out-depth97003 -Node: SCM out-emit-suspended97352 -Node: SCM out-line97769 -Node: SCM out-move98144 -Node: SCM out-name98627 -Node: SCM out-pop99084 -Node: SCM out-push-add99710 -Node: SCM out-push-new100121 -Node: SCM out-resume100739 -Node: SCM out-suspend101229 -Node: SCM out-switch101932 -Node: SCM output-file-next-line102512 -Node: SCM set-option103442 -Node: SCM set-writable103854 -Node: SCM stack104426 -Node: SCM stack-join104814 -Node: SCM suffix105336 -Node: SCM tpl-file105649 -Node: SCM tpl-file-line106142 -Node: SCM tpl-file-next-line107132 -Node: SCM warn107709 -Node: SCM autogen-version108197 -Node: SCM c-file-line-fmt108554 -Node: Common Functions108975 -Node: SCM agpl114327 -Node: SCM bsd114785 -Node: SCM c-string115263 -Node: SCM error-source-line116030 -Node: SCM extract116564 -Node: SCM format-arg-count119913 -Node: SCM fprintf120822 -Node: SCM gperf121372 -Node: SCM gperf-code122102 -Node: SCM gpl123293 -Node: SCM hide-email123759 -Node: SCM html-escape-encode124223 -Node: SCM in?124724 -Node: SCM join125162 -Node: SCM kr-string125675 -Node: SCM lgpl126243 -Node: SCM license126767 -Node: SCM license-description127315 -Node: SCM license-full128069 -Node: SCM license-info130224 -Node: SCM license-name131181 -Node: SCM make-gperf131542 -Node: SCM makefile-script132538 -Node: SCM max135317 -Node: SCM min135630 -Node: SCM prefix135934 -Node: SCM printf136781 -Node: SCM raw-shell-str137346 -Node: SCM shell138097 -Node: SCM shell-str139103 -Node: SCM shellf142028 -Node: SCM sprintf142476 -Node: SCM string-capitalize142859 -Node: SCM string-capitalize!143322 -Node: SCM *=*143663 -Node: SCM *==*144233 -Node: SCM string-downcase144641 -Node: SCM string-downcase!145053 -Node: SCM *~145414 -Node: SCM *~~145836 -Node: SCM *=146218 -Node: SCM *==146600 -Node: SCM ==147012 -Node: SCM ~147358 -Node: SCM =147829 -Node: SCM *~*148611 -Node: SCM *~~*149024 -Node: SCM ~~149420 -Node: SCM ~*149786 -Node: SCM ~~*150200 -Node: SCM =*150593 -Node: SCM ==*150981 -Node: SCM string-substitute151366 -Node: SCM string-table-add152130 -Node: SCM string-table-add-ref152937 -Node: SCM string-table-new153510 -Node: SCM string-table-size156226 -Node: SCM string->c-name!156649 -Node: SCM string->camelcase157179 -Node: SCM string-tr157674 -Node: SCM string-tr!158152 -Node: SCM string-upcase158811 -Node: SCM string-upcase!159219 -Node: SCM sub-shell-str159581 -Node: SCM sum160033 -Node: SCM time-string->number160367 -Node: SCM version-compare160999 -Node: native macros161942 -Node: AGMacro syntax165142 -Node: BREAK167291 -Node: CASE167646 -Node: COMMENT170357 -Node: CONTINUE170904 -Node: DEBUG171164 -Node: DEFINE172031 -Node: ELIF174265 -Node: ELSE174741 -Node: ENDDEF175114 -Node: ENDFOR175381 -Node: ENDIF175683 -Node: ENDWHILE175961 -Node: ESAC176255 -Node: EXPR176537 -Node: FOR177016 -Node: IF180057 -Node: INCLUDE181094 -Node: INVOKE181742 -Node: RETURN182742 -Node: SELECT183281 -Node: UNKNOWN183772 -Node: WHILE184301 -Node: shell command185064 -Node: guile command185695 -Node: output controls186118 -Node: Augmenting AutoGen188122 -Node: shell commands188672 -Node: guile macros189495 -Node: guile callouts189954 -Node: AutoGen macros192146 -Node: autogen Invocation192763 -Node: autogen usage194652 -Node: autogen input-select199891 -Ref: autogen templ-dirs200200 -Ref: autogen override-tpl200697 -Ref: autogen lib-template201133 -Ref: autogen definitions201639 -Ref: autogen shell202323 -Ref: autogen no-fmemopen202938 -Ref: autogen equate203730 -Node: autogen out-handling204047 -Ref: autogen base-name204329 -Ref: autogen source-time205371 -Ref: autogen writable205862 -Node: autogen debug-tpl206095 -Ref: autogen loop-limit206489 -Ref: autogen timeout206889 -Ref: autogen trace207432 -Ref: autogen trace-out209408 -Ref: autogen show-defs209934 -Ref: autogen used-defines210327 -Ref: autogen core211055 -Node: autogen processing211576 -Ref: autogen skip-suffix211964 -Ref: autogen select-suffix212632 -Ref: autogen define213152 -Ref: autogen undefine214474 -Node: autogen dep-track214925 -Ref: autogen make-dep215192 -Node: autogen config218503 -Node: autogen exit status221572 -Node: autogen Examples222943 -Node: Installation223666 -Node: configuring223984 -Node: AutoGen CGI226838 -Node: signal names229265 -Node: installing230488 -Node: AutoOpts233272 -Node: Features235032 -Node: Licensing242967 -Node: Caveats244092 -Node: Quick Start247096 -Node: quick ao problem248267 -Node: quick ao def248881 -Node: quick ao build250109 -Node: quick ao help250703 -Node: quick ao usage250923 -Node: quick ao docs252009 -Node: Option Definitions252925 -Node: program attributes254856 -Node: usage attributes256757 -Node: config attributes260916 -Node: programming attributes264259 -Node: presentation attributes270307 -Node: library attributes273632 -Node: lib and program274509 -Node: lib called276923 -Node: prog calls lib278210 -Node: information attributes279088 -Node: Generated main283738 -Node: main guile285194 -Node: main shell-process286101 -Node: main shell-parser287616 -Node: main main288262 -Node: main include289179 -Node: main invoke290120 -Node: main for-each290608 -Node: main-for-each-proc291539 -Node: main-for-each-type292744 -Node: main-for-each-code296206 -Node: main-for-each-opts297171 -Node: option attributes298309 -Node: Required Attributes299696 -Node: Common Attributes301505 -Node: Immediate Action305426 -Node: Option Conflict Attributes307739 -Node: opt-attr settable308525 -Node: opt-attr no-preset309114 -Node: opt-attr equivalence309473 -Node: opt-attr aliases311690 -Node: opt-attr default option312356 -Node: opt-attr documentation313163 -Node: opt-attr translators314692 -Node: Option Arguments315305 -Node: arg-type string317436 -Node: arg-type number317737 -Node: arg-type boolean319644 -Node: arg-type keyword320095 -Node: arg-type set membership322051 -Node: arg-type hierarchy324440 -Node: arg-type file name325220 -Node: arg-type time-duration326468 -Node: arg-type time-date328423 -Node: arg-keyword329207 -Node: arg-optional330062 -Node: arg-default331721 -Node: Option Argument Handling332080 -Node: Internationalizing Options336313 -Node: documentation attributes338265 -Node: per option attributes338849 -Node: global option attributes340384 -Node: automatic options347404 -Node: standard options352964 -Node: AutoOpts API355251 -Node: Option Processing Data358148 -Node: CLEAR_OPT361744 -Node: COUNT_OPT362068 -Node: DESC362473 -Node: DISABLE_OPT_name362891 -Node: ENABLED_OPT363448 -Node: ERRSKIP_OPTERR363887 -Node: ERRSTOP_OPTERR364218 -Node: HAVE_OPT364672 -Node: ISSEL_OPT365041 -Node: ISUNUSED_OPT365349 -Node: OPTION_CT365659 -Node: OPT_ARG366015 -Node: OPT_NO_XLAT_CFG_NAMES366568 -Node: OPT_NO_XLAT_OPT_NAMES367103 -Node: OPT_VALUE_name367582 -Node: OPT_XLAT_CFG_NAMES368046 -Node: OPT_XLAT_OPT_NAMES368964 -Node: RESTART_OPT369724 -Node: SET_OPT_name370870 -Node: STACKCT_OPT371820 -Node: STACKLST_OPT372602 -Node: START_OPT373422 -Node: STATE_OPT373678 -Node: USAGE374627 -Node: VALUE_OPT_name376093 -Node: VERSION376747 -Node: WHICH_IDX_name377331 -Node: WHICH_OPT_name377889 -Node: teOptIndex378457 -Node: OPTIONS_STRUCT_VERSION379046 -Node: libopts procedures379839 -Node: libopts-ao_string_tokenize381534 -Node: libopts-configFileLoad383557 -Node: libopts-optionFileLoad384905 -Node: libopts-optionFindNextValue386489 -Node: libopts-optionFindValue387715 -Node: libopts-optionFree388770 -Node: libopts-optionGetValue389418 -Node: libopts-optionLoadLine390712 -Node: libopts-optionMemberList392159 -Node: libopts-optionNextValue392817 -Node: libopts-optionOnlyUsage394185 -Node: libopts-optionPrintVersion394874 -Node: libopts-optionPrintVersionAndReturn395449 -Node: libopts-optionProcess396202 -Node: libopts-optionRestore397968 -Node: libopts-optionSaveFile398859 -Node: libopts-optionSaveState400104 -Node: libopts-optionUnloadNested401318 -Node: libopts-optionVersion401974 -Node: libopts-strequate402545 -Node: libopts-streqvcmp403165 -Node: libopts-streqvmap404117 -Node: libopts-strneqvcmp405225 -Node: libopts-strtransform406277 -Node: Multi-Threading406978 -Node: option descriptor407974 -Node: Using AutoOpts408625 -Node: local use409235 -Node: binary not installed410865 -Node: binary pre-installed411365 -Node: source pre-installed411994 -Node: source not installed413056 -Node: Presetting Options414181 -Node: loading rcfile416444 -Node: saving rcfile418150 -Node: sample rcfile418659 -Node: environrc427576 -Node: config example429482 -Node: Config File Format431345 -Node: config name/string-value432391 -Node: config integer-values435230 -Node: config nested-values435734 -Node: config directives436218 -Node: config comments438030 -Node: shell options438455 -Node: binary-parser440278 -Node: script-parser442714 -Node: AutoInfo468509 -Node: command-info469949 -Node: library-info470992 -Node: AutoMan pages472236 -Node: man1473135 -Node: man3474869 -Node: getopt_long478167 -Node: getopt limitations479512 -Node: getopt building481105 -Node: i18n483746 -Node: Naming Conflicts485618 -Node: All Attribute Names487006 -Node: Option Define Names489975 -Node: Add-Ons502619 -Node: AutoFSM503697 -Node: AutoXDR504120 -Node: AutoEvents504951 -Node: Bit Maps506197 -Node: enums507164 -Node: enum-code510089 -Node: masks516536 -Node: columns Invocation518188 -Node: columns usage519969 -Node: columns dimensions523315 -Ref: columns width523559 -Ref: columns columns524008 -Ref: columns col-width524324 -Ref: columns tab-width524636 -Node: columns treatment524829 -Ref: columns spread525068 -Ref: columns fill525433 -Ref: columns indent525895 -Ref: columns first-indent526197 -Ref: columns format526912 -Ref: columns separation527219 -Ref: columns line-separation527475 -Ref: columns ending527721 -Node: columns ordering527884 -Ref: columns by-columns528133 -Ref: columns sort528440 -Node: columns input-text528776 -Ref: columns input529029 -Node: columns config529275 -Node: columns exit status532020 -Node: columns See Also532604 -Node: getdefs Invocation532879 -Node: getdefs usage535753 -Node: getdefs def-selection539661 -Ref: getdefs defs-to-get539957 -Ref: getdefs subblock540282 -Ref: getdefs listattr541226 -Node: getdefs enumerating541926 -Ref: getdefs ordering542186 -Ref: getdefs first-index542781 -Node: getdefs doc-insert543081 -Ref: getdefs filelist543328 -Ref: getdefs assign543700 -Ref: getdefs common-assign544049 -Ref: getdefs copy544394 -Ref: getdefs srcfile544718 -Ref: getdefs linenum545123 -Node: getdefs input-files545509 -Ref: getdefs input545764 -Node: getdefs doc-output546370 -Ref: getdefs output546618 -Ref: getdefs autogen546933 -Ref: getdefs template547501 -Ref: getdefs agarg547685 -Ref: getdefs base-name548097 -Node: getdefs config548578 -Node: getdefs exit status550805 -Node: getdefs See Also551389 -Node: xml2ag Invocation551664 -Node: xml2ag usage553542 -Node: xml2ag the-xml2ag-option557536 -Ref: xml2ag output557818 -Node: xml2ag autogen-options558050 -Ref: xml2ag templ-dirs558531 -Ref: xml2ag override-tpl558807 -Ref: xml2ag lib-template558995 -Ref: xml2ag definitions559310 -Ref: xml2ag shell559467 -Ref: xml2ag no-fmemopen559652 -Ref: xml2ag equate559763 -Ref: xml2ag base-name559947 -Ref: xml2ag source-time560130 -Ref: xml2ag writable560250 -Ref: xml2ag loop-limit560467 -Ref: xml2ag timeout560633 -Ref: xml2ag trace560807 -Ref: xml2ag trace-out561387 -Ref: xml2ag show-defs561553 -Ref: xml2ag used-defines561675 -Ref: xml2ag core561792 -Ref: xml2ag skip-suffix562364 -Ref: xml2ag select-suffix562740 -Ref: xml2ag define563004 -Ref: xml2ag undefine563275 -Ref: xml2ag make-dep563550 -Node: xml2ag exit status563780 -Node: snprintfv564124 -Node: Future566641 -Node: Copying This Manual566980 -Node: Concept Index567266 -Node: Function Index588872 +Node: Top1451 +Node: Introduction2889 +Node: Generalities4559 +Node: Example Usage7363 +Node: csh/zsh caveat12602 +Node: Testimonial13967 +Node: Definitions File16178 +Node: Identification18083 +Node: Definitions19372 +Node: def-list21095 +Node: double-quote-string21984 +Node: single-quote-string22852 +Node: simple-string23587 +Node: shell-generated24346 +Node: scheme-generated25031 +Node: here-string25428 +Node: concat-string27446 +Node: Index Assignments28430 +Node: Dynamic Text29892 +Node: Directives31067 +Node: Predefines36573 +Node: Comments38336 +Node: Example38751 +Node: Full Syntax39485 +Node: Alternate Definition53820 +Node: Template File55895 +Node: pseudo macro57524 +Node: naming values63225 +Node: expression syntax64506 +Node: apply code65744 +Node: basic expression68254 +Node: AutoGen Functions70545 +Node: SCM ag-fprintf75533 +Node: SCM ag-function?76314 +Node: SCM base-name76692 +Node: SCM chdir77072 +Node: SCM count77541 +Node: SCM def-file78024 +Node: SCM def-file-line78394 +Node: SCM dne79315 +Node: SCM emit80966 +Node: SCM emit-string-table81475 +Node: SCM error81924 +Node: SCM exist?82847 +Node: SCM find-file83619 +Node: SCM first-for?84162 +Node: SCM for-by84646 +Node: SCM for-from85080 +Node: SCM for-index85519 +Node: SCM for-sep85974 +Node: SCM for-to86518 +Node: SCM found-for?86947 +Node: SCM get87382 +Node: SCM get-c-name87873 +Node: SCM get-down-name88433 +Node: SCM get-up-name89059 +Node: SCM high-lim89675 +Node: SCM insert-file90373 +Node: SCM insert-suspended90744 +Node: SCM last-for?91188 +Node: SCM len91664 +Node: SCM low-lim92178 +Node: SCM make-header-guard92515 +Node: SCM make-tmp-dir94275 +Node: SCM match-value?94631 +Node: SCM max-file-time95534 +Node: SCM mk-gettextable96053 +Node: SCM out-delete96503 +Node: SCM out-depth97000 +Node: SCM out-emit-suspended97349 +Node: SCM out-line97766 +Node: SCM out-move98141 +Node: SCM out-name98624 +Node: SCM out-pop99081 +Node: SCM out-push-add99707 +Node: SCM out-push-new100118 +Node: SCM out-resume100736 +Node: SCM out-suspend101226 +Node: SCM out-switch101929 +Node: SCM output-file-next-line102509 +Node: SCM set-option103439 +Node: SCM set-writable103851 +Node: SCM stack104423 +Node: SCM stack-join104811 +Node: SCM suffix105333 +Node: SCM tpl-file105646 +Node: SCM tpl-file-line106139 +Node: SCM tpl-file-next-line107129 +Node: SCM warn107706 +Node: SCM autogen-version108194 +Node: SCM c-file-line-fmt108552 +Node: Common Functions108973 +Node: SCM agpl114325 +Node: SCM bsd114783 +Node: SCM c-string115261 +Node: SCM error-source-line116028 +Node: SCM extract116562 +Node: SCM format-arg-count119911 +Node: SCM fprintf120820 +Node: SCM gperf121370 +Node: SCM gperf-code122100 +Node: SCM gpl123291 +Node: SCM hide-email123757 +Node: SCM html-escape-encode124221 +Node: SCM in?124722 +Node: SCM join125160 +Node: SCM kr-string125673 +Node: SCM lgpl126241 +Node: SCM license126765 +Node: SCM license-description127313 +Node: SCM license-full128067 +Node: SCM license-info130222 +Node: SCM license-name131179 +Node: SCM make-gperf131540 +Node: SCM makefile-script132536 +Node: SCM max135315 +Node: SCM min135628 +Node: SCM prefix135932 +Node: SCM printf136779 +Node: SCM raw-shell-str137344 +Node: SCM shell138095 +Node: SCM shell-str139101 +Node: SCM shellf142026 +Node: SCM sprintf142474 +Node: SCM string-capitalize142857 +Node: SCM string-capitalize!143320 +Node: SCM *=*143661 +Node: SCM *==*144231 +Node: SCM string-downcase144639 +Node: SCM string-downcase!145051 +Node: SCM *~145412 +Node: SCM *~~145834 +Node: SCM *=146216 +Node: SCM *==146598 +Node: SCM ==147010 +Node: SCM ~147356 +Node: SCM =147827 +Node: SCM *~*148609 +Node: SCM *~~*149022 +Node: SCM ~~149418 +Node: SCM ~*149784 +Node: SCM ~~*150198 +Node: SCM =*150591 +Node: SCM ==*150979 +Node: SCM string-substitute151364 +Node: SCM string-table-add152128 +Node: SCM string-table-add-ref152935 +Node: SCM string-table-new153508 +Node: SCM string-table-size156224 +Node: SCM string->c-name!156647 +Node: SCM string->camelcase157177 +Node: SCM string-tr157672 +Node: SCM string-tr!158150 +Node: SCM string-upcase158809 +Node: SCM string-upcase!159217 +Node: SCM sub-shell-str159579 +Node: SCM sum160031 +Node: SCM time-string->number160365 +Node: SCM version-compare160997 +Node: native macros161940 +Node: AGMacro syntax165140 +Node: BREAK167289 +Node: CASE167644 +Node: COMMENT170355 +Node: CONTINUE170902 +Node: DEBUG171162 +Node: DEFINE172029 +Node: ELIF174263 +Node: ELSE174739 +Node: ENDDEF175112 +Node: ENDFOR175379 +Node: ENDIF175681 +Node: ENDWHILE175959 +Node: ESAC176253 +Node: EXPR176535 +Node: FOR177014 +Node: IF180055 +Node: INCLUDE181092 +Node: INVOKE181740 +Node: RETURN182740 +Node: SELECT183279 +Node: UNKNOWN183770 +Node: WHILE184299 +Node: shell command185062 +Node: guile command185693 +Node: output controls186116 +Node: Augmenting AutoGen188120 +Node: shell commands188670 +Node: guile macros189493 +Node: guile callouts189952 +Node: AutoGen macros192144 +Node: autogen Invocation192761 +Node: autogen usage194650 +Node: autogen input-select199890 +Ref: autogen templ-dirs200199 +Ref: autogen override-tpl200696 +Ref: autogen lib-template201132 +Ref: autogen definitions201638 +Ref: autogen shell202322 +Ref: autogen no-fmemopen202937 +Ref: autogen equate203729 +Node: autogen out-handling204046 +Ref: autogen base-name204328 +Ref: autogen source-time205370 +Ref: autogen writable205861 +Node: autogen debug-tpl206094 +Ref: autogen loop-limit206488 +Ref: autogen timeout206888 +Ref: autogen trace207431 +Ref: autogen trace-out209407 +Ref: autogen show-defs209933 +Ref: autogen used-defines210326 +Ref: autogen core211054 +Node: autogen processing211575 +Ref: autogen skip-suffix211963 +Ref: autogen select-suffix212631 +Ref: autogen define213151 +Ref: autogen undefine214473 +Node: autogen dep-track214924 +Ref: autogen make-dep215191 +Node: autogen config218502 +Node: autogen exit status221571 +Node: autogen Examples222942 +Node: Installation223665 +Node: configuring223983 +Node: AutoGen CGI226837 +Node: signal names229264 +Node: installing230487 +Node: AutoOpts233271 +Node: Features235031 +Node: Licensing242966 +Node: Caveats244091 +Node: Quick Start247095 +Node: quick ao problem248266 +Node: quick ao def248880 +Node: quick ao build250108 +Node: quick ao help250702 +Node: quick ao usage250922 +Node: quick ao docs252008 +Node: Option Definitions252924 +Node: program attributes254855 +Node: usage attributes256756 +Node: config attributes260915 +Node: programming attributes264258 +Node: presentation attributes270306 +Node: library attributes273631 +Node: lib and program274508 +Node: lib called276922 +Node: prog calls lib278209 +Node: information attributes279087 +Node: Generated main283737 +Node: main guile285193 +Node: main shell-process286100 +Node: main shell-parser287615 +Node: main main288261 +Node: main include289178 +Node: main invoke290119 +Node: main for-each290607 +Node: main-for-each-proc291538 +Node: main-for-each-type292743 +Node: main-for-each-code296205 +Node: main-for-each-opts297170 +Node: option attributes298308 +Node: Required Attributes299695 +Node: Common Attributes301504 +Node: Immediate Action305425 +Node: Option Conflict Attributes307738 +Node: opt-attr settable308524 +Node: opt-attr no-preset309113 +Node: opt-attr equivalence309472 +Node: opt-attr aliases311689 +Node: opt-attr default option312355 +Node: opt-attr documentation313162 +Node: opt-attr translators314691 +Node: Option Arguments315304 +Node: arg-type string317435 +Node: arg-type number317736 +Node: arg-type boolean319643 +Node: arg-type keyword320094 +Node: arg-type set membership322050 +Node: arg-type hierarchy324439 +Node: arg-type file name325219 +Node: arg-type time-duration326467 +Node: arg-type time-date328422 +Node: arg-keyword329206 +Node: arg-optional330061 +Node: arg-default331720 +Node: Option Argument Handling332079 +Node: Internationalizing Options336312 +Node: documentation attributes338264 +Node: per option attributes338848 +Node: global option attributes340383 +Node: automatic options347403 +Node: standard options352963 +Node: AutoOpts API355250 +Node: Option Processing Data358147 +Node: CLEAR_OPT361743 +Node: COUNT_OPT362067 +Node: DESC362472 +Node: DISABLE_OPT_name362890 +Node: ENABLED_OPT363447 +Node: ERRSKIP_OPTERR363886 +Node: ERRSTOP_OPTERR364217 +Node: HAVE_OPT364671 +Node: ISSEL_OPT365040 +Node: ISUNUSED_OPT365348 +Node: OPTION_CT365658 +Node: OPT_ARG366014 +Node: OPT_NO_XLAT_CFG_NAMES366567 +Node: OPT_NO_XLAT_OPT_NAMES367102 +Node: OPT_VALUE_name367581 +Node: OPT_XLAT_CFG_NAMES368045 +Node: OPT_XLAT_OPT_NAMES368963 +Node: RESTART_OPT369723 +Node: SET_OPT_name370869 +Node: STACKCT_OPT371819 +Node: STACKLST_OPT372601 +Node: START_OPT373421 +Node: STATE_OPT373677 +Node: USAGE374626 +Node: VALUE_OPT_name376092 +Node: VERSION376746 +Node: WHICH_IDX_name377330 +Node: WHICH_OPT_name377888 +Node: teOptIndex378456 +Node: OPTIONS_STRUCT_VERSION379045 +Node: libopts procedures379838 +Node: libopts-ao_string_tokenize381533 +Node: libopts-configFileLoad383556 +Node: libopts-optionFileLoad384904 +Node: libopts-optionFindNextValue386488 +Node: libopts-optionFindValue387714 +Node: libopts-optionFree388769 +Node: libopts-optionGetValue389417 +Node: libopts-optionLoadLine390711 +Node: libopts-optionMemberList392158 +Node: libopts-optionNextValue392816 +Node: libopts-optionOnlyUsage394184 +Node: libopts-optionPrintVersion394873 +Node: libopts-optionPrintVersionAndReturn395448 +Node: libopts-optionProcess396201 +Node: libopts-optionRestore397967 +Node: libopts-optionSaveFile398858 +Node: libopts-optionSaveState400103 +Node: libopts-optionUnloadNested401317 +Node: libopts-optionVersion401973 +Node: libopts-strequate402544 +Node: libopts-streqvcmp403164 +Node: libopts-streqvmap404116 +Node: libopts-strneqvcmp405224 +Node: libopts-strtransform406276 +Node: Multi-Threading406977 +Node: option descriptor407973 +Node: Using AutoOpts408624 +Node: local use409234 +Node: binary not installed410864 +Node: binary pre-installed411364 +Node: source pre-installed411993 +Node: source not installed413055 +Node: Presetting Options414180 +Node: loading rcfile416443 +Node: saving rcfile418149 +Node: sample rcfile418658 +Node: environrc427575 +Node: config example429481 +Node: Config File Format431344 +Node: config name/string-value432390 +Node: config integer-values435229 +Node: config nested-values435733 +Node: config directives436217 +Node: config comments438029 +Node: shell options438454 +Node: binary-parser440277 +Node: script-parser442713 +Node: AutoInfo468506 +Node: command-info469946 +Node: library-info470989 +Node: AutoMan pages472233 +Node: man1473132 +Node: man3474866 +Node: getopt_long478164 +Node: getopt limitations479509 +Node: getopt building481102 +Node: i18n483743 +Node: Naming Conflicts485615 +Node: All Attribute Names487003 +Node: Option Define Names489972 +Node: Add-Ons502616 +Node: AutoFSM503694 +Node: AutoXDR504117 +Node: AutoEvents504948 +Node: Bit Maps506194 +Node: enums507161 +Node: enum-code510086 +Node: masks516533 +Node: columns Invocation518185 +Node: columns usage519966 +Node: columns dimensions523312 +Ref: columns width523556 +Ref: columns columns524005 +Ref: columns col-width524321 +Ref: columns tab-width524633 +Node: columns treatment524826 +Ref: columns spread525065 +Ref: columns fill525430 +Ref: columns indent525892 +Ref: columns first-indent526194 +Ref: columns format526909 +Ref: columns separation527216 +Ref: columns line-separation527472 +Ref: columns ending527718 +Node: columns ordering527881 +Ref: columns by-columns528130 +Ref: columns sort528437 +Node: columns input-text528773 +Ref: columns input529026 +Node: columns config529272 +Node: columns exit status532017 +Node: columns See Also532601 +Node: getdefs Invocation532876 +Node: getdefs usage535750 +Node: getdefs def-selection539658 +Ref: getdefs defs-to-get539954 +Ref: getdefs subblock540279 +Ref: getdefs listattr541223 +Node: getdefs enumerating541923 +Ref: getdefs ordering542183 +Ref: getdefs first-index542778 +Node: getdefs doc-insert543078 +Ref: getdefs filelist543325 +Ref: getdefs assign543697 +Ref: getdefs common-assign544046 +Ref: getdefs copy544391 +Ref: getdefs srcfile544715 +Ref: getdefs linenum545120 +Node: getdefs input-files545506 +Ref: getdefs input545761 +Node: getdefs doc-output546367 +Ref: getdefs output546615 +Ref: getdefs autogen546930 +Ref: getdefs template547498 +Ref: getdefs agarg547682 +Ref: getdefs base-name548094 +Node: getdefs config548575 +Node: getdefs exit status550802 +Node: getdefs See Also551386 +Node: xml2ag Invocation551661 +Node: xml2ag usage553539 +Node: xml2ag the-xml2ag-option557534 +Ref: xml2ag output557816 +Node: xml2ag autogen-options558048 +Ref: xml2ag templ-dirs558529 +Ref: xml2ag override-tpl558805 +Ref: xml2ag lib-template558993 +Ref: xml2ag definitions559308 +Ref: xml2ag shell559465 +Ref: xml2ag no-fmemopen559650 +Ref: xml2ag equate559761 +Ref: xml2ag base-name559945 +Ref: xml2ag source-time560128 +Ref: xml2ag writable560248 +Ref: xml2ag loop-limit560465 +Ref: xml2ag timeout560631 +Ref: xml2ag trace560805 +Ref: xml2ag trace-out561385 +Ref: xml2ag show-defs561551 +Ref: xml2ag used-defines561673 +Ref: xml2ag core561790 +Ref: xml2ag skip-suffix562362 +Ref: xml2ag select-suffix562738 +Ref: xml2ag define563002 +Ref: xml2ag undefine563273 +Ref: xml2ag make-dep563548 +Node: xml2ag exit status563778 +Node: snprintfv564122 +Node: Future566639 +Node: Copying This Manual566978 +Node: Concept Index567264 +Node: Function Index588870  End Tag Table diff -Nru autogen-5.18.7/doc/autogen.info-1 autogen-5.18.12/doc/autogen.info-1 --- autogen-5.18.7/doc/autogen.info-1 2015-12-07 00:05:22.000000000 +0000 +++ autogen-5.18.12/doc/autogen.info-1 2016-08-29 21:37:02.000000000 +0000 @@ -1,7 +1,7 @@ This is autogen.info, produced by makeinfo version 4.13 from /u/bkorb/ag/ag/doc//agdoc.texi. -This manual is for GNU AutoGen version 5.18, updated December 2015. +This manual is for GNU AutoGen version 5.18, updated August 2016. Copyright (C) 1992-2015 by Bruce Korb. @@ -52,7 +52,7 @@ Features::. *Note Add-on packages for AutoGen: Add-Ons, section for additional programs and libraries associated with AutoGen. - This edition documents version 5.18, December 2015. + This edition documents version 5.18, August 2016. * Menu: @@ -1702,7 +1702,7 @@ * SCM tpl-file-line:: `tpl-file-line' - get the template file+line number * SCM tpl-file-next-line:: `tpl-file-next-line' - get the template file plus next line number * SCM warn:: `warn' - display warning message and continue -* SCM autogen-version:: `autogen-version' - ``5.18.7'' +* SCM autogen-version:: `autogen-version' - ``5.18.12'' * SCM c-file-line-fmt:: format file info as, ```#line nn "file"'''  @@ -2629,7 +2629,7 @@ ------------------------------------------------- This is a symbol defining the current AutoGen version number string. -It was first defined in AutoGen-5.2.14. It is currently "5.18.7". +It was first defined in AutoGen-5.2.14. It is currently "5.18.12".  File: autogen.info, Node: SCM c-file-line-fmt, Prev: SCM autogen-version, Up: AutoGen Functions @@ -4883,7 +4883,7 @@ function. The `PAGER' environment variable is used to select the program, defaulting to `more'. Both will exit with a status code of 0. -autogen (GNU AutoGen) - The Automated Program Generator - Ver. 5.18.7 +autogen (GNU AutoGen) - The Automated Program Generator - Ver. 5.18.11 Usage: autogen [ - [] | --[{=| }] ]... [ ] The following options select definitions, templates and scheme functions @@ -4982,7 +4982,7 @@ or an integer from 0 through 6 AutoGen is a tool designed for generating program files that contain repetitive text with varied substitutions. -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-05-27) Report autogen bugs to bkorb@gnu.org  diff -Nru autogen-5.18.7/doc/autogen.info-2 autogen-5.18.12/doc/autogen.info-2 --- autogen-5.18.7/doc/autogen.info-2 2015-12-07 00:05:22.000000000 +0000 +++ autogen-5.18.12/doc/autogen.info-2 2016-08-29 21:37:02.000000000 +0000 @@ -1,7 +1,7 @@ This is autogen.info, produced by makeinfo version 4.13 from /u/bkorb/ag/ag/doc//agdoc.texi. -This manual is for GNU AutoGen version 5.18, updated December 2015. +This manual is for GNU AutoGen version 5.18, updated August 2016. Copyright (C) 1992-2015 by Bruce Korb. @@ -3732,7 +3732,7 @@ The following option preset mechanisms are supported: - reading file errorsRC - Packaged by Bruce (2015-12-06) + Packaged by Bruce (2016-08-29) Report test_errors bugs to bkorb@gnu.org Using the invocation, @@ -3781,7 +3781,7 @@ If the script file already exists and contains Automated Option Processing text, the second line of the file through the ending tag will be replaced by the newly generated text. The first '#!' line will be regenerated. - Packaged by Bruce (2015-12-06) + Packaged by Bruce (2016-08-29) Report genshellopt bugs to bkorb@gnu.org = = = = = = = = @@ -3818,7 +3818,7 @@ All arguments are named options. If no 'input' argument is provided or is set to simply "-", and if 'stdin' is not a 'tty', then the list of input files will be read from 'stdin'. - Packaged by Bruce (2015-12-06) + Packaged by Bruce (2016-08-29) Report getdefs bugs to bkorb@gnu.org Resulting in the following script: @@ -3826,10 +3826,10 @@ # # # # # # # # # # -- do not modify this marker -- # # DO NOT EDIT THIS SECTION - OF /u/bkorb/ag/ag/doc/ag-texi-18970.d/.ag-it4Csy/genshellopt.sh + OF /u/bkorb/ag/ag/doc/ag-texi-14514.d/.ag-cjRsM3/genshellopt.sh # # From here to the next `-- do not modify this marker --', - # the text has been generated Sunday December 6, 2015 at 04:05:21 PM PST + # the text has been generated Monday August 29, 2016 at 02:37:00 PM PDT # From the GETDEFS option definitions # GETDEFS_LONGUSAGE_TEXT='getdefs (GNU AutoGen) - AutoGen Definition Extraction Tool - Ver. 1.5 @@ -3906,7 +3906,7 @@ - reading file /dev/null This program extracts AutoGen definitions from a list of source files. Definitions are delimited by '\''/*= \n'\'' and '\''=*/\n'\''. - Packaged by Bruce (2015-12-06) + Packaged by Bruce (2016-08-29) Report getdefs bugs to bkorb@gnu.org' GETDEFS_USAGE_TEXT='getdefs (GNU AutoGen) - AutoGen Definition Extraction Tool - Ver. 1.5 @@ -3938,7 +3938,7 @@ All arguments are named options. If no '\''input'\'' argument is provided or is set to simply "-", and if '\''stdin'\'' is not a '\''tty'\'', then the list of input files will be read from '\''stdin'\''. - Packaged by Bruce (2015-12-06) + Packaged by Bruce (2016-08-29) Report getdefs bugs to bkorb@gnu.org' @@ -5702,7 +5702,7 @@ - reading file ./.columnsrc - reading file $HOME/.columnsrc - examining environment variables named COLUMNS_* -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-08-29) Report columns bugs to bkorb@gnu.org  @@ -6150,7 +6150,7 @@ - reading file /dev/null This program extracts AutoGen definitions from a list of source files. Definitions are delimited by '/*= \n' and '=*/\n'. -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-08-29) Report getdefs bugs to bkorb@gnu.org  @@ -6586,7 +6586,7 @@ function. The `PAGER' environment variable is used to select the program, defaulting to `more'. Both will exit with a status code of 0. -xml2ag (GNU AutoGen) - XML to AutoGen Definiton Converter - Ver. 5.18.7 +xml2ag (GNU AutoGen) - XML to AutoGen Definiton Converter - Ver. 5.18.12 Usage: xml2ag [ - [] | --[{=| }] ]... [ ] All other options are derived from autogen: @@ -6654,7 +6654,7 @@ The ``base-name'' for the output will similarly be either: * the ``--base-name'' command line option * the base name of the .xml file -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-08-29) Report xml2ag bugs to bkorb@gnu.org  Binary files /tmp/tmpHn6MYX/qUTH9ujPqu/autogen-5.18.7/doc/autogen.info-3 and /tmp/tmpHn6MYX/YShLlTv5UK/autogen-5.18.12/doc/autogen.info-3 differ diff -Nru autogen-5.18.7/doc/gendocs_template autogen-5.18.12/doc/gendocs_template --- autogen-5.18.7/doc/gendocs_template 2015-01-31 16:40:20.000000000 +0000 +++ autogen-5.18.12/doc/gendocs_template 2016-03-05 16:59:21.000000000 +0000 @@ -77,7 +77,7 @@ to <%%EMAIL%%>.

-

Copyright © 2015 Free Software Foundation, Inc.

+

Copyright © 2016 Free Software Foundation, Inc.

This page is licensed under a Creative diff -Nru autogen-5.18.7/doc/invoke-autogen.texi autogen-5.18.12/doc/invoke-autogen.texi --- autogen-5.18.7/doc/invoke-autogen.texi 2015-12-07 00:04:14.000000000 +0000 +++ autogen-5.18.12/doc/invoke-autogen.texi 2016-08-29 21:35:43.000000000 +0000 @@ -66,7 +66,7 @@ @exampleindent 0 @example -autogen (GNU AutoGen) - The Automated Program Generator - Ver. 5.18.7 +autogen (GNU AutoGen) - The Automated Program Generator - Ver. 5.18.11 Usage: autogen [ - [] | --[@{=| @}] ]... [ ] The following options select definitions, templates and scheme functions @@ -165,7 +165,7 @@ or an integer from 0 through 6 AutoGen is a tool designed for generating program files that contain repetitive text with varied substitutions. -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-05-27) Report autogen bugs to bkorb@@gnu.org @end example @exampleindent 4 diff -Nru autogen-5.18.7/doc/invoke-columns.texi autogen-5.18.12/doc/invoke-columns.texi --- autogen-5.18.7/doc/invoke-columns.texi 2015-12-07 00:04:44.000000000 +0000 +++ autogen-5.18.12/doc/invoke-columns.texi 2016-08-29 21:36:22.000000000 +0000 @@ -129,7 +129,7 @@ - reading file ./.columnsrc - reading file $HOME/.columnsrc - examining environment variables named COLUMNS_* -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-08-29) Report columns bugs to bkorb@@gnu.org @end example @exampleindent 4 diff -Nru autogen-5.18.7/doc/invoke-getdefs.texi autogen-5.18.12/doc/invoke-getdefs.texi --- autogen-5.18.7/doc/invoke-getdefs.texi 2015-12-07 00:04:51.000000000 +0000 +++ autogen-5.18.12/doc/invoke-getdefs.texi 2016-08-29 21:36:30.000000000 +0000 @@ -194,7 +194,7 @@ - reading file /dev/null This program extracts AutoGen definitions from a list of source files. Definitions are delimited by '/*= \n' and '=*/\n'. -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-08-29) Report getdefs bugs to bkorb@@gnu.org @end example @exampleindent 4 diff -Nru autogen-5.18.7/doc/invoke-xml2ag.texi autogen-5.18.12/doc/invoke-xml2ag.texi --- autogen-5.18.7/doc/invoke-xml2ag.texi 2015-12-07 00:04:56.000000000 +0000 +++ autogen-5.18.12/doc/invoke-xml2ag.texi 2016-08-29 21:36:36.000000000 +0000 @@ -90,7 +90,7 @@ @exampleindent 0 @example -xml2ag (GNU AutoGen) - XML to AutoGen Definiton Converter - Ver. 5.18.7 +xml2ag (GNU AutoGen) - XML to AutoGen Definiton Converter - Ver. 5.18.12 Usage: xml2ag [ - [] | --[@{=| @}] ]... [ ] All other options are derived from autogen: @@ -158,7 +158,7 @@ The ``base-name'' for the output will similarly be either: * the ``--base-name'' command line option * the base name of the .xml file -Packaged by Bruce (2015-12-06) +Packaged by Bruce (2016-08-29) Report xml2ag bugs to bkorb@@gnu.org @end example @exampleindent 4 diff -Nru autogen-5.18.7/doc/Makefile.in autogen-5.18.12/doc/Makefile.in --- autogen-5.18.7/doc/Makefile.in 2015-12-07 00:04:13.000000000 +0000 +++ autogen-5.18.12/doc/Makefile.in 2016-08-29 21:35:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/auto_gen-tpl.in $(top_srcdir)/config/texinfo.tex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -97,6 +105,7 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = auto_gen.tpl @@ -189,6 +198,8 @@ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/auto_gen-tpl.in \ + $(top_srcdir)/config/texinfo.tex DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AGEN5_TESTS = @AGEN5_TESTS@ @@ -397,7 +408,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -820,6 +830,8 @@ uninstall-dvi-am uninstall-html-am uninstall-info-am \ uninstall-pdf-am uninstall-ps-am +.PRECIOUS: Makefile + all : $(INFO_DEPS) agdoc.texi : # self-depends upon all executables diff -Nru autogen-5.18.7/doc/mk-agen-texi.sh autogen-5.18.12/doc/mk-agen-texi.sh --- autogen-5.18.7/doc/mk-agen-texi.sh 2015-08-09 00:50:50.000000000 +0000 +++ autogen-5.18.12/doc/mk-agen-texi.sh 2016-08-29 17:57:46.000000000 +0000 @@ -186,9 +186,9 @@ for f in ${ADDON_TEXI} ${AGEN_TEXI} \ ${top_builddir}/autoopts/libopts.texi do - test -f ${f} || ( - cd `dirname ${f}` - ${MAKE} `basename ${f}` >&2 + test -f "${f}" || ( + cd `dirname "${f}"` + ${MAKE} `basename "${f}"` >&2 test $? -ne 0 && die MAKE of ${f} failed. ) done @@ -196,8 +196,8 @@ # Make sure we have all our sources and generate the doc # for f in ${DOC_DEPENDS} - do test -f ${f} || die cannot find doc file: ${f} - test -f `basename $f` || ln -s $f . + do test -f "${f}" || die cannot find doc file: ${f} + test -f `basename $f` || ln -s "${f}" . done } diff -Nru autogen-5.18.7/getdefs/getdefs.c autogen-5.18.12/getdefs/getdefs.c --- autogen-5.18.7/getdefs/getdefs.c 2015-08-09 00:50:50.000000000 +0000 +++ autogen-5.18.12/getdefs/getdefs.c 2016-03-08 16:58:38.000000000 +0000 @@ -372,7 +372,7 @@ default: { char zRER[ MAXNAMELEN ]; - static char const zErr[] = "error %d (%s) finding `%s' in\n%s\n\n"; + static char const zErr[] = "error %d (%s) finding '%s' in\n%s\n\n"; regerror(re_res, &attrib_re, zRER, sizeof(zRER)); *pzOut++ = '\n'; *pzOut++ = '#'; @@ -875,7 +875,7 @@ * * Go through all our different kinds of defines. On the first occurrence * of each different name, check for an index value. If not supplied, - * then insert ``[OPT_VALUE_FIRST_INDEX]'' after the object name. + * then insert ''[OPT_VALUE_FIRST_INDEX]'' after the object name. */ static void set_first_idx(void) diff -Nru autogen-5.18.7/getdefs/Makefile.in autogen-5.18.12/getdefs/Makefile.in --- autogen-5.18.7/getdefs/Makefile.in 2015-12-07 00:04:13.000000000 +0000 +++ autogen-5.18.12/getdefs/Makefile.in 2016-08-29 21:35:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,8 +91,6 @@ target_triplet = @target@ bin_PROGRAMS = getdefs$(EXEEXT) subdir = getdefs -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -99,6 +107,7 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -221,6 +230,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -452,7 +462,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu getdefs/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu getdefs/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -889,6 +898,8 @@ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-man uninstall-man1 +.PRECIOUS: Makefile + @AMDEP_TRUE@include $(DEPDIR)/opts-dep @AMDEP_TRUE@include $(DEPDIR)/info-dep @AMDEP_TRUE@include $(DEPDIR)/man-dep diff -Nru autogen-5.18.7/getdefs/proto.h autogen-5.18.12/getdefs/proto.h --- autogen-5.18.7/getdefs/proto.h 2015-12-07 00:04:16.000000000 +0000 +++ autogen-5.18.12/getdefs/proto.h 2016-08-29 21:35:49.000000000 +0000 @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: * * Prototypes for getdefs - * Generated Sun Dec 6 16:04:16 PST 2015 + * Generated Mon Aug 29 14:35:49 PDT 2016 */ #ifndef GETDEFS_PROTO_H_GUARD #define GETDEFS_PROTO_H_GUARD 1 diff -Nru autogen-5.18.7/getdefs/test/defs autogen-5.18.12/getdefs/test/defs --- autogen-5.18.7/getdefs/test/defs 2015-12-07 00:05:26.000000000 +0000 +++ autogen-5.18.12/getdefs/test/defs 2016-08-29 21:37:06.000000000 +0000 @@ -7,7 +7,7 @@ # ## This file is part of AutoOpts, a companion to AutoGen. ## AutoOpts is free software. -## AutoOpts is Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoOpts is Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoOpts is available under any one of two licenses. The license ## in use must be one of these two and the choice is under the control @@ -88,7 +88,7 @@ ) || eval 'local() { : ; }' vars=`set | ${SED} -n '/^\(LANG\|LC_[A-Z_]*\)=/s/=.*//p'` 2>/dev/null - unset AUTOOPTS_USAGE $vars + unset AUTOOPTS_USAGE $vars CONTENT_LENGTH REQUEST_METHOD QUERY_STRING } # If only the "rm(1)" command could be relied upon.... diff -Nru autogen-5.18.7/getdefs/test/Makefile.in autogen-5.18.12/getdefs/test/Makefile.in --- autogen-5.18.7/getdefs/test/Makefile.in 2015-12-07 00:04:13.000000000 +0000 +++ autogen-5.18.12/getdefs/test/Makefile.in 2016-08-29 21:35:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = getdefs/test -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -97,6 +105,7 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -323,6 +332,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/config/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AGEN5_TESTS = @AGEN5_TESTS@ @@ -509,7 +520,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu getdefs/test/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu getdefs/test/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -570,7 +580,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -845,6 +855,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \ uninstall uninstall-am +.PRECIOUS: Makefile + distclean-local: -rm -rf *-testd FAILURES defs diff -Nru autogen-5.18.7/Makefile.am autogen-5.18.12/Makefile.am --- autogen-5.18.7/Makefile.am 2015-08-09 00:50:50.000000000 +0000 +++ autogen-5.18.12/Makefile.am 2015-08-09 00:50:50.000000000 +0000 @@ -2,7 +2,7 @@ ## Makefile.am --- process this file with automake to produce Makefile.in ## ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the diff -Nru autogen-5.18.7/Makefile.in autogen-5.18.12/Makefile.in --- autogen-5.18.7/Makefile.in 2015-12-07 00:04:12.000000000 +0000 +++ autogen-5.18.12/Makefile.in 2016-08-29 21:35:42.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,19 +93,6 @@ @DO_SHELL_CMDS_TRUE@@HAVE_XML_LIB_FALSE@am__append_2 = columns getdefs pkg @DO_SHELL_CMDS_FALSE@@HAVE_XML_LIB_TRUE@am__append_3 = xml2ag subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog COPYING \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config-h.in \ - $(top_srcdir)/autoopts/tpl/tpl-config-tlib.in \ - $(top_srcdir)/config/mk-shdefs.in THANKS TODO config/compile \ - config/config.guess config/config.rpath config/config.sub \ - config/install-sh config/missing config/ltmain.sh \ - $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \ - $(top_srcdir)/config/config.rpath \ - $(top_srcdir)/config/config.sub \ - $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ - $(top_srcdir)/config/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -112,6 +109,8 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -205,6 +204,17 @@ CSCOPE = cscope DIST_SUBDIRS = compat snprintfv autoopts agen5 columns getdefs xml2ag \ doc pkg +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config-h.in \ + $(top_srcdir)/autoopts/tpl/tpl-config-tlib.in \ + $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \ + $(top_srcdir)/config/config.rpath \ + $(top_srcdir)/config/config.sub \ + $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ + $(top_srcdir)/config/missing $(top_srcdir)/config/mk-shdefs.in \ + AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \ + config/compile config/config.guess config/config.rpath \ + config/config.sub config/install-sh config/ltmain.sh \ + config/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -452,7 +462,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -713,15 +722,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -757,17 +766,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -948,6 +957,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-pkgdataDATA +.PRECIOUS: Makefile + configure : VERSION diff -Nru autogen-5.18.7/NEWS autogen-5.18.12/NEWS --- autogen-5.18.7/NEWS 2015-12-07 00:03:48.000000000 +0000 +++ autogen-5.18.12/NEWS 2016-08-29 21:35:19.000000000 +0000 @@ -1,35 +1,35 @@ -New in 5.18.7 - December 2015 +New in 5.18.12 - August 2016 -* {AG,CL,GD}exe environment variables may be set to force - bootstrapping with a particular release. -* MAN_PAGE_DATE can be used with various man page docs to - override the current date default. -* project may now be bootstrapped and built in the source - directory with no ill effect. -* AutoGen as a daemon will never happen. Last vestiges gone. -* templates may now obtain the most recent source modification - time with "(max-file-time)" - -New in 5.18.5 April 2015 - -* Guile 1.6 is now obsolete. 1.7/8 or newer from now on. - Fixed issues with Guile managed locale string processing. - (It keeps getting better and better all the time and I - must keep adjusting over and over all the time.) -* for-each handler functions may now be able to free (or not) - the file text via the "handler-frees" attribute. - -New in 5.18.4 August 2014 - -* Do Not Edit (dne) warning: the default of printing a date in the - warning has now changed to not doing so. The "-d" option to - suppress the date is now deprecated (ignored). A new option, "-D" - will cause the date to be included. The environment variable, - "AUTOGEN_DNE_DATE" overrides everything. - -New in 5.18.3 May 2014 - -* Auto-edit Guile headers that depend upon configure values - most especially: noreturn - but check for "ptrdiff_t" in our configure too, so that Guile does - not create its own duplicate definition. +* several configury fixes to enable cross platform building. +* fompletion of a change in "char-mapper" to enable bootstrapping + +New in 5.18.11 May 2016 + +* fix up tests that got broken in 5.18.10 +* in the make gperf script, LDFLAGS sometimes rely on CFLAGS +* correct misuse of guile version information in configure + +New in 5.18.10 May 2016 + +* NUL terminate CGI definitions text + +New in 5.18.9 April 2016 + +* When parsing CGI, do not allow spaces to be lost +* In producing usage text, check more rigorously that + option "values" are really not flag characters. + +New in 5.18.8 March 2016 + +* Ensure testing vars start as unset for testing +* happy new year & de-uglifications + +New in 5.18.7 December 2015 + +* Guile 1.6 support was removed +* bootstrapping was made idempotent +* add --enable-static-autogen config option +* add (max-file-time) scheme function (max source file time) +* Allow MAN_PAGE_DATE to override using the date program in + man page templates +* Enable byte-for-byte build reproducibility diff -Nru autogen-5.18.7/pkg/Makefile.in autogen-5.18.12/pkg/Makefile.in --- autogen-5.18.7/pkg/Makefile.in 2015-12-07 00:04:13.000000000 +0000 +++ autogen-5.18.12/pkg/Makefile.in 2016-08-29 21:35:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = pkg -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/pkg-env.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -97,6 +105,7 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = pkg-env @@ -121,6 +130,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/pkg-env.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AGEN5_TESTS = @AGEN5_TESTS@ @@ -310,7 +320,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pkg/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu pkg/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -488,6 +497,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + all : $(DISTCLEANFILES) diff -Nru autogen-5.18.7/snprintfv/compat.h autogen-5.18.12/snprintfv/compat.h --- autogen-5.18.7/snprintfv/compat.h 2015-08-09 00:50:50.000000000 +0000 +++ autogen-5.18.12/snprintfv/compat.h 2016-03-08 16:58:38.000000000 +0000 @@ -29,7 +29,7 @@ #define SNPRINTFV_COMPAT_H 1 #define _GNU_SOURCE 1 /* for strsignal in GNU's libc */ -#define __USE_GNU 1 /* exact same thing as above */ +#define __USE_GNU 1 // likewise #define __EXTENSIONS__ 1 /* and another way to call for it */ #ifdef __cplusplus diff -Nru autogen-5.18.7/snprintfv/Makefile.in autogen-5.18.12/snprintfv/Makefile.in --- autogen-5.18.7/snprintfv/Makefile.in 2015-12-07 00:04:13.000000000 +0000 +++ autogen-5.18.12/snprintfv/Makefile.in 2016-08-29 21:35:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -82,9 +92,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = snprintfv -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp $(dist_noinst_DATA) \ - $(noinst_HEADERS) AUTHORS README THANKS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -101,6 +108,8 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ + $(noinst_HEADERS) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -179,6 +188,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \ + AUTHORS README THANKS DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AGEN5_TESTS = @AGEN5_TESTS@ @@ -371,7 +382,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu snprintfv/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu snprintfv/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -642,6 +652,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + snv.c : $(CSRC) for f in $(CSRC) ; do echo "#include \"$$f\"" ; done > $@ diff -Nru autogen-5.18.7/TODO autogen-5.18.12/TODO --- autogen-5.18.7/TODO 2015-12-07 00:03:48.000000000 +0000 +++ autogen-5.18.12/TODO 2016-08-29 21:35:19.000000000 +0000 @@ -1,3 +1,4 @@ # -*- Mode: Outline -*- * add test for new license. +* add manywarnings gnulib module diff -Nru autogen-5.18.7/VERSION autogen-5.18.12/VERSION --- autogen-5.18.7/VERSION 2015-12-07 00:03:48.000000000 +0000 +++ autogen-5.18.12/VERSION 2016-08-29 21:35:19.000000000 +0000 @@ -5,7 +5,7 @@ MAINTAINER='Bruce Korb ' ## This file is part of AutoGen. -## AutoGen Copyright (C) 1992-2015 by Bruce Korb - all rights reserved +## AutoGen Copyright (C) 1992-2016 by Bruce Korb - all rights reserved ## ## AutoGen is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the @@ -23,7 +23,7 @@ AG_MAJOR_VERSION=5 AG_MINOR_VERSION=18 AG_REVISION=$AG_MAJOR_VERSION.$AG_MINOR_VERSION -AG_PATCHLEVEL=.7 +AG_PATCHLEVEL=.12 AG_VERSION=$AG_REVISION$AG_PATCHLEVEL # AutoOpts versioning: diff -Nru autogen-5.18.7/xml2ag/Makefile.am autogen-5.18.12/xml2ag/Makefile.am --- autogen-5.18.7/xml2ag/Makefile.am 2015-08-08 23:12:01.000000000 +0000 +++ autogen-5.18.12/xml2ag/Makefile.am 2016-08-29 17:26:13.000000000 +0000 @@ -34,8 +34,6 @@ DOCFILES = invoke-$(TARG).texi invoke-$(TARG).menu $(TARG).1 DISTCLEANFILES = $(DOCFILES) $(nodist_xml2ag_SOURCES) stamp-* AM_CPPFLAGS = @INCLIST@ $(LIBXML2_CFLAGS) -AGexe = $(top_builddir)/agen5/autogen -CLexe = $(top_builddir)/columns/columns BOOTENV = top_srcdir="$(top_srcdir)" top_builddir="$(top_builddir)" \ PATH=`cd ../columns;pwd`:"$$PATH" CLexe="$(CLexe)" diff -Nru autogen-5.18.7/xml2ag/Makefile.in autogen-5.18.12/xml2ag/Makefile.in --- autogen-5.18.7/xml2ag/Makefile.in 2015-12-07 00:04:13.000000000 +0000 +++ autogen-5.18.12/xml2ag/Makefile.in 2016-08-29 21:35:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,8 +91,6 @@ target_triplet = @target@ bin_PROGRAMS = xml2ag$(EXEEXT) subdir = xml2ag -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -99,6 +107,7 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -222,6 +231,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -257,7 +267,7 @@ AG_TIMEOUT = @AG_TIMEOUT@ AG_VERSION = @AG_VERSION@ AG_XML2 = @AG_XML2@ -AGexe = $(top_builddir)/agen5/autogen +AGexe = @AGexe@ AGnam = @AGnam@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -274,7 +284,7 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CLexe = $(top_builddir)/columns/columns +CLexe = @CLexe@ CLnam = @CLnam@ CONFIG_SHELL = @CONFIG_SHELL@ CPP = @CPP@ @@ -453,7 +463,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu xml2ag/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu xml2ag/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -890,6 +899,8 @@ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-man uninstall-man1 +.PRECIOUS: Makefile + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stamp-opts.d@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stamp-texi.d@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stamp-man.d@am__quote@ diff -Nru autogen-5.18.7/xml2ag/test/Makefile.in autogen-5.18.12/xml2ag/test/Makefile.in --- autogen-5.18.7/xml2ag/test/Makefile.in 2015-12-07 00:04:13.000000000 +0000 +++ autogen-5.18.12/xml2ag/test/Makefile.in 2016-08-29 21:35:43.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ host_triplet = @host@ target_triplet = @target@ subdir = xml2ag/test -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ag_macros.m4 \ $(top_srcdir)/config/extensions.m4 \ @@ -97,6 +105,7 @@ $(top_srcdir)/config/unlocked-io.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -323,6 +332,8 @@ *) \ b='$*';; \ esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/config/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AGEN5_TESTS = @AGEN5_TESTS@ @@ -509,7 +520,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu xml2ag/test/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu xml2ag/test/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -570,7 +580,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -845,6 +855,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \ uninstall uninstall-am +.PRECIOUS: Makefile + distclean-local: -rm -rf testdir FAILURES