diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | lib/.gitignore | 1 | ||||
| -rw-r--r-- | lib/command.h | 5 | ||||
| -rw-r--r-- | lib/distribute.c | 8 | ||||
| -rw-r--r-- | lib/memtypes.h | 249 | ||||
| -rw-r--r-- | ospf6d/ospf6_top.c | 5 | ||||
| -rw-r--r-- | ospf6d/ospf6d.c | 31 | ||||
| -rw-r--r-- | vtysh/vtysh.c | 1 | ||||
| -rwxr-xr-x | ylwrap | 247 |
9 files changed, 27 insertions, 521 deletions
diff --git a/.gitignore b/.gitignore index ddaf6e240e..4c90eb00d6 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ depcomp missing install-sh mkinstalldirs +ylwrap autom4te*.cache configure.lineno configure diff --git a/lib/.gitignore b/lib/.gitignore index e45fec1786..87d9bbdb37 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -15,6 +15,7 @@ gitversion.h.tmp *~ *.loT route_types.h +memtypes.h command_lex.c command_parse.c command_parse.h diff --git a/lib/command.h b/lib/command.h index f5572f7f83..f120063ea9 100644 --- a/lib/command.h +++ b/lib/command.h @@ -386,14 +386,9 @@ struct cmd_element /* IPv4 only machine should not accept IPv6 address for peer's IP address. So we replace VTY command string like below. */ -#ifdef HAVE_IPV6 #define NEIGHBOR_ADDR_STR "Neighbor address\nIPv6 address\n" #define NEIGHBOR_ADDR_STR2 "Neighbor address\nNeighbor IPv6 address\nInterface name or neighbor tag\n" #define NEIGHBOR_ADDR_STR3 "Neighbor address\nIPv6 address\nInterface name\n" -#else -#define NEIGHBOR_ADDR_STR "Neighbor address\n" -#define NEIGHBOR_ADDR_STR2 "Neighbor address\nNeighbor tag\n" -#endif /* HAVE_IPV6 */ /* Prototypes. */ extern void install_node (struct cmd_node *, int (*) (struct vty *)); diff --git a/lib/distribute.c b/lib/distribute.c index 8726e993c5..09f5c8a464 100644 --- a/lib/distribute.c +++ b/lib/distribute.c @@ -525,10 +525,16 @@ distribute_list_init (int node) install_element (node, &distribute_list_cmd); install_element (node, &no_distribute_list_cmd); +/* + install_element (RIP_NODE, &distribute_list_cmd); + install_element (RIP_NODE, &no_distribute_list_cmd); + install_element (RIPNG_NODE, &distribute_list_cmd); + install_element (RIPNG_NODE, &no_distribute_list_cmd); + */ /* install v6 */ if (node == RIPNG_NODE) { - install_element (node, &ipv6_distribute_list_cmd); + install_element (RIPNG_NODE, &ipv6_distribute_list_cmd); } /* TODO: install v4 syntax command for v6 only protocols. */ diff --git a/lib/memtypes.h b/lib/memtypes.h deleted file mode 100644 index c9300bd9b1..0000000000 --- a/lib/memtypes.h +++ /dev/null @@ -1,249 +0,0 @@ -/* Auto-generated from memtypes.c by gawk. */ -/* Do not edit! */ - -#ifndef _QUAGGA_MEMTYPES_H -#define _QUAGGA_MEMTYPES_H - -enum -{ - MTYPE_TMP = 1, - MTYPE_STRVEC, - MTYPE_VECTOR, - MTYPE_VECTOR_INDEX, - MTYPE_LINK_LIST, - MTYPE_LINK_NODE, - MTYPE_THREAD, - MTYPE_THREAD_MASTER, - MTYPE_THREAD_STATS, - MTYPE_VTY, - MTYPE_VTY_OUT_BUF, - MTYPE_VTY_HIST, - MTYPE_IF, - MTYPE_CONNECTED, - MTYPE_NBR_CONNECTED, - MTYPE_CONNECTED_LABEL, - MTYPE_BUFFER, - MTYPE_BUFFER_DATA, - MTYPE_STREAM, - MTYPE_STREAM_DATA, - MTYPE_STREAM_FIFO, - MTYPE_PREFIX, - MTYPE_PREFIX_IPV4, - MTYPE_PREFIX_IPV6, - MTYPE_HASH, - MTYPE_HASH_BACKET, - MTYPE_HASH_INDEX, - MTYPE_ROUTE_TABLE, - MTYPE_ROUTE_NODE, - MTYPE_DISTRIBUTE, - MTYPE_DISTRIBUTE_IFNAME, - MTYPE_DISTRIBUTE_NAME, - MTYPE_ACCESS_LIST, - MTYPE_ACCESS_LIST_STR, - MTYPE_ACCESS_FILTER, - MTYPE_PREFIX_LIST, - MTYPE_PREFIX_LIST_ENTRY, - MTYPE_PREFIX_LIST_STR, - MTYPE_PREFIX_LIST_TRIE, - MTYPE_ROUTE_MAP, - MTYPE_ROUTE_MAP_NAME, - MTYPE_ROUTE_MAP_INDEX, - MTYPE_ROUTE_MAP_RULE, - MTYPE_ROUTE_MAP_RULE_STR, - MTYPE_ROUTE_MAP_COMPILED, - MTYPE_ROUTE_MAP_DEP, - MTYPE_CMD_TOKENS, - MTYPE_KEY, - MTYPE_KEYCHAIN, - MTYPE_IF_RMAP, - MTYPE_IF_RMAP_NAME, - MTYPE_SOCKUNION, - MTYPE_PRIVS, - MTYPE_ZLOG, - MTYPE_ZCLIENT, - MTYPE_WORK_QUEUE, - MTYPE_WORK_QUEUE_ITEM, - MTYPE_WORK_QUEUE_NAME, - MTYPE_PQUEUE, - MTYPE_PQUEUE_DATA, - MTYPE_HOST, - MTYPE_BFD_INFO, - MTYPE_VRF, - MTYPE_VRF_NAME, - MTYPE_VRF_BITMAP, - MTYPE_RTADV_PREFIX, - MTYPE_ZEBRA_NS, - MTYPE_ZEBRA_VRF, - MTYPE_NEXTHOP, - MTYPE_RIB, - MTYPE_RIB_QUEUE, - MTYPE_STATIC_ROUTE, - MTYPE_RIB_DEST, - MTYPE_RIB_TABLE_INFO, - MTYPE_RNH, - MTYPE_NETLINK_NAME, - MTYPE_BGP, - MTYPE_BGP_LISTENER, - MTYPE_BGP_PEER, - MTYPE_BGP_PEER_HOST, - MTYPE_BGP_PEER_IFNAME, - MTYPE_BGP_PEER_GROUP, - MTYPE_BGP_PEER_GROUP_HOST, - MTYPE_PEER_DESC, - MTYPE_PEER_PASSWORD, - MTYPE_BGP_PEER_AF, - MTYPE_BGP_UPDGRP, - MTYPE_BGP_UPD_SUBGRP, - MTYPE_BGP_PACKET, - MTYPE_ATTR, - MTYPE_ATTR_EXTRA, - MTYPE_AS_PATH, - MTYPE_AS_SEG, - MTYPE_AS_SEG_DATA, - MTYPE_AS_STR, - MTYPE_BGP_TABLE, - MTYPE_BGP_NODE, - MTYPE_BGP_ROUTE, - MTYPE_BGP_ROUTE_EXTRA, - MTYPE_BGP_CONN, - MTYPE_BGP_STATIC, - MTYPE_BGP_ADVERTISE_ATTR, - MTYPE_BGP_ADVERTISE, - MTYPE_BGP_SYNCHRONISE, - MTYPE_BGP_ADJ_IN, - MTYPE_BGP_ADJ_OUT, - MTYPE_BGP_MPATH_INFO, - MTYPE_AS_LIST, - MTYPE_AS_FILTER, - MTYPE_AS_FILTER_STR, - MTYPE_COMMUNITY, - MTYPE_COMMUNITY_VAL, - MTYPE_COMMUNITY_STR, - MTYPE_ECOMMUNITY, - MTYPE_ECOMMUNITY_VAL, - MTYPE_ECOMMUNITY_STR, - MTYPE_COMMUNITY_LIST, - MTYPE_COMMUNITY_LIST_NAME, - MTYPE_COMMUNITY_LIST_ENTRY, - MTYPE_COMMUNITY_LIST_CONFIG, - MTYPE_COMMUNITY_LIST_HANDLER, - MTYPE_CLUSTER, - MTYPE_CLUSTER_VAL, - MTYPE_BGP_PROCESS_QUEUE, - MTYPE_BGP_CLEAR_NODE_QUEUE, - MTYPE_TRANSIT, - MTYPE_TRANSIT_VAL, - MTYPE_BGP_DEBUG_FILTER, - MTYPE_BGP_DEBUG_STR, - MTYPE_BGP_DISTANCE, - MTYPE_BGP_NEXTHOP_CACHE, - MTYPE_BGP_CONFED_LIST, - MTYPE_PEER_UPDATE_SOURCE, - MTYPE_PEER_CONF_IF, - MTYPE_BGP_DAMP_INFO, - MTYPE_BGP_DAMP_ARRAY, - MTYPE_BGP_REGEXP, - MTYPE_BGP_AGGREGATE, - MTYPE_BGP_ADDR, - MTYPE_BGP_REDIST, - MTYPE_BGP_FILTER_NAME, - MTYPE_BGP_DUMP_STR, - MTYPE_ENCAP_TLV, - MTYPE_RIP, - MTYPE_RIP_INFO, - MTYPE_RIP_INTERFACE, - MTYPE_RIP_PEER, - MTYPE_RIP_OFFSET_LIST, - MTYPE_RIP_DISTANCE, - MTYPE_RIPNG, - MTYPE_RIPNG_ROUTE, - MTYPE_RIPNG_AGGREGATE, - MTYPE_RIPNG_PEER, - MTYPE_RIPNG_OFFSET_LIST, - MTYPE_RIPNG_RTE_DATA, - MTYPE_OSPF_TOP, - MTYPE_OSPF_AREA, - MTYPE_OSPF_AREA_RANGE, - MTYPE_OSPF_NETWORK, - MTYPE_OSPF_NEIGHBOR_STATIC, - MTYPE_OSPF_IF, - MTYPE_OSPF_NEIGHBOR, - MTYPE_OSPF_ROUTE, - MTYPE_OSPF_TMP, - MTYPE_OSPF_LSA, - MTYPE_OSPF_LSA_DATA, - MTYPE_OSPF_LSDB, - MTYPE_OSPF_PACKET, - MTYPE_OSPF_FIFO, - MTYPE_OSPF_VERTEX, - MTYPE_OSPF_VERTEX_PARENT, - MTYPE_OSPF_NEXTHOP, - MTYPE_OSPF_PATH, - MTYPE_OSPF_VL_DATA, - MTYPE_OSPF_CRYPT_KEY, - MTYPE_OSPF_EXTERNAL_INFO, - MTYPE_OSPF_DISTANCE, - MTYPE_OSPF_IF_INFO, - MTYPE_OSPF_IF_PARAMS, - MTYPE_OSPF_MESSAGE, - MTYPE_OSPF6_TOP, - MTYPE_OSPF6_AREA, - MTYPE_OSPF6_IF, - MTYPE_OSPF6_NEIGHBOR, - MTYPE_OSPF6_ROUTE, - MTYPE_OSPF6_PREFIX, - MTYPE_OSPF6_MESSAGE, - MTYPE_OSPF6_LSA, - MTYPE_OSPF6_LSA_SUMMARY, - MTYPE_OSPF6_LSDB, - MTYPE_OSPF6_VERTEX, - MTYPE_OSPF6_SPFTREE, - MTYPE_OSPF6_NEXTHOP, - MTYPE_OSPF6_EXTERNAL_INFO, - MTYPE_OSPF6_OTHER, - MTYPE_ISIS, - MTYPE_ISIS_TMP, - MTYPE_ISIS_CIRCUIT, - MTYPE_ISIS_LSP, - MTYPE_ISIS_ADJACENCY, - MTYPE_ISIS_AREA, - MTYPE_ISIS_AREA_ADDR, - MTYPE_ISIS_TLV, - MTYPE_ISIS_DYNHN, - MTYPE_ISIS_SPFTREE, - MTYPE_ISIS_VERTEX, - MTYPE_ISIS_ROUTE_INFO, - MTYPE_ISIS_NEXTHOP, - MTYPE_ISIS_NEXTHOP6, - MTYPE_ISIS_DICT, - MTYPE_ISIS_DICT_NODE, - MTYPE_PIM_CHANNEL_OIL, - MTYPE_PIM_INTERFACE, - MTYPE_PIM_IGMP_JOIN, - MTYPE_PIM_IGMP_SOCKET, - MTYPE_PIM_IGMP_GROUP, - MTYPE_PIM_IGMP_GROUP_SOURCE, - MTYPE_PIM_NEIGHBOR, - MTYPE_PIM_IFCHANNEL, - MTYPE_PIM_UPSTREAM, - MTYPE_PIM_SSMPINGD, - MTYPE_PIM_STATIC_ROUTE, - MTYPE_PIM_BR, - MTYPE_VTYSH_CONFIG, - MTYPE_VTYSH_CONFIG_LINE, - MTYPE_MAX, -}; - -extern struct memory_list memory_list_lib[]; -extern struct memory_list memory_list_zebra[]; -extern struct memory_list memory_list_bgp[]; -extern struct memory_list memory_list_rip[]; -extern struct memory_list memory_list_ripng[]; -extern struct memory_list memory_list_ospf[]; -extern struct memory_list memory_list_ospf6[]; -extern struct memory_list memory_list_isis[]; -extern struct memory_list memory_list_pim[]; -extern struct memory_list memory_list_vtysh[]; - -#endif /* _QUAGGA_MEMTYPES_H */ - diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 32ec2731d6..4c50828e18 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -1191,12 +1191,13 @@ ospf6_top_init (void) install_element (OSPF6_NODE, &no_ospf6_interface_area_cmd); install_element (OSPF6_NODE, &ospf6_stub_router_admin_cmd); install_element (OSPF6_NODE, &no_ospf6_stub_router_admin_cmd); - /* For a later time + /* For a later time */ +#if 0 install_element (OSPF6_NODE, &ospf6_stub_router_startup_cmd); install_element (OSPF6_NODE, &no_ospf6_stub_router_startup_cmd); install_element (OSPF6_NODE, &ospf6_stub_router_shutdown_cmd); install_element (OSPF6_NODE, &no_ospf6_stub_router_shutdown_cmd); - */ +#endif install_element (OSPF6_NODE, &ospf6_distance_cmd); install_element (OSPF6_NODE, &no_ospf6_distance_cmd); diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c index c3b4005d1d..c66a124890 100644 --- a/ospf6d/ospf6d.c +++ b/ospf6d/ospf6d.c @@ -1243,23 +1243,20 @@ ospf6_init (void) install_element (VIEW_NODE, &show_ipv6_ospf6_linkstate_cmd); install_element (VIEW_NODE, &show_ipv6_ospf6_linkstate_detail_cmd); -#define INSTALL(n,c) \ - install_element (n ## _NODE, &show_ipv6_ospf6_ ## c) - - INSTALL (VIEW, database_cmd); - INSTALL (VIEW, database_type_cmd); - INSTALL (VIEW, database_id_cmd); - INSTALL (VIEW, database_router_cmd); - INSTALL (VIEW, database_type_id_cmd); - INSTALL (VIEW, database_type_router_cmd); - INSTALL (VIEW, database_adv_router_linkstate_id_cmd); - INSTALL (VIEW, database_id_router_cmd); - INSTALL (VIEW, database_type_id_router_cmd); - INSTALL (VIEW, database_type_adv_router_linkstate_id_cmd); - INSTALL (VIEW, database_self_originated_cmd); - INSTALL (VIEW, database_type_self_originated_cmd); - INSTALL (VIEW, database_type_id_self_originated_cmd); - INSTALL (VIEW, database_type_self_originated_linkstate_id_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_id_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_router_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_id_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_router_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_adv_router_linkstate_id_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_id_router_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_id_router_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_adv_router_linkstate_id_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_self_originated_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_self_originated_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_id_self_originated_cmd); + install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_self_originated_linkstate_id_cmd); /* Make ospf protocol socket. */ ospf6_serv_sock (); diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 177f2a5b20..6a14aab639 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -2994,6 +2994,7 @@ void vtysh_readline_init (void) { /* readline related settings. */ + rl_initialize (); rl_bind_key ('?', (rl_command_func_t *) vtysh_rl_describe); rl_completion_entry_function = vtysh_completion_entry_function; rl_attempted_completion_function = (rl_completion_func_t *)new_completion; diff --git a/ylwrap b/ylwrap deleted file mode 100755 index 8f072a8e97..0000000000 --- a/ylwrap +++ /dev/null @@ -1,247 +0,0 @@ -#! /bin/sh -# ylwrap - wrapper for lex/yacc invocations. - -scriptversion=2013-01-12.17; # UTC - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# -# Written by Tom Tromey <tromey@cygnus.com>. -# -# 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 Software Foundation; either version 2, 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. - -get_dirname () -{ - case $1 in - */*|*\\*) printf '%s\n' "$1" | sed -e 's|\([\\/]\)[^\\/]*$|\1|';; - # Otherwise, we want the empty string (not "."). - esac -} - -# guard FILE -# ---------- -# The CPP macro used to guard inclusion of FILE. -guard () -{ - printf '%s\n' "$1" \ - | sed \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ - -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g' \ - -e 's/__*/_/g' -} - -# quote_for_sed [STRING] -# ---------------------- -# Return STRING (or stdin) quoted to be used as a sed pattern. -quote_for_sed () -{ - case $# in - 0) cat;; - 1) printf '%s\n' "$1";; - esac \ - | sed -e 's|[][\\.*]|\\&|g' -} - -case "$1" in - '') - echo "$0: No files given. Try '$0 --help' for more information." 1>&2 - exit 1 - ;; - --basedir) - basedir=$2 - shift 2 - ;; - -h|--h*) - cat <<\EOF -Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]... - -Wrapper for lex/yacc invocations, renaming files as desired. - - INPUT is the input file - OUTPUT is one file PROG generates - DESIRED is the file we actually want instead of OUTPUT - PROGRAM is program to run - ARGS are passed to PROG - -Any number of OUTPUT,DESIRED pairs may be used. - -Report bugs to <bug-automake@gnu.org>. -EOF - exit $? - ;; - -v|--v*) - echo "ylwrap $scriptversion" - exit $? - ;; -esac - - -# The input. -input=$1 -shift -# We'll later need for a correct munging of "#line" directives. -input_sub_rx=`get_dirname "$input" | quote_for_sed` -case $input in - [\\/]* | ?:[\\/]*) - # Absolute path; do nothing. - ;; - *) - # Relative path. Make it absolute. - input=`pwd`/$input - ;; -esac -input_rx=`get_dirname "$input" | quote_for_sed` - -# Since DOS filename conventions don't allow two dots, -# the DOS version of Bison writes out y_tab.c instead of y.tab.c -# and y_tab.h instead of y.tab.h. Test to see if this is the case. -y_tab_nodot=false -if test -f y_tab.c || test -f y_tab.h; then - y_tab_nodot=true -fi - -# The parser itself, the first file, is the destination of the .y.c -# rule in the Makefile. -parser=$1 - -# A sed program to s/FROM/TO/g for all the FROM/TO so that, for -# instance, we rename #include "y.tab.h" into #include "parse.h" -# during the conversion from y.tab.c to parse.c. -sed_fix_filenames= - -# Also rename header guards, as Bison 2.7 for instance uses its header -# guard in its implementation file. -sed_fix_header_guards= - -while test $# -ne 0; do - if test x"$1" = x"--"; then - shift - break - fi - from=$1 - # Handle y_tab.c and y_tab.h output by DOS - if $y_tab_nodot; then - case $from in - "y.tab.c") from=y_tab.c;; - "y.tab.h") from=y_tab.h;; - esac - fi - shift - to=$1 - shift - sed_fix_filenames="${sed_fix_filenames}s|"`quote_for_sed "$from"`"|$to|g;" - sed_fix_header_guards="${sed_fix_header_guards}s|"`guard "$from"`"|"`guard "$to"`"|g;" -done - -# The program to run. -prog=$1 -shift -# Make any relative path in $prog absolute. -case $prog in - [\\/]* | ?:[\\/]*) ;; - *[\\/]*) prog=`pwd`/$prog ;; -esac - -dirname=ylwrap$$ -do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret' -trap "ret=129; $do_exit" 1 -trap "ret=130; $do_exit" 2 -trap "ret=141; $do_exit" 13 -trap "ret=143; $do_exit" 15 -mkdir $dirname || exit 1 - -cd $dirname - -case $# in - 0) "$prog" "$input" ;; - *) "$prog" "$@" "$input" ;; -esac -ret=$? - -if test $ret -eq 0; then - for from in * - do - to=`printf '%s\n' "$from" | sed "$sed_fix_filenames"` - if test -f "$from"; then - # If $2 is an absolute path name, then just use that, - # otherwise prepend '../'. - case $to in - [\\/]* | ?:[\\/]*) target=$to;; - *) target=../$to;; - esac - - # Do not overwrite unchanged header files to avoid useless - # recompilations. Always update the parser itself: it is the - # destination of the .y.c rule in the Makefile. Divert the - # output of all other files to a temporary file so we can - # compare them to existing versions. - if test $from != $parser; then - realtarget=$target - target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'` - fi - - # Munge "#line" or "#" directives. Don't let the resulting - # debug information point at an absolute srcdir. Use the real - # output file name, not yy.lex.c for instance. Adjust the - # include guards too. - sed -e "/^#/!b" \ - -e "s|$input_rx|$input_sub_rx|" \ - -e "$sed_fix_filenames" \ - -e "$sed_fix_header_guards" \ - "$from" >"$target" || ret=$? - - # Check whether files must be updated. - if test "$from" != "$parser"; then - if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then - echo "$to is unchanged" - rm -f "$target" - else - echo "updating $to" - mv -f "$target" "$realtarget" - fi - fi - else - # A missing file is only an error for the parser. This is a - # blatant hack to let us support using "yacc -d". If -d is not - # specified, don't fail when the header file is "missing". - if test "$from" = "$parser"; then - ret=1 - fi - fi - done -fi - -# Remove the directory. -cd .. -rm -rf $dirname - -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: |