From ab699e71adebb875bafa8fd5b0b0b6e36e8407b6 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sun, 4 Nov 2012 21:31:34 +0000 Subject: [PATCH] build-sys: add gnulib This will mean better portability, and a good reason to get rid of various portability autotools directives which where part of this project. Signed-off-by: Sami Kerola --- .gitignore | 54 +- Makefile.am | 3 +- autogen.sh | 79 --- bootstrap | 977 +++++++++++++++++++++++++++++++++++ bootstrap.conf | 87 ++++ build-aux/.gitignore | 8 + build-aux/snippet/.gitignore | 5 + configure.ac | 6 +- lib/.gitignore | 161 ++++++ m4/.gitignore | 0 snippet/.gitignore | 5 + src/Makefile.am | 4 +- src/dhcpd-pools.c | 28 +- src/dhcpd-pools.h | 12 - src/getdata.c | 33 +- src/hash.c | 3 +- src/other.c | 94 +--- src/output.c | 6 +- 18 files changed, 1309 insertions(+), 256 deletions(-) delete mode 100755 autogen.sh create mode 100755 bootstrap create mode 100644 bootstrap.conf create mode 100644 build-aux/.gitignore create mode 100644 build-aux/snippet/.gitignore create mode 100644 lib/.gitignore delete mode 100644 m4/.gitignore create mode 100644 snippet/.gitignore diff --git a/.gitignore b/.gitignore index 5939e9c..23138cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,27 +1,27 @@ -aclocal.m4 -autom4te.cache/ -autoscan.log -config.guess -config.h -config.h.in -config.h.in~ -config.log -config.status -config.sub -configure -configure.scan -contrib/Makefile -contrib/Makefile.in -depcomp -INSTALL -install-sh -libtool -ltmain.sh -m4/*.m4 -Makefile -Makefile.in -man/Makefile -man/Makefile.in -missing -stamp-h1 -tags +/aclocal.m4 +/autom4te.cache/ +/autoscan.log +/config.guess +/config.h +/config.h.in +/config.h.in~ +/config.log +/config.status +/config.sub +/configure +/configure.scan +/contrib/Makefile +/contrib/Makefile.in +/depcomp +/INSTALL +/install-sh +/libtool +/ltmain.sh +/m4 +/Makefile +/Makefile.in +/man/Makefile +/man/Makefile.in +/missing +/stamp-h1 +/tags diff --git a/Makefile.am b/Makefile.am index 091465b..22158cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,4 +3,5 @@ AUTOMAKE_OPTIONS = gnu ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src man contrib +EXTRA_DIST = m4/gnulib-cache.m4 +SUBDIRS = lib src man contrib diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index a8112e8..0000000 --- a/autogen.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -# -# Helps generate autoconf/automake stuff, when code is checked -# out from SCM. -# -# The script is copied from util-linux package. -# - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -THEDIR=`pwd` -cd $srcdir -DIE=0 - -test -f src/dhcpd-pools.c || { - echo - echo "You must run this script in the top-level dhcpd-pools directory" - echo - DIE=1 -} - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to generate dhcpd-pools build system." - echo - DIE=1 -} -(autoheader --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoheader installed to generate dhcpd-pools build system." - echo "The autoheader command is part of the GNU autoconf package." - echo - DIE=1 -} -(libtool --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have libtool-2 installed to generate dhcpd-pools build system." - echo - DIE=1 -} -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have automake installed to generate dhcpd-pools build system." - echo - DIE=1 -} - -ltver=$(libtoolize --version | awk '/^libtoolize/ { print $4 }') -test ${ltver##2.} = "$ltver" && { - echo "You must have libtool version >= 2.x.x, but you have $ltver." - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -echo -echo "Generate build-system by:" -echo " aclocal: $(aclocal --version | head -1)" -echo " autoconf: $(autoconf --version | head -1)" -echo " autoheader: $(autoheader --version | head -1)" -echo " automake: $(automake --version | head -1)" -echo " libtoolize: $(libtoolize --version | head -1)" - -set -e -libtoolize --force $LT_OPTS -aclocal $AL_OPTS -autoconf $AC_OPTS -autoheader $AH_OPTS -automake --add-missing $AM_OPTS - -cd $THEDIR - -echo -echo "Now type '$srcdir/configure' and 'make' to compile." -echo diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000..6df39df --- /dev/null +++ b/bootstrap @@ -0,0 +1,977 @@ +#! /bin/sh +# Print a version string. +scriptversion=2012-07-19.14; # UTC + +# Bootstrap this package from checked-out sources. + +# Copyright (C) 2003-2012 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 +# the Free Software Foundation, either version 3 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 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 . + +# Originally written by Paul Eggert. The canonical version of this +# script is maintained as build-aux/bootstrap in gnulib, however, to +# be useful to your project, you should place a copy of it under +# version control in the top-level directory of your project. The +# intent is that all customization can be done with a bootstrap.conf +# file also maintained in your version control; gnulib comes with a +# template build-aux/bootstrap.conf to get you started. + +# Please report bugs or propose patches to bug-gnulib@gnu.org. + +nl=' +' + +# Ensure file names are sorted consistently across platforms. +LC_ALL=C +export LC_ALL + +# Ensure that CDPATH is not set. Otherwise, the output from cd +# would cause trouble in at least one use below. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +local_gl_dir=gl + +me=$0 + +usage() { + cat <&2 +} + +# warn_ WORD1... +warn_ () +{ + # If IFS does not start with ' ', set it and emit the warning in a subshell. + case $IFS in + ' '*) warnf_ '%s\n' "$*";; + *) (IFS=' '; warn_ "$@");; + esac +} + +# die WORD1... +die() { warn_ "$@"; exit 1; } + +# Configuration. + +# Name of the Makefile.am +gnulib_mk=gnulib.mk + +# List of gnulib modules needed. +gnulib_modules= + +# Any gnulib files needed that are not in modules. +gnulib_files= + +: ${AUTOPOINT=autopoint} +: ${AUTORECONF=autoreconf} + +# A function to be called right after gnulib-tool is run. +# Override it via your own definition in bootstrap.conf. +bootstrap_post_import_hook() { :; } + +# A function to be called after everything else in this script. +# Override it via your own definition in bootstrap.conf. +bootstrap_epilogue() { :; } + +# The command to download all .po files for a specified domain into +# a specified directory. Fill in the first %s is the domain name, and +# the second with the destination directory. Use rsync's -L and -r +# options because the latest/%s directory and the .po files within are +# all symlinks. +po_download_command_format=\ +"rsync --delete --exclude '*.s1' -Lrtvz \ + 'translationproject.org::tp/latest/%s/' '%s'" + +# Fallback for downloading .po files (if rsync fails). +po_download_command_format2=\ +"wget --mirror -nd -q -np -A.po -P '%s' \ + http://translationproject.org/latest/%s/" + +extract_package_name=' + /^AC_INIT(/{ + /.*,.*,.*, */{ + s/// + s/[][]//g + s/)$// + p + q + } + s/AC_INIT(\[*// + s/]*,.*// + s/^GNU // + y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + s/[^A-Za-z0-9_]/-/g + s/-/_/g + p + } +' +package=$(sed -n "$extract_package_name" configure.ac) \ + || die 'cannot find package name in configure.ac' +gnulib_name=lib$package + +build_aux=build-aux +source_base=lib +m4_base=m4 +doc_base=doc +tests_base=tests +gnulib_extra_files='' + +# Additional gnulib-tool options to use. Use "\newline" to break lines. +gnulib_tool_option_extras= + +# Other locale categories that need message catalogs. +EXTRA_LOCALE_CATEGORIES= + +# Additional xgettext options to use. Use "\\\newline" to break lines. +XGETTEXT_OPTIONS='\\\ + --flag=_:1:pass-c-format\\\ + --flag=N_:1:pass-c-format\\\ + --flag=error:3:c-format --flag=error_at_line:5:c-format\\\ +' + +# Package bug report address and copyright holder for gettext files +COPYRIGHT_HOLDER='Sami Kerola' +MSGID_BUGS_ADDRESS=kerolasa@iki.fi + +# Files we don't want to import. +excluded_files= + +# File that should exist in the top directory of a checked out hierarchy, +# but not in a distribution tarball. +checkout_only_file=TODO + +# Whether to use copies instead of symlinks. +copy=false + +# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want +# those files to be generated in directories like lib/, m4/, and po/. +# Or set it to 'auto' to make this script select which to use based +# on which version control system (if any) is used in the source directory. +vc_ignore=auto + +# Set this to true in bootstrap.conf to enable --bootstrap-sync by +# default. +bootstrap_sync=false + +# Use git to update gnulib sources +use_git=true + +# find_tool ENVVAR NAMES... +# ------------------------- +# Search for a required program. Use the value of ENVVAR, if set, +# otherwise find the first of the NAMES that can be run (i.e., +# supports --version). If found, set ENVVAR to the program name, +# die otherwise. +# +# FIXME: code duplication, see also gnu-web-doc-update. +find_tool () +{ + find_tool_envvar=$1 + shift + find_tool_names=$@ + eval "find_tool_res=\$$find_tool_envvar" + if test x"$find_tool_res" = x; then + for i + do + if ($i --version /dev/null 2>&1; then + find_tool_res=$i + break + fi + done + else + find_tool_error_prefix="\$$find_tool_envvar: " + fi + test x"$find_tool_res" != x \ + || die "one of these is required: $find_tool_names" + ($find_tool_res --version /dev/null 2>&1 \ + || die "${find_tool_error_prefix}cannot run $find_tool_res --version" + eval "$find_tool_envvar=\$find_tool_res" + eval "export $find_tool_envvar" +} + +# Find sha1sum, named gsha1sum on MacPorts, and shasum on Mac OS X 10.6. +find_tool SHA1SUM sha1sum gsha1sum shasum + +# Override the default configuration, if necessary. +# Make sure that bootstrap.conf is sourced from the current directory +# if we were invoked as "sh bootstrap". +case "$0" in + */*) test -r "$0.conf" && . "$0.conf" ;; + *) test -r "$0.conf" && . ./"$0.conf" ;; +esac + +# Extra files from gnulib, which override files from other sources. +test -z "${gnulib_extra_files}" && \ + gnulib_extra_files=" + $build_aux/install-sh + $build_aux/mdate-sh + $build_aux/texinfo.tex + $build_aux/depcomp + $build_aux/config.guess + $build_aux/config.sub + doc/INSTALL +" + +if test "$vc_ignore" = auto; then + vc_ignore= + test -d .git && vc_ignore=.gitignore + test -d CVS && vc_ignore="$vc_ignore .cvsignore" +fi + +# Translate configuration into internal form. + +# Parse options. + +for option +do + case $option in + --help) + usage + exit;; + --gnulib-srcdir=*) + GNULIB_SRCDIR=${option#--gnulib-srcdir=};; + --skip-po) + SKIP_PO=t;; + --force) + checkout_only_file=;; + --copy) + copy=true;; + --bootstrap-sync) + bootstrap_sync=true;; + --no-bootstrap-sync) + bootstrap_sync=false;; + --no-git) + use_git=false;; + *) + die "$option: unknown option";; + esac +done + +$use_git || test -d "$GNULIB_SRCDIR" \ + || die "Error: --no-git requires --gnulib-srcdir" + +if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then + die "Bootstrapping from a non-checked-out distribution is risky." +fi + +# Ensure that lines starting with ! sort last, per gitignore conventions +# for whitelisting exceptions after a more generic blacklist pattern. +sort_patterns() { + sort -u "$@" | sed '/^!/ { + H + d + } + $ { + P + x + s/^\n// + }' | sed '/^$/d' +} + +# If $STR is not already on a line by itself in $FILE, insert it, +# sorting the new contents of the file and replacing $FILE with the result. +insert_sorted_if_absent() { + file=$1 + str=$2 + test -f $file || touch $file + echo "$str" | sort_patterns - $file | cmp -s - $file > /dev/null \ + || { echo "$str" | sort_patterns - $file > $file.bak \ + && mv $file.bak $file; } \ + || die "insert_sorted_if_absent $file $str: failed" +} + +# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with +# insert_sorted_if_absent. +insert_vc_ignore() { + vc_ignore_file="$1" + pattern="$2" + case $vc_ignore_file in + *.gitignore) + # A .gitignore entry that does not start with '/' applies + # recursively to subdirectories, so prepend '/' to every + # .gitignore entry. + pattern=$(echo "$pattern" | sed s,^,/,);; + esac + insert_sorted_if_absent "$vc_ignore_file" "$pattern" +} + +# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. +found_aux_dir=no +grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \ + >/dev/null && found_aux_dir=yes +grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ + >/dev/null && found_aux_dir=yes +test $found_aux_dir = yes \ + || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it" + +# If $build_aux doesn't exist, create it now, otherwise some bits +# below will malfunction. If creating it, also mark it as ignored. +if test ! -d $build_aux; then + mkdir $build_aux + for dot_ig in x $vc_ignore; do + test $dot_ig = x && continue + insert_vc_ignore $dot_ig $build_aux + done +fi + +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +sort_ver() { # sort -V is not generally available + ver1="$1" + ver2="$2" + + # split on '.' and compare each component + i=1 + while : ; do + p1=$(echo "$ver1" | cut -d. -f$i) + p2=$(echo "$ver2" | cut -d. -f$i) + if [ ! "$p1" ]; then + echo "$1 $2" + break + elif [ ! "$p2" ]; then + echo "$2 $1" + break + elif [ ! "$p1" = "$p2" ]; then + if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison + echo "$2 $1" + elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison + echo "$1 $2" + else # numeric, then lexicographic comparison + lp=$(printf "$p1\n$p2\n" | LANG=C sort -n | tail -n1) + if [ "$lp" = "$p2" ]; then + echo "$1 $2" + else + echo "$2 $1" + fi + fi + break + fi + i=$(($i+1)) + done +} + +get_version() { + app=$1 + + $app --version >/dev/null 2>&1 || return 1 + + $app --version 2>&1 | + sed -n '# Move version to start of line. + s/.*[v ]\([0-9]\)/\1/ + + # Skip lines that do not start with version. + /^[0-9]/!d + + # Remove characters after the version. + s/[^.a-z0-9-].*// + + # The first component must be digits only. + s/^\([0-9]*\)[a-z-].*/\1/ + + #the following essentially does s/5.005/5.5/ + s/\.0*\([1-9]\)/.\1/g + p + q' +} + +check_versions() { + ret=0 + + while read app req_ver; do + # We only need libtoolize from the libtool package. + if test "$app" = libtool; then + app=libtoolize + fi + # Exempt git if --no-git is in effect. + if test "$app" = git; then + $use_git || continue + fi + # Honor $APP variables ($TAR, $AUTOCONF, etc.) + appvar=$(echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_') + test "$appvar" = TAR && appvar=AMTAR + case $appvar in + GZIP) ;; # Do not use $GZIP: it contains gzip options. + *) eval "app=\${$appvar-$app}" ;; + esac + + # Handle the still-experimental Automake-NG programs specially. + # They remain named as the mainstream Automake programs ("automake", + # and "aclocal") to avoid gratuitous incompatibilities with + # pre-existing usages (by, say, autoreconf, or custom autogen.sh + # scripts), but correctly identify themselves (as being part of + # "GNU automake-ng") when asked their version. + case $app in + automake-ng|aclocal-ng) + app=${app%-ng} + ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || { + warn_ "Error: '$app' not found or not from Automake-NG" + ret=1 + continue + } ;; + esac + if [ "$req_ver" = "-" ]; then + # Merely require app to exist; not all prereq apps are well-behaved + # so we have to rely on $? rather than get_version. + $app --version >/dev/null 2>&1 + if [ 126 -le $? ]; then + warn_ "Error: '$app' not found" + ret=1 + fi + else + # Require app to produce a new enough version string. + inst_ver=$(get_version $app) + if [ ! "$inst_ver" ]; then + warn_ "Error: '$app' not found" + ret=1 + else + latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2) + if [ ! "$latest_ver" = "$inst_ver" ]; then + warnf_ '%s\n' \ + "Error: '$app' version == $inst_ver is too old" \ + " '$app' version >= $req_ver is required" + ret=1 + fi + fi + fi + done + + return $ret +} + +print_versions() { + echo "Program Min_version" + echo "----------------------" + printf %s "$buildreq" + echo "----------------------" + # can't depend on column -t +} + +use_libtool=0 +# We'd like to use grep -E, to see if any of LT_INIT, +# AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac, +# but that's not portable enough (e.g., for Solaris). +grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \ + && use_libtool=1 +grep '^[ ]*LT_INIT' configure.ac >/dev/null \ + && use_libtool=1 +if test $use_libtool = 1; then + find_tool LIBTOOLIZE glibtoolize libtoolize +fi + +# gnulib-tool requires at least automake and autoconf. +# If either is not listed, add it (with minimum version) as a prerequisite. +case $buildreq in + *automake*) ;; + *) buildreq="automake 1.9 +$buildreq" ;; +esac +case $buildreq in + *autoconf*) ;; + *) buildreq="autoconf 2.59 +$buildreq" ;; +esac + +# When we can deduce that gnulib-tool will require patch, +# and when patch is not already listed as a prerequisite, add it, too. +if test -d "$local_gl_dir" \ + && ! find "$local_gl_dir" -name '*.diff' -exec false {} +; then + case $buildreq in + *patch*) ;; + *) buildreq="patch - +$buildreq" ;; + esac +fi + +if ! printf "$buildreq" | check_versions; then + echo >&2 + if test -f README-prereq; then + die "See README-prereq for how to get the prerequisite programs" + else + die "Please install the prerequisite programs" + fi +fi + +echo "$0: Bootstrapping from checked-out $package sources..." + +# See if we can use gnulib's git-merge-changelog merge driver. +if test -d .git && (git --version) >/dev/null 2>/dev/null ; then + if git config merge.merge-changelog.driver >/dev/null ; then + : + elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then + echo "$0: initializing git-merge-changelog driver" + git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' + git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B' + else + echo "$0: consider installing git-merge-changelog from gnulib" + fi +fi + + +cleanup_gnulib() { + status=$? + rm -fr "$gnulib_path" + exit $status +} + +git_modules_config () { + test -f .gitmodules && git config --file .gitmodules "$@" +} + +gnulib_path=$(git_modules_config submodule.gnulib.path) +test -z "$gnulib_path" && gnulib_path=gnulib + +# Get gnulib files. + +case ${GNULIB_SRCDIR--} in +-) + if git_modules_config submodule.gnulib.url >/dev/null; then + echo "$0: getting gnulib files..." + git submodule init || exit $? + git submodule update || exit $? + + elif [ ! -d "$gnulib_path" ]; then + echo "$0: getting gnulib files..." + + trap cleanup_gnulib 1 2 13 15 + + shallow= + git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2' + git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" || + cleanup_gnulib + + trap - 1 2 13 15 + fi + GNULIB_SRCDIR=$gnulib_path + ;; +*) + # Use GNULIB_SRCDIR as a reference. + if test -d "$GNULIB_SRCDIR"/.git && \ + git_modules_config submodule.gnulib.url >/dev/null; then + echo "$0: getting gnulib files..." + if git submodule -h|grep -- --reference > /dev/null; then + # Prefer the one-liner available in git 1.6.4 or newer. + git submodule update --init --reference "$GNULIB_SRCDIR" \ + "$gnulib_path" || exit $? + else + # This fallback allows at least git 1.5.5. + if test -f "$gnulib_path"/gnulib-tool; then + # Since file already exists, assume submodule init already complete. + git submodule update || exit $? + else + # Older git can't clone into an empty directory. + rmdir "$gnulib_path" 2>/dev/null + git clone --reference "$GNULIB_SRCDIR" \ + "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ + && git submodule init && git submodule update \ + || exit $? + fi + fi + GNULIB_SRCDIR=$gnulib_path + fi + ;; +esac + +if $bootstrap_sync; then + cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || { + echo "$0: updating bootstrap and restarting..." + exec sh -c \ + 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ + -- "$GNULIB_SRCDIR/build-aux/bootstrap" \ + "$0" "$@" --no-bootstrap-sync + } +fi + +gnulib_tool=$GNULIB_SRCDIR/gnulib-tool +<$gnulib_tool || exit $? + +# Get translations. + +download_po_files() { + subdir=$1 + domain=$2 + echo "$me: getting translations into $subdir for $domain..." + cmd=$(printf "$po_download_command_format" "$domain" "$subdir") + eval "$cmd" && return + # Fallback to HTTP. + cmd=$(printf "$po_download_command_format2" "$subdir" "$domain") + eval "$cmd" +} + +# Mirror .po files to $po_dir/.reference and copy only the new +# or modified ones into $po_dir. Also update $po_dir/LINGUAS. +# Note po files that exist locally only are left in $po_dir but will +# not be included in LINGUAS and hence will not be distributed. +update_po_files() { + # Directory containing primary .po files. + # Overwrite them only when we're sure a .po file is new. + po_dir=$1 + domain=$2 + + # Mirror *.po files into this dir. + # Usually contains *.s1 checksum files. + ref_po_dir="$po_dir/.reference" + + test -d $ref_po_dir || mkdir $ref_po_dir || return + download_po_files $ref_po_dir $domain \ + && ls "$ref_po_dir"/*.po 2>/dev/null | + sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return + + langs=$(cd $ref_po_dir && echo *.po | sed 's/\.po//g') + test "$langs" = '*' && langs=x + for po in $langs; do + case $po in x) continue;; esac + new_po="$ref_po_dir/$po.po" + cksum_file="$ref_po_dir/$po.s1" + if ! test -f "$cksum_file" || + ! test -f "$po_dir/$po.po" || + ! $SHA1SUM -c --status "$cksum_file" \ + < "$new_po" > /dev/null; then + echo "$me: updated $po_dir/$po.po..." + cp "$new_po" "$po_dir/$po.po" \ + && $SHA1SUM < "$new_po" > "$cksum_file" + fi + done +} + +case $SKIP_PO in +'') + if test -d po; then + update_po_files po $package || exit + fi + + if test -d runtime-po; then + update_po_files runtime-po $package-runtime || exit + fi;; +esac + +symlink_to_dir() +{ + src=$1/$2 + dst=${3-$2} + + test -f "$src" && { + + # If the destination directory doesn't exist, create it. + # This is required at least for "lib/uniwidth/cjk.h". + dst_dir=$(dirname "$dst") + if ! test -d "$dst_dir"; then + mkdir -p "$dst_dir" + + # If we've just created a directory like lib/uniwidth, + # tell version control system(s) it's ignorable. + # FIXME: for now, this does only one level + parent=$(dirname "$dst_dir") + for dot_ig in x $vc_ignore; do + test $dot_ig = x && continue + ig=$parent/$dot_ig + insert_vc_ignore $ig "${dst_dir##*/}" + done + fi + + if $copy; then + { + test ! -h "$dst" || { + echo "$me: rm -f $dst" && + rm -f "$dst" + } + } && + test -f "$dst" && + cmp -s "$src" "$dst" || { + echo "$me: cp -fp $src $dst" && + cp -fp "$src" "$dst" + } + else + # Leave any existing symlink alone, if it already points to the source, + # so that broken build tools that care about symlink times + # aren't confused into doing unnecessary builds. Conversely, if the + # existing symlink's time stamp is older than the source, make it afresh, + # so that broken tools aren't confused into skipping needed builds. See + # . + test -h "$dst" && + src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 && + dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 && + test "$src_i" = "$dst_i" && + both_ls=$(ls -dt "$src" "$dst") && + test "X$both_ls" = "X$dst$nl$src" || { + dot_dots= + case $src in + /*) ;; + *) + case /$dst/ in + *//* | */../* | */./* | /*/*/*/*/*/) + die "invalid symlink calculation: $src -> $dst";; + /*/*/*/*/) dot_dots=../../../;; + /*/*/*/) dot_dots=../../;; + /*/*/) dot_dots=../;; + esac;; + esac + + echo "$me: ln -fs $dot_dots$src $dst" && + ln -fs "$dot_dots$src" "$dst" + } + fi + } +} + +version_controlled_file() { + parent=$1 + file=$2 + if test -d .git; then + git rm -n "$file" > /dev/null 2>&1 + elif test -d .svn; then + svn log -r HEAD "$file" > /dev/null 2>&1 + elif test -d CVS; then + grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null | + grep '^/[^/]*/[0-9]' > /dev/null + else + warn_ "no version control for $file?" + false + fi +} + +# NOTE: we have to be careful to run both autopoint and libtoolize +# before gnulib-tool, since gnulib-tool is likely to provide newer +# versions of files "installed" by these two programs. +# Then, *after* gnulib-tool (see below), we have to be careful to +# run autoreconf in such a way that it does not run either of these +# two just-pre-run programs. + +# Import from gettext. +with_gettext=yes +grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \ + with_gettext=no + +if test $with_gettext = yes || test $use_libtool = 1; then + + tempbase=.bootstrap$$ + trap "rm -f $tempbase.0 $tempbase.1" 1 2 13 15 + + > $tempbase.0 > $tempbase.1 && + find . ! -type d -print | sort > $tempbase.0 || exit + + if test $with_gettext = yes; then + # Released autopoint has the tendency to install macros that have been + # obsoleted in current gnulib, so run this before gnulib-tool. + echo "$0: $AUTOPOINT --force" + $AUTOPOINT --force || exit + fi + + # Autoreconf runs aclocal before libtoolize, which causes spurious + # warnings if the initial aclocal is confused by the libtoolized + # (or worse out-of-date) macro directory. + # libtoolize 1.9b added the --install option; but we support back + # to libtoolize 1.5.22, where the install action was default. + if test $use_libtool = 1; then + install= + case $($LIBTOOLIZE --help) in + *--install*) install=--install ;; + esac + echo "running: $LIBTOOLIZE $install --copy" + $LIBTOOLIZE $install --copy + fi + + find . ! -type d -print | sort >$tempbase.1 + old_IFS=$IFS + IFS=$nl + for file in $(comm -13 $tempbase.0 $tempbase.1); do + IFS=$old_IFS + parent=${file%/*} + version_controlled_file "$parent" "$file" || { + for dot_ig in x $vc_ignore; do + test $dot_ig = x && continue + ig=$parent/$dot_ig + insert_vc_ignore "$ig" "${file##*/}" + done + } + done + IFS=$old_IFS + + rm -f $tempbase.0 $tempbase.1 + trap - 1 2 13 15 +fi + +# Import from gnulib. + +gnulib_tool_options="\ + --import\ + --no-changelog\ + --aux-dir $build_aux\ + --doc-base $doc_base\ + --lib $gnulib_name\ + --m4-base $m4_base/\ + --source-base $source_base/\ + --tests-base $tests_base\ + --local-dir $local_gl_dir\ + $gnulib_tool_option_extras\ +" +if test $use_libtool = 1; then + case "$gnulib_tool_options " in + *' --libtool '*) ;; + *) gnulib_tool_options="$gnulib_tool_options --libtool" ;; + esac +fi +echo "$0: $gnulib_tool $gnulib_tool_options --import ..." +$gnulib_tool $gnulib_tool_options --import $gnulib_modules && + +for file in $gnulib_files; do + symlink_to_dir "$GNULIB_SRCDIR" $file \ + || die "failed to symlink $file" +done + +bootstrap_post_import_hook \ + || die "bootstrap_post_import_hook failed" + +# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some +# gnulib-populated directories. Such .m4 files would cause aclocal to fail. +# The following requires GNU find 4.2.3 or newer. Considering the usual +# portability constraints of this script, that may seem a very demanding +# requirement, but it should be ok. Ignore any failure, which is fine, +# since this is only a convenience to help developers avoid the relatively +# unusual case in which a symlinked-to .m4 file is git-removed from gnulib +# between successive runs of this script. +find "$m4_base" "$source_base" \ + -depth \( -name '*.m4' -o -name '*.[ch]' \) \ + -type l -xtype l -delete > /dev/null 2>&1 + +# Some systems (RHEL 5) are using ancient autotools, for which the +# --no-recursive option had not been invented. Detect that lack and +# omit the option when it's not supported. FIXME in 2017: remove this +# hack when RHEL 5 autotools are updated, or when they become irrelevant. +no_recursive= +case $($AUTORECONF --help) in + *--no-recursive*) no_recursive=--no-recursive;; +esac + +# Tell autoreconf not to invoke autopoint or libtoolize; they were run above. +echo "running: AUTOPOINT=true LIBTOOLIZE=true " \ + "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS" +AUTOPOINT=true LIBTOOLIZE=true \ + $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \ + || die "autoreconf failed" + +# Get some extra files from gnulib, overriding existing files. +for file in $gnulib_extra_files; do + case $file in + */INSTALL) dst=INSTALL;; + build-aux/*) dst=$build_aux/${file#build-aux/};; + *) dst=$file;; + esac + symlink_to_dir "$GNULIB_SRCDIR" $file $dst \ + || die "failed to symlink $file" +done + +if test $with_gettext = yes; then + # Create gettext configuration. + echo "$0: Creating po/Makevars from po/Makevars.template ..." + rm -f po/Makevars + sed ' + /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/ + /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/ + /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'| + /^XGETTEXT_OPTIONS *=/{ + s/$/ \\/ + a\ + '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} + } + ' po/Makevars.template >po/Makevars \ + || die 'cannot generate po/Makevars' + + # If the 'gettext' module is in use, grab the latest Makefile.in.in. + # If only the 'gettext-h' module is in use, assume autopoint already + # put the correct version of this file into place. + case $gnulib_modules in + *gettext-h*) ;; + *gettext*) + cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \ + || die "cannot create po/Makefile.in.in" + ;; + esac + + if test -d runtime-po; then + # Similarly for runtime-po/Makevars, but not quite the same. + rm -f runtime-po/Makevars + sed ' + /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/ + /^subdir *=.*/s/=.*/= runtime-po/ + /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ + /^XGETTEXT_OPTIONS *=/{ + s/$/ \\/ + a\ + '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} + } + ' po/Makevars.template >runtime-po/Makevars \ + || die 'cannot generate runtime-po/Makevars' + + # Copy identical files from po to runtime-po. + (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) + fi +fi + +bootstrap_epilogue + +echo "$0: done. Now you can run './configure'." + +# Local variables: +# 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: diff --git a/bootstrap.conf b/bootstrap.conf new file mode 100644 index 0000000..cdfeca0 --- /dev/null +++ b/bootstrap.conf @@ -0,0 +1,87 @@ +# Bootstrap configuration. + +# Copyright (C) 2006-2012 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 +# the Free Software Foundation; either version 3 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 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 . + + +# gnulib modules used by this package. +gnulib_modules=" + _Exit + atexit + calloc + close-stream + closeout + fclose + fdopen + fflush + fopen + free + getopt-gnu + memcpy + realloc-gnu + stat + stdio + stdlib + strdup-posix + strftime + strstr + xalloc +" + +# Additional xgettext options to use. Use "\\\newline" to break lines. +XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\ + --from-code=UTF-8\\\ + --flag=asprintf:2:c-format --flag=vasprintf:2:c-format\\\ + --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\ + --flag=wrapf:1:c-format\\\ +' + +# If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]" +# appears in configure.ac, exclude some unnecessary files. +# Without grep's -E option (not portable enough, pre-configure), +# the following test is ugly. Also, this depends on the existence +# of configure.ac, not the obsolescent-named configure.in. But if +# you're using this infrastructure, you should care about such things. + +gettext_external=0 +grep '^[ ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null && + gettext_external=1 +grep '^[ ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null && + gettext_external=1 + +if test $gettext_external = 1; then + # Gettext supplies these files, but we don't need them since + # we don't have an intl subdirectory. + excluded_files=' + m4/glibc2.m4 + m4/intdiv0.m4 + m4/lcmessage.m4 + m4/lock.m4 + m4/printf-posix.m4 + m4/size_max.m4 + m4/uintmax_t.m4 + m4/ulonglong.m4 + m4/visibility.m4 + m4/xsize.m4 + ' +fi + +# Build prerequisites +buildreq="\ +autoconf 2.59 +automake 1.9.6 +git 1.5.5 +tar - +" diff --git a/build-aux/.gitignore b/build-aux/.gitignore new file mode 100644 index 0000000..06cb16c --- /dev/null +++ b/build-aux/.gitignore @@ -0,0 +1,8 @@ +/config.guess +/config.sub +/depcomp +/install-sh +/ltmain.sh +/mdate-sh +/missing +/texinfo.tex diff --git a/build-aux/snippet/.gitignore b/build-aux/snippet/.gitignore new file mode 100644 index 0000000..5ec3722 --- /dev/null +++ b/build-aux/snippet/.gitignore @@ -0,0 +1,5 @@ +/_Noreturn.h +/arg-nonnull.h +/c++defs.h +/unused-parameter.h +/warn-on-use.h diff --git a/configure.ac b/configure.ac index e636409..f6e2b00 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,8 @@ AC_CONFIG_MACRO_DIR([m4]) AC_INIT([dhcpd-pools], m4_esyscmd([build-aux/git-version-gen .tarball-version]), [kerolasa@iki.fi],,[http://dhcpd-pools.sourceforge.net/]) -AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax no-dist-gzip dist-xz -Wno-portability]) +AC_CONFIG_AUX_DIR([build-aux]) +AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax no-dist-gzip dist-xz -Wextra-portability]) AC_CONFIG_SRCDIR([src/dhcpd-pools.h]) AC_CONFIG_HEADERS([config.h]) @@ -15,6 +16,8 @@ AC_GNU_SOURCE # Checks for programs AC_PROG_AWK AC_PROG_CC_C99 +gl_EARLY +gl_INIT AC_C_RESTRICT AC_PROG_CXX AC_PROG_MAKE_SET @@ -82,6 +85,7 @@ AC_CHECK_FUNCS([\ ]) AC_CONFIG_FILES([Makefile + lib/Makefile man/Makefile src/Makefile contrib/Makefile]) diff --git a/lib/.gitignore b/lib/.gitignore new file mode 100644 index 0000000..89c3d07 --- /dev/null +++ b/lib/.gitignore @@ -0,0 +1,161 @@ +/.deps/ +/.gitignore~ +/.libs/ +/Makefile +/Makefile.in +/Makefile.am +/_Exit.c +/arg-nonnull.h +/atexit.c +/c++defs.h +/c-ctype.c +/c-ctype.h +/c-ctype.lo +/c-ctype.o +/c-strcase.h +/c-strcasecmp.c +/c-strcasecmp.lo +/c-strcasecmp.o +/c-strcaseeq.h +/c-strncasecmp.c +/c-strncasecmp.lo +/c-strncasecmp.o +/calloc.c +/charset.alias +/close-stream.c +/close-stream.h +/close-stream.lo +/close-stream.o +/close.c +/closeout.c +/closeout.h +/closeout.lo +/closeout.o +/config.charset +/configmake.h +/dosname.h +/errno.in.h +/error.c +/error.h +/exitfail.c +/exitfail.h +/exitfail.lo +/exitfail.o +/fclose.c +/fclose.lo +/fclose.o +/fd-hook.c +/fd-hook.h +/fd-hook.lo +/fd-hook.o +/fdopen.c +/fflush.c +/fflush.lo +/fflush.o +/fopen.c +/fpending.c +/fpending.h +/fpurge.c +/fpurge.lo +/fpurge.o +/freading.c +/freading.h +/freading.lo +/freading.o +/free.c +/fseek.c +/fseek.lo +/fseek.o +/fseeko.c +/fseeko.lo +/fseeko.o +/fstat.c +/ftell.c +/ftello.c +/getopt.c +/getopt.in.h +/getopt1.c +/getopt_int.h +/gettext.h +/intprops.h +/libdhcpd_pools.la +/localcharset.c +/localcharset.h +/localcharset.lo +/localcharset.o +/lseek.c +/malloc.c +/mbrtowc.c +/mbsinit.c +/memchr.c +/memchr.valgrind +/memcpy.c +/msvc-inval.c +/msvc-inval.h +/msvc-nothrow.c +/msvc-nothrow.h +/pathmax.h +/quote.h +/quotearg.c +/quotearg.h +/quotearg.lo +/quotearg.o +/realloc.c +/ref-add.sed +/ref-add.sin +/ref-del.sed +/ref-del.sin +/stat.c +/stdarg.in.h +/stdbool.in.h +/stddef.in.h +/stdio-impl.h +/stdio.h +/stdio.in.h +/stdlib.h +/stdlib.in.h +/str-two-way.h +/strdup.c +/streq.h +/strerror-override.c +/strerror-override.h +/strerror.c +/strftime.c +/strftime.h +/strftime.lo +/strftime.o +/string.h +/string.in.h +/strstr.c +/strtod.c +/sys/ +/sys_stat.in.h +/sys_types.in.h +/time.h +/time.in.h +/time_r.c +/unistd.h +/unistd.in.h +/unused-parameter.h +/verify.h +/warn-on-use.h +/wchar.h +/wchar.in.h +/wctype.h +/wctype.in.h +/xalloc-die.c +/xalloc-die.lo +/xalloc-die.o +/xalloc-oversized.h +/xalloc.h +/xmalloc.c +/xmalloc.lo +/xmalloc.o +/xprintf.c +/xprintf.h +/xprintf.lo +/xprintf.o +/xstrtod.c +/xstrtod.h +/xstrtod.lo +/xstrtod.o diff --git a/m4/.gitignore b/m4/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/snippet/.gitignore b/snippet/.gitignore new file mode 100644 index 0000000..5ec3722 --- /dev/null +++ b/snippet/.gitignore @@ -0,0 +1,5 @@ +/_Noreturn.h +/arg-nonnull.h +/c++defs.h +/unused-parameter.h +/warn-on-use.h diff --git a/src/Makefile.am b/src/Makefile.am index 5a585c8..ee0dd88 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,9 @@ bin_PROGRAMS = dhcpd-pools AC_PROG_RANLIB = resolv -AM_CPPFLAGS = -I. -I.. +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib -I$(top_builddir)/lib + +dhcpd_pools_LDADD = $(top_builddir)/lib/libdhcpd_pools.la dhcpd_pools_SOURCES = \ analyze.c \ diff --git a/src/dhcpd-pools.c b/src/dhcpd-pools.c index a532425..3d5597a 100644 --- a/src/dhcpd-pools.c +++ b/src/dhcpd-pools.c @@ -34,19 +34,8 @@ */ #include - -#ifdef HAVE_STDLIB_H #include -#else -extern char *malloc(); -#endif - -#ifdef HAVE_STRING_H #include -#else -#include -#endif - #include #include #include @@ -54,8 +43,11 @@ extern char *malloc(); #include #include +#include "close-stream.h" +#include "closeout.h" #include "defaults.h" #include "dhcpd-pools.h" +#include "xalloc.h" int main(int argc, char **argv) { @@ -88,9 +80,9 @@ int main(int argc, char **argv) atexit(close_stdout); /* FIXME: make these allocations dynamic up on need. */ - config.dhcpdconf_file = safe_malloc(sizeof(char) * MAXLEN); - config.dhcpdlease_file = safe_malloc(sizeof(char) * MAXLEN); - config.output_file = safe_malloc(sizeof(char) * MAXLEN); + config.dhcpdconf_file = xmalloc(sizeof(char) * MAXLEN); + config.dhcpdlease_file = xmalloc(sizeof(char) * MAXLEN); + config.output_file = xmalloc(sizeof(char) * MAXLEN); /* Make sure string has zero lenght if there is no * command line option */ @@ -228,7 +220,7 @@ int main(int argc, char **argv) parse_leases(); prepare_data(); do_counting(); - tmp_ranges = safe_malloc(sizeof(struct range_t) * num_ranges); + tmp_ranges = xmalloc(sizeof(struct range_t) * num_ranges); if (sorts != 0) { mergesort_ranges(ranges, num_ranges, tmp_ranges); } @@ -248,13 +240,13 @@ int prepare_memory(void) RANGES = 64; num_ranges = num_shared_networks = 0; shared_networks = - safe_malloc(sizeof(struct shared_network_t) * SHARED_NETWORKS); + xmalloc(sizeof(struct shared_network_t) * SHARED_NETWORKS); - ranges = safe_malloc(sizeof(struct range_t) * RANGES); + ranges = xmalloc(sizeof(struct range_t) * RANGES); macaddr = NULL; /* First shared network entry is all networks */ - shared_networks->name = safe_strdup("All networks"); + shared_networks->name = xstrdup("All networks"); shared_networks->used = 0; shared_networks->touched = 0; shared_networks->backups = 0; diff --git a/src/dhcpd-pools.h b/src/dhcpd-pools.h index ed4623e..2ce3b7c 100644 --- a/src/dhcpd-pools.h +++ b/src/dhcpd-pools.h @@ -168,20 +168,8 @@ int do_counting(void); void flip_ranges(struct range_t *__restrict ranges, struct range_t *__restrict tmp_ranges) __attribute__ ((nonnull(1, 2))); /* support functions */ -void *safe_malloc(const size_t size) -#if __GNUC__ >= 3 - __attribute__ ((__malloc__)) -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) - __attribute__ ((__alloc_size__((1)))) -#endif -#endif - ; -void *safe_realloc(void *__restrict ptr, const size_t size); -char *safe_strdup(const char *__restrict str) __attribute__ ((nonnull(1))); int xstrstr(char *__restrict a, const char *__restrict b, int len); double strtod_or_err(const char *__restrict str, const char *__restrict errmesg); -int close_stream(FILE * stream); -void close_stdout(void); void print_version(void) __attribute__ ((noreturn)); void usage(int status) __attribute__ ((noreturn)); /* qsort required functions... */ diff --git a/src/getdata.c b/src/getdata.c index 0f39af3..37a1936 100644 --- a/src/getdata.c +++ b/src/getdata.c @@ -35,14 +35,6 @@ #include -#ifdef HAVE_STDLIB_H -#include -#else /* Not STDC_HEADERS */ -extern char *malloc(); -#define EXIT_FAILURE 1 /* Failing exit status. */ -#define EXIT_SUCCESS 0 /* Successful exit status. */ -#endif /* STDC_HEADERS */ - #include #include #include @@ -54,13 +46,12 @@ extern char *malloc(); #include #include #include +#include #include -#ifndef _XOPEN_SOURCE -#define _XOPEN_SOURCE 600 -#endif #include "defaults.h" #include "dhcpd-pools.h" +#include "xalloc.h" /* Parse dhcpd.leases file. All performance boosts for this function are * wellcome */ @@ -105,11 +96,11 @@ int parse_leases(void) err(EXIT_FAILURE, "parse_leases: %s", config.dhcpdlease_file); } - line = safe_malloc(sizeof(char) * MAXLEN); - ipstring = safe_malloc(sizeof(char) * MAXLEN); + line = xmalloc(sizeof(char) * MAXLEN); + ipstring = xmalloc(sizeof(char) * MAXLEN); if (config.output_format[0] == 'X') { - macstring = safe_malloc(sizeof(char) * 18); - macaddr = safe_malloc(sizeof(struct macaddr_t)); + macstring = xmalloc(sizeof(char) * 18); + macaddr = xmalloc(sizeof(struct macaddr_t)); macaddr_p = macaddr; macaddr_p->next = NULL; } @@ -154,10 +145,10 @@ int parse_leases(void) nth_field(3, macstring, line); if (macstring) { macstring[17] = '\0'; - macaddr_p->ethernet = safe_strdup(macstring); - macaddr_p->ip = safe_strdup(ipstring); + macaddr_p->ethernet = xstrdup(macstring); + macaddr_p->ip = xstrdup(ipstring); macaddr_p->next = - safe_malloc(sizeof(struct macaddr_t)); + xmalloc(sizeof(struct macaddr_t)); macaddr_p = macaddr_p->next; macaddr_p->next = NULL; } @@ -229,7 +220,7 @@ void parse_config(int is_include, const char *restrict config_file, struct in_addr inp; struct range_t *range_p; - word = safe_malloc(sizeof(char) * MAXLEN); + word = xmalloc(sizeof(char) * MAXLEN); if (is_include) { /* Default place holder for ranges "All networks". */ @@ -389,7 +380,7 @@ void parse_config(int is_include, const char *restrict config_file, if (RANGES < num_ranges + 1) { RANGES *= 2; ranges = - safe_realloc(ranges, + xrealloc(ranges, sizeof(struct range_t) * RANGES); @@ -413,7 +404,7 @@ void parse_config(int is_include, const char *restrict config_file, num_shared_networks++; shared_p = shared_networks + num_shared_networks; - shared_p->name = safe_strdup(word); + shared_p->name = xstrdup(word); shared_p->available = 0; shared_p->used = 0; shared_p->touched = 0; diff --git a/src/hash.c b/src/hash.c index f69b4e3..4978259 100644 --- a/src/hash.c +++ b/src/hash.c @@ -34,11 +34,12 @@ */ #include "dhcpd-pools.h" +#include "xalloc.h" void add_lease(int ip, enum ltype type) { struct leases_t *l; - l = safe_malloc(sizeof(struct leases_t)); + l = xmalloc(sizeof(struct leases_t)); l->ip = ip; l->type = type; HASH_ADD_INT(leases, ip, l); diff --git a/src/other.c b/src/other.c index a7346a2..def337b 100644 --- a/src/other.c +++ b/src/other.c @@ -37,69 +37,15 @@ #include "dhcpd-pools.h" -#ifdef HAVE_STDLIB_H -#include -#else -extern void exit(); -extern char *malloc(); -extern void _exit(); -#endif - -#ifdef HAVE_STRING_H -#include -#else -#include -#endif - #include #include -#ifdef HAVE_ERROR_H -#include -#endif #include #include #include -#ifdef HAVE_STDIO_EXT_H -#include -#endif +#include +#include #include -#ifndef HAVE_ERROR -#ifdef __FreeBSD__ -#define error errc -#endif -#endif - -#ifndef HAVE___FPENDING -static size_t __fpending(FILE *fp) -{ - return (fp->_p - fp->_bf._base); -} -#endif - -/* Simple memory allocation wrapper */ -void *safe_malloc(const size_t size) -{ - void *ret = malloc(size); - if (ret == NULL) { - err(EXIT_FAILURE, - "safe_malloc: cannot allocate %lu bytes: ", size); - } - - return ret; -} - -/* Simple memory reallocation wrapper */ -void *safe_realloc(void *ptr, const size_t size) -{ - void *ret = realloc(ptr, size); - - if (!ret && size) - err(EXIT_FAILURE, - "safe_realloc: cannot allocate %lu bytes", size); - return ret; -} - int #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) __attribute__ ((hot)) @@ -126,16 +72,6 @@ int return true; } -/* Simple strdup wrapper */ -char *safe_strdup(const char *restrict str) -{ - char *ret = strdup(str); - - if (!ret && str) - err(EXIT_FAILURE, "cannot duplicate string"); - return ret; -} - /* Return percentage value */ double strtod_or_err(const char *restrict str, const char *restrict errmesg) { @@ -192,32 +128,6 @@ void clean_up(void) free(shared_networks); } -int close_stream(FILE *stream) -{ - const int some_pending = (__fpending(stream) != 0); - const int prev_fail = (ferror(stream) != 0); - const int fclose_fail = (fclose(stream) != 0); - if (prev_fail || (fclose_fail && (some_pending || errno != EBADF))) { - if (!fclose_fail) - errno = 0; - return EOF; - } - return 0; -} - -/* Use atexit(); */ -void close_stdout(void) -{ - if (close_stream(stdout) != 0 && !(errno == EPIPE)) { - char const *write_error = "write error"; - error(0, errno, "%s", write_error); - _exit(EXIT_FAILURE); - } - - if (close_stream(stderr) != 0) - _exit(EXIT_FAILURE); -} - void __attribute__ ((__noreturn__)) print_version(void) { fprintf(stdout, "%s\n" diff --git a/src/output.c b/src/output.c index 6e6b084..ecc8428 100644 --- a/src/output.c +++ b/src/output.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -45,10 +46,9 @@ #include #include -#define _FILE_OFFSET_BITS 64 -#include - +#include "close-stream.h" #include "dhcpd-pools.h" +#include "strftime.h" int output_txt(void) {